yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glj-代码提交

This commit is contained in:
glj 2023-04-25 18:34:35 +08:00
parent d7dc4eb2e1
commit 2a46da88c6
15 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
View File

@ -23,4 +23,6 @@ public class DataUpload extends EntityData{
private Date disasterTime;
private Long disasterId;
private String vordmId;
}

4
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
View File

@ -107,6 +107,10 @@ public class EntityData implements Serializable {
*/
private Integer isDeleted;
/**
* 是否发布（0未发布/1已发布）
*/
private Integer isPublish;
/**
* 上传人姓名

4
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java
View File

@ -76,10 +76,6 @@ public class Hotspot implements Serializable {
@ExcelIgnore
private Date reviewTime;
/**
* 是否删除 0未删除 1已删除
*/
private Integer isDeleted;
@ExcelIgnore
@TableField(exist = false)

2
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
View File

@ -18,6 +18,8 @@ public class OtherData{
private String type;
private String title;
private String remark;
private Long disasterId;

3
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
View File

@ -72,4 +72,7 @@ public class CallForHelpVo extends DisasterInfo {
* 受灾国家
*/
private String vordmId;
private Date reviewTime;
}

1
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java
View File

@ -33,7 +33,6 @@ public class AdminManagerController {
*/
@GetMapping("/pages")
public R pages(Query query, @RequestParam Map<String,Object> params){
return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params));
}

11
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java
View File

@ -61,5 +61,16 @@ public class EntityDataController {
entityData.setReviewTime(new Date());
return R.data(entityDataService.updateById(entityData));
}
/**
* 修改实体数据
* @param entityData
* @return
*/
@PostMapping("/updateEntityData")
public R updateEntityData(@RequestBody EntityData entityData) {
return R.data(entityDataService.updateById(entityData));
}
}

2
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
View File

@ -21,6 +21,7 @@
di.disaster_keyword,
bdb.dict_value as disasterType,
di.id as disasterId,
di.vordm_id AS vordmId,
di.disaster_time as disasterTime,
di.disaster_country as disasterCountry
from entity_data ed
@ -28,6 +29,7 @@
left join disaster_info di on di.id = ed.disaster_id
left join blade_dict_biz bdb on di.disaster_type = dict_key
where ed.disaster_id is not null
AND di.disaster_keyword IS NOT NUll
group by di.id,bdb.dict_value
</select>

1
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
View File

@ -191,6 +191,7 @@
d.upload_time,
d.geometry,
d.respond_status,
ud.review_time AS reviewTime,
bdb.dict_value as dictValue
From
guest_manage_disaster_ref ud join

6
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
View File

@ -21,6 +21,9 @@
<result property="managerId" column="manager_id" jdbcType="BIGINT"/>
<result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
<result property="sourceOrganization" column="source_organization" jdbcType="TIMESTAMP"/>
<result property="uploadType" column="upload_type" jdbcType="INTEGER"/>
<result property="isDeleted" column="is_deleted" jdbcType="INTEGER"/>
<result property="isPublish" column="is_publish" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
@ -29,7 +32,8 @@
ed.upload_time,ed.disaster_id,ed.visual_flag,
ed.visual_lon,ed.visual_lat,
ed.status,ed.uploader_id,ed.manager_id,
ed.review_time, ed.source_organization
ed.review_time, ed.source_organization,
ed.upload_type, ed.is_deleted, ed.is_publish
</sql>
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">

2
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
View File

@ -34,7 +34,7 @@
di.disaster_time,
di.disaster_level,
di.disaster_country,
di.sponsor_organization
di.sponsor_organization,
from guest_manage_disaster_ref gmdr
left join disaster_info di on gmdr.disaster_id = di.id
left join blade_user bu on gmdr.manager_id = bu.id

3
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml
View File

@ -19,6 +19,7 @@
<select id="queryDisasterPage" resultType="com.kening.vordm.entity.DataUpload">
select
di.disaster_keyword,
di.vordm_id,
bdb.dict_value as disasterType,
di.id as disasterId,
di.disaster_time as disasterTime,
@ -35,7 +36,7 @@
ed.visual_lon,ed.visual_lat,
ed.status,ed.uploader_id,ed.manager_id,
ed.review_time, ed.source_organization,
ed.upload_type,
ed.upload_type, ed.is_publish,
bu.name as uploaderName
from entity_data ed
left join blade_user bu on bu.id = ed.uploader_id

1
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml
View File

@ -21,6 +21,7 @@
di.disaster_keyword,
bdb.dict_value as disasterType,
di.id as disasterId,
di.vordm_id,
di.disaster_time as disasterTime,
di.disaster_country as disasterCountry
from disaster_info di

1
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
View File

@ -102,6 +102,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
entityData.setDisasterId(OtherData.getDisasterId());
entityData.setUploadTime(new Date());
entityData.setRemark(OtherData.getRemark());
entityData.setTitle(OtherData.getTitle());
entityData.setStatus(1);
entityData.setUploadType(2);
entityData.setUploaderId(AuthUtil.getUserId());

8
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
View File

@ -33,6 +33,7 @@ implements PictureInfoService {
/**
* 修改图片信息
*
* @param pictureInfo
* @return
*/
@ -52,6 +53,7 @@ implements PictureInfoService {
/**
* 上传图片
*
* @param otherData
* @return
*/
@ -64,7 +66,11 @@ implements PictureInfoService {
PictureInfo pictureInfo = new PictureInfo();
pictureInfo.setLink(bladeFile.getLink());
pictureInfo.setDisasterId(otherData.getDisasterId());
pictureInfo.setName(bladeFile.getOriginalName());
if (otherData.getTitle() != null) {
pictureInfo.setName(otherData.getTitle());
} else {
pictureInfo.setName(bladeFile.getName());
}
pictureInfo.setSize(multipartFile.getSize());
pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
pictureInfo.setIsMain(otherData.getIsMain());