From 3a065dd9bc067e93e291a4ebeb1098ed03b98a6c Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Wed, 31 Jan 2024 18:06:10 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kening/vordm/entity/WordCLouds.java     |  2 +-
 .../java/com/kening/vordm/vo/EntityDataUserVo.java   | 12 ++++++++++++
 .../com/kening/vordm/controller/NewsController.java  |  4 +++-
 .../vordm/service/impl/EntityDataServiceImpl.java    |  9 +++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java
index 66f420d..a7949c6 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java
@@ -24,7 +24,7 @@ public class WordCLouds implements Serializable {
     /**
      * 该词组归属的时间
      */
-    private Date date;
+    private String date;
 
     /**
      * 改词组的频次
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
index a929cda..21f01d3 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
@@ -175,6 +175,18 @@ public class EntityDataUserVo {
 	 */
 	private String productTime;
 
+	/**
+	 * 账号
+	 */
+	private String account;
+
+	/**
+	 * 密码
+	 */
+	private String password;
+
+	private Integer isDownload;
+
 	/**
 	 * 1-Optical satellite, 2-Night light satellite, 3-Video satellite, 4-Hyperspectral satellite, 5-Radar satellite
 	 */
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
index 5bbd828..8c5b93e 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java
@@ -70,7 +70,9 @@ public class NewsController {
 		String title = news.getTitle();
 		news.setTitle(null);
 		QueryWrapper<News> queryWrapper = Condition.getQueryWrapper(news);
-		queryWrapper.like("title",title);
+		if (title != null) {
+			queryWrapper.like("title",title);
+		}
 		queryWrapper.orderByDesc("title");
 		IPage<News> pages = newsService.page(Condition.getPage(query), queryWrapper);
 		return R.data(pages);
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
index 20f7cc2..8db7b09 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
@@ -231,6 +231,15 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 		entityData.setDisasterId(entityDataUserVo.getDisasterId());
 		entityData.setRemark(entityDataUserVo.getRemark());
 		entityData.setType(entityDataUserVo.getType());
+		if (entityDataUserVo.getIsDownload()!=null){
+			entityData.setIsDownload(entityDataUserVo.getIsDownload());
+		}
+		if (entityDataUserVo.getAccount()!=null){
+			entityData.setAccount(entityDataUserVo.getAccount());
+		}
+		if (entityDataUserVo.getPassword()!=null){
+			entityData.setPassword(entityDataUserVo.getPassword());
+		}
 		return R.status(this.baseMapper.updateById(entityData) > 0);
 	}