glj-代码提交

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;
 
     /**
      * 改词组的频次

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
 	 */

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);

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);
 	}