代码提交
This commit is contained in:
parent
6ee282bd82
commit
ad5de299c6
|
@ -114,7 +114,6 @@ public class DisasterInfo implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 发起机构
|
* 发起机构
|
||||||
*/
|
*/
|
||||||
@TableField(exist = false)
|
|
||||||
private String sponsorOrganization;
|
private String sponsorOrganization;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -51,6 +51,16 @@ public class GuestInfo implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Integer isManage;
|
private Integer isManage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 职业
|
||||||
|
*/
|
||||||
|
private String occupation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 职称
|
||||||
|
*/
|
||||||
|
private String professionalTitle;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,11 @@ public class GuestManageDisasterRef implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Long disasterId;
|
private Long disasterId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 灾害id
|
||||||
|
*/
|
||||||
|
private String responseOrganization;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|
|
@ -121,4 +121,14 @@ public class EntityDataUserVo {
|
||||||
* 验证码
|
* 验证码
|
||||||
*/
|
*/
|
||||||
private Integer Verification;
|
private Integer Verification;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 职业
|
||||||
|
*/
|
||||||
|
private String occupation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 职称
|
||||||
|
*/
|
||||||
|
private String professionalTitle;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||||
<result property="vordmId" column="vordm_id" jdbcType="VARCHAR"/>
|
<result property="vordmId" column="vordm_id" jdbcType="VARCHAR"/>
|
||||||
<result property="respondTime" column="respond_time" jdbcType="TIMESTAMP"/>
|
<result property="respondTime" column="respond_time" jdbcType="TIMESTAMP"/>
|
||||||
|
<result property="sponsorOrganization" column="sponsor_organization" jdbcType="TIMESTAMP"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
|
@ -30,7 +31,7 @@
|
||||||
di.disaster_level,di.disaster_country,di.respond_status,
|
di.disaster_level,di.disaster_country,di.respond_status,
|
||||||
di.visit_count,di.spider_type,di.tempend_time,
|
di.visit_count,di.spider_type,di.tempend_time,
|
||||||
di.temp_start_time,di.create_time,di.vordm_id,
|
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>
|
||||||
<sql id="Home_Disaster_Info">
|
<sql id="Home_Disaster_Info">
|
||||||
d.disaster_type,d.disaster_time,d.disaster_country,
|
d.disaster_type,d.disaster_time,d.disaster_country,
|
||||||
|
|
|
@ -1,22 +1,24 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.kening.vordm.mapper.GuestInfoMapper">
|
<mapper namespace="com.kening.vordm.mapper.GuestInfoMapper">
|
||||||
|
|
||||||
<resultMap id="BaseResultMap" type="com.kening.vordm.entity.GuestInfo">
|
<resultMap id="BaseResultMap" type="com.kening.vordm.entity.GuestInfo">
|
||||||
<id property="id" column="id" jdbcType="BIGINT"/>
|
<id property="id" column="id" jdbcType="BIGINT"/>
|
||||||
<result property="username" column="username" jdbcType="VARCHAR"/>
|
<result property="username" column="username" jdbcType="VARCHAR"/>
|
||||||
<result property="email" column="email" jdbcType="VARCHAR"/>
|
<result property="email" column="email" jdbcType="VARCHAR"/>
|
||||||
<result property="organization" column="organization" jdbcType="VARCHAR"/>
|
<result property="organization" column="organization" jdbcType="VARCHAR"/>
|
||||||
<result property="researchField" column="research_field" jdbcType="VARCHAR"/>
|
<result property="researchField" column="research_field" jdbcType="VARCHAR"/>
|
||||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||||
<result property="isManage" column="is_manage" jdbcType="INTEGER"/>
|
<result property="isManage" column="is_manage" jdbcType="INTEGER"/>
|
||||||
|
<result property="occupation" column="occupation" jdbcType="VARCHAR"/>
|
||||||
|
<result property="professionalTitle" column="professional_title" jdbcType="VARCHAR"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
id,username,email,
|
id,username,email,
|
||||||
organization,research_field,create_time,
|
organization,research_field,create_time,
|
||||||
is_manage
|
is_manage,occupation,professional_title
|
||||||
</sql>
|
</sql>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -10,10 +10,11 @@
|
||||||
<result property="uploaderId" column="uploader_id" jdbcType="BIGINT"/>
|
<result property="uploaderId" column="uploader_id" jdbcType="BIGINT"/>
|
||||||
<result property="managerId" column="manager_id" jdbcType="BIGINT"/>
|
<result property="managerId" column="manager_id" jdbcType="BIGINT"/>
|
||||||
<result property="disasterId" column="disaster_id" jdbcType="BIGINT"/>
|
<result property="disasterId" column="disaster_id" jdbcType="BIGINT"/>
|
||||||
|
<result property="responseOrganization" column="response_organization"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
id,sponsor_id,uploader_id,
|
id,sponsor_id,uploader_id,
|
||||||
manager_id,disaster_id
|
manager_id,disaster_id,response_organization
|
||||||
</sql>
|
</sql>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -37,6 +37,7 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取所以不可可视化下机构信息
|
* 获取所以不可可视化下机构信息
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@ -51,9 +52,9 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
||||||
|
|
||||||
//判断上传用户是否存在
|
//判断上传用户是否存在
|
||||||
LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
|
||||||
qw.eq(GuestInfo::getEmail,entityDataUserVo.getEmail());
|
qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
|
||||||
GuestInfo guestInfo1 = guestInfoMapper.selectOne(qw);
|
GuestInfo guestInfo1 = guestInfoMapper.selectOne(qw);
|
||||||
if (guestInfo1==null){
|
if (guestInfo1 == null) {
|
||||||
GuestInfo guestInfo = new GuestInfo();
|
GuestInfo guestInfo = new GuestInfo();
|
||||||
guestInfo.setEmail(entityDataUserVo.getEmail());
|
guestInfo.setEmail(entityDataUserVo.getEmail());
|
||||||
guestInfo.setOrganization(entityDataUserVo.getOrganization());
|
guestInfo.setOrganization(entityDataUserVo.getOrganization());
|
||||||
|
@ -61,9 +62,11 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
||||||
guestInfo.setResearchField(entityDataUserVo.getResearchField());
|
guestInfo.setResearchField(entityDataUserVo.getResearchField());
|
||||||
guestInfo.setUsername(entityDataUserVo.getUsername());
|
guestInfo.setUsername(entityDataUserVo.getUsername());
|
||||||
guestInfo.setCreateTime(new Date());
|
guestInfo.setCreateTime(new Date());
|
||||||
|
guestInfo.setOccupation(entityDataUserVo.getOccupation());
|
||||||
|
guestInfo.setProfessionalTitle(entityDataUserVo.getProfessionalTitle());
|
||||||
guestInfoMapper.insert(guestInfo);
|
guestInfoMapper.insert(guestInfo);
|
||||||
entityData.setUploaderId(guestInfo.getId());
|
entityData.setUploaderId(guestInfo.getId());
|
||||||
}else {
|
} else {
|
||||||
entityData.setUploaderId(guestInfo1.getId());
|
entityData.setUploaderId(guestInfo1.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,14 +75,9 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
||||||
entityData.setSize(entityDataUserVo.getSize());
|
entityData.setSize(entityDataUserVo.getSize());
|
||||||
entityData.setLink(entityDataUserVo.getLink());
|
entityData.setLink(entityDataUserVo.getLink());
|
||||||
entityData.setDisasterId(entityDataUserVo.getDisasterId());
|
entityData.setDisasterId(entityDataUserVo.getDisasterId());
|
||||||
entityData.setUploaderId(entityDataUserVo.getUploaderId());
|
|
||||||
entityData.setUploadTime(new Date());
|
entityData.setUploadTime(new Date());
|
||||||
entityData.setSourceOrganization(entityDataUserVo.getOrganization());
|
entityData.setSourceOrganization(entityDataUserVo.getOrganization());
|
||||||
this.baseMapper.insert(entityData);
|
return this.baseMapper.insert(entityData)>1;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue