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 67dde3c..2ab583e 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 @@ -50,6 +50,7 @@ public class DisasterInfoController { private final DownloadRecordService downloadRecordService; private final DisasterInfoVoService disasterInfoVoService; + @ApiOperationSupport(order = 1) @ApiOperation(value = "分页", notes = "传入Tool") @ApiImplicitParams({ @@ -58,32 +59,35 @@ public class DisasterInfoController { }) @GetMapping("/list") public R> list(CallForHelpVo CallForHelpVo, Query query) { - IPage pages = disasterInfoService.page(Condition.getPage(query),CallForHelpVo); + IPage pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo); return R.data(pages); } + /** * 首页数据，轮播和定位相关 + * * @return */ @GetMapping("/indexData") - public R> indexData(){ + public R> indexData() { return R.data(disasterInfoService.list(Wrappers.lambdaQuery() - .eq(DisasterInfo::getRespondStatus,2))); + .eq(DisasterInfo::getRespondStatus, 2))); } @GetMapping("/getPicInfoByDisasterId") - public R> getPicInfoByDisasterInfoId(Long disasterId){ + public R> getPicInfoByDisasterInfoId(Long disasterId) { return R.data(pictureInfoService.list(Wrappers.lambdaQuery() - .eq(PictureInfo::getDisasterId,disasterId))); + .eq(PictureInfo::getDisasterId, disasterId))); } /** * 灾害查询条件，时间，类型，灾害联动 + * * @param disasterInfo * @return */ @GetMapping("/selectCondition") - public R> getSelectCondition1(DisasterInfo disasterInfo){ + public R> getSelectCondition1(DisasterInfo disasterInfo) { String disaster_time = null; if (disasterInfo.getDisasterTime() != null) { disaster_time = disasterInfo.getDisasterTime().toString(); @@ -122,15 +126,13 @@ public class DisasterInfoController { // } String disaster_time = null; if (disasterInfo.getDisasterTime() != null) { - disaster_time = DateUtil.format(disasterInfo.getDisasterTime(),"yyyy-MM-dd"); + disaster_time = DateUtil.format(disasterInfo.getDisasterTime(), "yyyy-MM-dd"); } return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(), disasterInfo.getDisasterCountry(), disaster_time, disasterInfo.getName() )); } - - /** * 灾害信息统计 国家/灾害类型 左边栏 * @@ -145,9 +147,9 @@ public class DisasterInfoController { //按国家统计 第2栏 取前7个 dataMap.put("country", disasterInfoService.getLeft2Data()); //发起机构方法 第三个左边栏 取前3个 - dataMap.put("sponsorOrganization",disasterInfoService.getLeft3Data()); + dataMap.put("sponsorOrganization", disasterInfoService.getLeft3Data()); //发起机构方法 第四个左边栏 取前3个 - dataMap.put("responseOrganization",disasterInfoService.getLeft4Data()); + dataMap.put("responseOrganization", disasterInfoService.getLeft4Data()); //List groupByUseList = new ArrayList<>(); // if("searchSponsorOrganization".equals(name)){ // //发起机构方法 第三个左边栏 @@ -170,11 +172,11 @@ public class DisasterInfoController { @GetMapping("/homeDisasterInfo") public R> gethomeDisasterInfo(Query query, @RequestParam Map params) { String dateType = String.valueOf(params.get("dateType")); - if(StringUtils.isNotBlank(dateType) && !"4".equals(dateType) && !"null".equals(dateType)){ + if (StringUtils.isNotBlank(dateType) && !"4".equals(dateType) && !"null".equals(dateType)) { LocalDate date = LocalDate.now(); //如果有时间类型 - switch (dateType){ - case "1" : + switch (dateType) { + case "1": //Latest week 上一周 date = LocalDate.now().minusWeeks(1); break; @@ -189,58 +191,58 @@ public class DisasterInfoController { default: break; } - return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.lambdaQuery() + 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"))) + .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")))) - .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 " + + , 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("updateTime".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getUploadTime) + .orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount) + .orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount) + .orderByDesc("updateTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getUploadTime) .orderByDesc(DisasterInfoVo::getDisasterTime) )); } - if("4".equals(dateType)){ + if ("4".equals(dateType)) { //自定义时间 - return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.lambdaQuery() + 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"))) + .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"))) .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 " + + , 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("updateTime".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getUploadTime) + .orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount) + .orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount) + .orderByDesc("updateTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getUploadTime) .orderByDesc(DisasterInfoVo::getDisasterTime) )); - } else{ + } else { //没有时间相关的 - return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.lambdaQuery() + 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"))) + .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")))) - .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 " + + , 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("updateTime".equals(String.valueOf(params.get("order"))),DisasterInfoVo::getUploadTime) + .orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount) + .orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount) + .orderByDesc("updateTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getUploadTime) .orderByDesc(DisasterInfoVo::getDisasterTime) )); } @@ -285,7 +287,7 @@ public class DisasterInfoController { public R saveDownloadRecord(@RequestBody DownloadRecord downloadRecord) { DisasterInfo byId = disasterInfoService.getById(downloadRecord.getDiasterId()); if (byId != null) { - byId.setDownloadCount(byId.getDownloadCount() +1); + byId.setDownloadCount(byId.getDownloadCount() + 1); disasterInfoService.updateById(byId); } return R.status(true); @@ -293,6 +295,7 @@ public class DisasterInfoController { /** * 获取用户所以得机构 + * * @return */ @GetMapping("/getUserTenant") @@ -302,10 +305,9 @@ public class DisasterInfoController { /** * call for help - * */ @PostMapping("Call-for-help") - public R insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo){ + public R insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) { GuestInfo guestInfo = new GuestInfo(); BeanUtil.copyProperties(callForHelpVo, guestInfo); guestInfo.setId(IdWorker.getId()); @@ -316,22 +318,21 @@ public class DisasterInfoController { GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef(); GuestManageDisasterRef.setId(IdWorker.getId()); GuestManageDisasterRef.setSponsorId(guestInfo.getId()); - String vordm_id="test"; GuestManageDisasterRef.setDisasterId(disasterInfo.getId()); - Boolean flag1=guestInfoService.save(guestInfo); - Boolean flag2=guestManageDisasterRefService.save(GuestManageDisasterRef); - Boolean flag3=disasterInfoService.save(disasterInfo); - Boolean callForHelp= flag1&flag2&flag3; -// callForHelpVo.setId(IdWorker.getId()); -// Boolean insertFlag=accountInfoService.save(accountInfo); + Boolean flag1 = guestInfoService.save(guestInfo); + Boolean flag2 = guestManageDisasterRefService.save(GuestManageDisasterRef); + Boolean flag3 = disasterInfoService.save(disasterInfo); + Boolean callForHelp = flag1 && flag2 && flag3; return R.data(callForHelp); } + + @PostMapping("review") - public R review( String id){ + public R review(String id) { DisasterInfo disasterInfo = new DisasterInfo(); disasterInfo.setId(Long.valueOf(id)); disasterInfo.setRespondStatus(1); - Boolean flag=disasterInfoService.updateById(disasterInfo); + Boolean flag = disasterInfoService.updateById(disasterInfo); return R.data(flag); } } 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 e9fb0b9..0bf0583 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 @@ -44,14 +44,13 @@ gi.username AS sponsorName, gi.organization AS sponsorOrganization, bu.name AS managerName, - bt.tenant_name AS managerOrganization, + bu.organization AS managerOrganization, bdb.dict_value AS dictValue from disaster_info di left join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type left join guest_info gi on gi.id = gmdr.sponsor_id left join blade_user bu on bu.id = gmdr.manager_id - left join blade_tenant bt on bt.id = bu.organization di.id = #{id}