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

代码提交

This commit is contained in:
glj 2023-04-08 14:49:34 +08:00
parent 6ee282bd82
commit ad5de299c6
8 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,6 @@ public class DisasterInfo implements Serializable {
/**
* 发起机构
*/
@TableField(exist = false)
private String sponsorOrganization;
/**

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

@ -51,6 +51,16 @@ public class GuestInfo implements Serializable {
*/
private Integer isManage;
/**
* 职业
*/
private String occupation;
/**
* 职称
*/
private String professionalTitle;
@TableField(exist = false)
private static final long serialVersionUID = 1L;

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

@ -40,6 +40,11 @@ public class GuestManageDisasterRef implements Serializable {
*/
private Long disasterId;
/**
* 灾害id
*/
private String responseOrganization;
@TableField(exist = false)
private static final long serialVersionUID = 1L;

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

@ -121,4 +121,14 @@ public class EntityDataUserVo {
* 验证码
*/
private Integer Verification;
/**
* 职业
*/
private String occupation;
/**
* 职称
*/
private String professionalTitle;
}

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

@ -22,6 +22,7 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="vordmId" column="vordm_id" jdbcType="VARCHAR"/>
<result property="respondTime" column="respond_time" jdbcType="TIMESTAMP"/>
<result property="sponsorOrganization" column="sponsor_organization" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
@ -30,7 +31,7 @@
di.disaster_level,di.disaster_country,di.respond_status,
di.visit_count,di.spider_type,di.tempend_time,
di.temp_start_time,di.create_time,di.vordm_id,
di.respond_time,di.download_count
di.respond_time,di.download_count,di.sponsor_organization
</sql>
<sql id="Home_Disaster_Info">
d.disaster_type,d.disaster_time,d.disaster_country,

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

@ -12,11 +12,13 @@
<result property="researchField" column="research_field" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="isManage" column="is_manage" jdbcType="INTEGER"/>
<result property="occupation" column="occupation" jdbcType="VARCHAR"/>
<result property="professionalTitle" column="professional_title" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,username,email,
organization,research_field,create_time,
is_manage
is_manage,occupation,professional_title
</sql>
</mapper>

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

@ -10,10 +10,11 @@
<result property="uploaderId" column="uploader_id" jdbcType="BIGINT"/>
<result property="managerId" column="manager_id" jdbcType="BIGINT"/>
<result property="disasterId" column="disaster_id" jdbcType="BIGINT"/>
<result property="responseOrganization" column="response_organization"/>
</resultMap>
<sql id="Base_Column_List">
id,sponsor_id,uploader_id,
manager_id,disaster_id
manager_id,disaster_id,response_organization
</sql>
</mapper>

16
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
View File

@ -37,6 +37,7 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
/**
* 获取所以不可可视化下机构信息
*
* @return
*/
@Override
@ -51,9 +52,9 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
//判断上传用户是否存在
LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
qw.eq(GuestInfo::getEmail,entityDataUserVo.getEmail());
qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
GuestInfo guestInfo1 = guestInfoMapper.selectOne(qw);
if (guestInfo1==null){
if (guestInfo1 == null) {
GuestInfo guestInfo = new GuestInfo();
guestInfo.setEmail(entityDataUserVo.getEmail());
guestInfo.setOrganization(entityDataUserVo.getOrganization());
@ -61,9 +62,11 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
guestInfo.setResearchField(entityDataUserVo.getResearchField());
guestInfo.setUsername(entityDataUserVo.getUsername());
guestInfo.setCreateTime(new Date());
guestInfo.setOccupation(entityDataUserVo.getOccupation());
guestInfo.setProfessionalTitle(entityDataUserVo.getProfessionalTitle());
guestInfoMapper.insert(guestInfo);
entityData.setUploaderId(guestInfo.getId());
}else {
} else {
entityData.setUploaderId(guestInfo1.getId());
}
@ -72,14 +75,9 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
entityData.setSize(entityDataUserVo.getSize());
entityData.setLink(entityDataUserVo.getLink());
entityData.setDisasterId(entityDataUserVo.getDisasterId());
entityData.setUploaderId(entityDataUserVo.getUploaderId());
entityData.setUploadTime(new Date());
entityData.setSourceOrganization(entityDataUserVo.getOrganization());
this.baseMapper.insert(entityData);
return null;
return this.baseMapper.insert(entityData)>1;
}