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-24 15:11:47 +08:00
parent 4b164610f2
commit ffc44eb0b6
5 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,4 +158,10 @@ public class DisasterInfo implements Serializable {
private String chiefName; private String chiefName;
/**
* 完成时间
*/
private Date respondedTime;
} }

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

@ -87,5 +87,6 @@ public class UserVo {
*/ */
private String roleId; private String roleId;
//国家
private String country;
} }

55
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
View File

@ -214,16 +214,9 @@ public class DisasterInfoController {
.ge(DisasterInfoVo::getDisasterTime, date) .ge(DisasterInfoVo::getDisasterTime, date)
.le(DisasterInfoVo::getDisasterTime, LocalDate.now()) .le(DisasterInfoVo::getDisasterTime, LocalDate.now())
.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea")))
// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea"))))
.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea")))
// .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal"))) .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime)
// .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal"))) .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime)
// .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal")))
// .inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " +
// " where t.response_organization = " + params.get("leftVal"))
.orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount)
.orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount)
.orderByDesc(DisasterInfoVo::getVordmId) .orderByDesc(DisasterInfoVo::getVordmId)
)); ));
} }
@ -235,15 +228,8 @@ public class DisasterInfoController {
.le(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("endTime")))) .le(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("endTime"))))
.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea")))
// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime)
// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime)
// .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal")))
// .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal")))
// .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal")))
// .inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " +
// " where t.response_organization = " + params.get("leftVal"))
.orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount)
.orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount)
.orderByDesc(DisasterInfoVo::getVordmId) .orderByDesc(DisasterInfoVo::getVordmId)
)); ));
} else { } else {
@ -252,15 +238,8 @@ public class DisasterInfoController {
.eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus")))
.eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType")))
.like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea")))
// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime)
// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime)
// .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal")))
// .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal")))
// .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal")))
// .inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " +
// " where t.response_organization = " + params.get("leftVal"))
.orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount)
.orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount)
.orderByDesc(DisasterInfoVo::getVordmId) .orderByDesc(DisasterInfoVo::getVordmId)
)); ));
} }
@ -327,18 +306,18 @@ public class DisasterInfoController {
@PostMapping("Call-for-help") @PostMapping("Call-for-help")
public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) { public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) {
LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
qw.eq(GuestInfo::getEmail,callForHelpVo.getEmail()); qw.eq(GuestInfo::getEmail, callForHelpVo.getEmail());
GuestInfo one = guestInfoService.getOne(qw); GuestInfo one = guestInfoService.getOne(qw);
GuestInfo guestInfo = new GuestInfo(); GuestInfo guestInfo = new GuestInfo();
BeanUtil.copyProperties(callForHelpVo, guestInfo); BeanUtil.copyProperties(callForHelpVo, guestInfo);
Boolean flag1 = false; Boolean flag1 = false;
if (one==null){ if (one == null) {
guestInfo.setId(IdWorker.getId()); guestInfo.setId(IdWorker.getId());
flag1 = guestInfoService.save(guestInfo); flag1 = guestInfoService.save(guestInfo);
}else { } else {
guestInfo.setId(one.getId()); guestInfo.setId(one.getId());
flag1 =guestInfoService.updateById(guestInfo); flag1 = guestInfoService.updateById(guestInfo);
} }
DisasterInfo disasterInfo = new DisasterInfo(); DisasterInfo disasterInfo = new DisasterInfo();
@ -362,7 +341,7 @@ public class DisasterInfoController {
public R<Boolean> review(@RequestBody DisasterInfo disasterInfo) { public R<Boolean> review(@RequestBody DisasterInfo disasterInfo) {
//审批通过 //审批通过
if (disasterInfo.getRespondStatus() == 2){ if (disasterInfo.getRespondStatus() == 2) {
String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType()); String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType());
disasterInfo.setVordmId(numbering); disasterInfo.setVordmId(numbering);
} }
@ -420,4 +399,16 @@ public class DisasterInfoController {
public R getByUserDisasterInfo(Long userId, Long disasterId) { public R getByUserDisasterInfo(Long userId, Long disasterId) {
return R.data(disasterInfoService.getByUserDisasterInfo(userId, disasterId)); return R.data(disasterInfoService.getByUserDisasterInfo(userId, disasterId));
} }
@GetMapping("/responseEndedDisasterInfo")
public R responseEndedDisasterInfo(Long id) {
DisasterInfo disasterInfo = new DisasterInfo();
disasterInfo.setId(id);
disasterInfo.setRespondStatus(3);
disasterInfo.setRespondedTime(new Date());
return R.data(disasterInfoService.updateById(disasterInfo));
}
} }

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

@ -23,18 +23,17 @@
<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"/> <result property="sponsorOrganization" column="sponsor_organization" jdbcType="TIMESTAMP"/>
<result property="respondedTime" column="responded_time" jdbcType="TIMESTAMP"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
di di.id
.
id
,di.disaster_type,di.disaster_keyword, ,di.disaster_type,di.disaster_keyword,
di.disaster_time,di.upload_time,di.geometry, di.disaster_time,di.upload_time,di.geometry,
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.sponsor_organization di.respond_time,di.download_count,di.sponsor_organization,di.responded_time
</sql> </sql>
<sql id="Home_Disaster_Info"> <sql id="Home_Disaster_Info">
@ -46,8 +45,8 @@
</sql> </sql>
<insert id="saveUserData"> <insert id="saveUserData">
insert into blade_user (tenant_id, password, email, status, is_deleted, role_id) insert into blade_user (tenant_id, password, email, status, is_deleted, role_id, code, name)
values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0,#{userVo.roleId}); values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0, #{userVo.roleId}, #{userVo.country}, #{userVo.name});
</insert> </insert>
<update id="updataUserByEmail"> <update id="updataUserByEmail">
@ -121,20 +120,28 @@
</select> </select>
<select id="getLeft3Data" resultType="com.kening.vordm.vo.GroupByUse"> <select id="getLeft3Data" resultType="com.kening.vordm.vo.GroupByUse">
select t.sponsor_organization as `name`, count(*) as cnt, 'sponsorOrganization' as `type` select gi.username as `name`, count(*) as cnt, 'sponsorOrganization' as `type`
from disaster_info t from disaster_info t
where t.sponsor_organization != '' left join guest_manage_disaster_ref gmdr on gmdr.disaster_id = t.id
GROUP BY t.sponsor_organization left join guest_info gi on gi.id = gmdr.sponsor_id
where gi.username != ''
GROUP BY gi.username
ORDER BY cnt desc LIMIT 5 ORDER BY cnt desc LIMIT 5
</select> </select>
<select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse"> <select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
select gi.organization as `name`, count(*) as cnt, 'responseOrganization' as `type` SELECT bu.name AS `name`,
from guest_manage_disaster_ref t count(*) AS cnt,
INNER JOIN guest_info gi on gi.id = t.manager_id 'responseOrganization' AS `type`
where gi.organization != '' and t.`status` = '1' FROM guest_manage_disaster_ref t
GROUP BY gi.organization INNER JOIN blade_user bu ON bu.id = t.manager_id
ORDER BY cnt desc LIMIT 5 WHERE bu.name != ''
AND t.`status` = '1'
GROUP BY
bu.name
ORDER BY
cnt DESC
LIMIT 5
</select> </select>
<select id="getLeft1Data" resultType="com.kening.vordm.vo.GroupByUse"> <select id="getLeft1Data" resultType="com.kening.vordm.vo.GroupByUse">

3
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
View File

@ -174,6 +174,9 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
//密码 //密码
userVo.setPassword(DigestUtil.hex(userVo.getPassword())); userVo.setPassword(DigestUtil.hex(userVo.getPassword()));
String emailPrefix = userVo.getEmail().substring(0, userVo.getEmail().indexOf("@"));
userVo.setName(emailPrefix);
Integer integer = this.baseMapper.saveUserData(userVo); Integer integer = this.baseMapper.saveUserData(userVo);
return R.status(integer > 0); return R.status(integer > 0);
} }