From ffc44eb0b6f56ad338f21e7f34fbab2512f1d23f Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 15:11:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DisasterInfo.java | 6 ++ .../main/java/com/kening/vordm/vo/UserVo.java | 3 +- .../controller/DisasterInfoController.java | 87 +++++++++---------- .../vordm/mapper/DisasterInfoMapper.xml | 37 ++++---- .../service/impl/DisasterInfoServiceImpl.java | 3 + 5 files changed, 72 insertions(+), 64 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java index 3f14b48..b749a24 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java @@ -158,4 +158,10 @@ public class DisasterInfo implements Serializable { private String chiefName; + + /** + * 完成时间 + */ + private Date respondedTime; + } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java index d86fcca..e7013f2 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java @@ -87,5 +87,6 @@ public class UserVo { */ private String roleId; - + //国家 + private String country; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index 770e6ed..b8b7595 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -210,58 +210,37 @@ public class DisasterInfoController { break; } return R.data(disasterInfoVoService.page(Condition.getPage(query), Wrappers.lambdaQuery() - .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) - .ge(DisasterInfoVo::getDisasterTime, date) - .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"))) -// .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"))) -// .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) + .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) + .ge(DisasterInfoVo::getDisasterTime, date) + .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"))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) + .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime) + .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime) + .orderByDesc(DisasterInfoVo::getVordmId) )); } if ("4".equals(dateType)) { //自定义时间 return R.data(disasterInfoVoService.page(Condition.getPage(query), Wrappers.lambdaQuery() - .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) - .ge(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("startTime")))) - .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"))) - .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"))) -// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,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"))) -// .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) + .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) + .ge(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("startTime")))) + .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"))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) + .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime) + .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime) + .orderByDesc(DisasterInfoVo::getVordmId) )); } else { //没有时间相关的 return R.data(disasterInfoVoService.page(Condition.getPage(query), Wrappers.lambdaQuery() - .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"))) - .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"))) -// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,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"))) -// .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) + .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"))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) + .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime) + .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime) + .orderByDesc(DisasterInfoVo::getVordmId) )); } @@ -327,18 +306,18 @@ public class DisasterInfoController { @PostMapping("Call-for-help") public R insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(GuestInfo::getEmail,callForHelpVo.getEmail()); + qw.eq(GuestInfo::getEmail, callForHelpVo.getEmail()); GuestInfo one = guestInfoService.getOne(qw); GuestInfo guestInfo = new GuestInfo(); BeanUtil.copyProperties(callForHelpVo, guestInfo); Boolean flag1 = false; - if (one==null){ + if (one == null) { guestInfo.setId(IdWorker.getId()); flag1 = guestInfoService.save(guestInfo); - }else { + } else { guestInfo.setId(one.getId()); - flag1 =guestInfoService.updateById(guestInfo); + flag1 = guestInfoService.updateById(guestInfo); } DisasterInfo disasterInfo = new DisasterInfo(); @@ -362,7 +341,7 @@ public class DisasterInfoController { public R review(@RequestBody DisasterInfo disasterInfo) { //审批通过 - if (disasterInfo.getRespondStatus() == 2){ + if (disasterInfo.getRespondStatus() == 2) { String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType()); disasterInfo.setVordmId(numbering); } @@ -420,4 +399,16 @@ public class DisasterInfoController { public R getByUserDisasterInfo(Long userId, Long 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)); + } + + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index 458c670..9682464 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -23,18 +23,17 @@ + - di - . - id + di.id ,di.disaster_type,di.disaster_keyword, di.disaster_time,di.upload_time,di.geometry, 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.sponsor_organization + di.respond_time,di.download_count,di.sponsor_organization,di.responded_time @@ -46,8 +45,8 @@ - insert into blade_user (tenant_id, password, email, status, is_deleted, role_id) - values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0,#{userVo.roleId}); + 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}, #{userVo.country}, #{userVo.name}); @@ -121,20 +120,28 @@