glj-代码提交
This commit is contained in:
parent
044ba6ddee
commit
3a065dd9bc
|
@ -24,7 +24,7 @@ public class WordCLouds implements Serializable {
|
|||
/**
|
||||
* 该词组归属的时间
|
||||
*/
|
||||
private Date date;
|
||||
private String date;
|
||||
|
||||
/**
|
||||
* 改词组的频次
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue