diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index be0440d..d4518b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -31,7 +31,7 @@ Object add(RealtimeWork realtimeWork); - Object delete(String realtimeWorkId); + Object delete(Long realtimeWorkId); Object batchDelete(List realtimeWorkIds); @@ -53,4 +53,6 @@ List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + List clickData(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index be0440d..d4518b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -31,7 +31,7 @@ Object add(RealtimeWork realtimeWork); - Object delete(String realtimeWorkId); + Object delete(Long realtimeWorkId); Object batchDelete(List realtimeWorkIds); @@ -53,4 +53,6 @@ List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + List clickData(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index f7fd655..2b1cb1f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -60,4 +60,14 @@ public List getCountByStatus() { return this.baseMapper.getCountByStatus(); } + + @Override + public List getAreaCountByStatus(String type) { + return this.baseMapper.getAreaCountByStatus(type); + } + + @Override + public List getXfAreaCountByStatus(String type) { + return this.baseMapper.getXfAreaCountByStatus(type); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index be0440d..d4518b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -31,7 +31,7 @@ Object add(RealtimeWork realtimeWork); - Object delete(String realtimeWorkId); + Object delete(Long realtimeWorkId); Object batchDelete(List realtimeWorkIds); @@ -53,4 +53,6 @@ List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + List clickData(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index f7fd655..2b1cb1f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -60,4 +60,14 @@ public List getCountByStatus() { return this.baseMapper.getCountByStatus(); } + + @Override + public List getAreaCountByStatus(String type) { + return this.baseMapper.getAreaCountByStatus(type); + } + + @Override + public List getXfAreaCountByStatus(String type) { + return this.baseMapper.getXfAreaCountByStatus(type); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java index e588fc1..0571ceb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java @@ -23,8 +23,8 @@ public class CmdControlsInfoServiceImpl extends ServiceImpl implements ICmdControlsInfoService { @Override - public List getWebList() { + public List getWebList(String begTime,String endTime) { - return this.baseMapper.getWebList(); + return this.baseMapper.getWebList(begTime,endTime); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index be0440d..d4518b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -31,7 +31,7 @@ Object add(RealtimeWork realtimeWork); - Object delete(String realtimeWorkId); + Object delete(Long realtimeWorkId); Object batchDelete(List realtimeWorkIds); @@ -53,4 +53,6 @@ List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + List clickData(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index f7fd655..2b1cb1f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -60,4 +60,14 @@ public List getCountByStatus() { return this.baseMapper.getCountByStatus(); } + + @Override + public List getAreaCountByStatus(String type) { + return this.baseMapper.getAreaCountByStatus(type); + } + + @Override + public List getXfAreaCountByStatus(String type) { + return this.baseMapper.getXfAreaCountByStatus(type); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java index e588fc1..0571ceb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java @@ -23,8 +23,8 @@ public class CmdControlsInfoServiceImpl extends ServiceImpl implements ICmdControlsInfoService { @Override - public List getWebList() { + public List getWebList(String begTime,String endTime) { - return this.baseMapper.getWebList(); + return this.baseMapper.getWebList(begTime,endTime); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index c22f6b1..74b674a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -80,7 +80,69 @@ return hashMaps; } + public Map getDataByOther(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List> firstMapList = new ArrayList<>(); + List> secondMapList = new ArrayList<>(); + List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); + List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); + + List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); + dateTimeList.forEach(dateTime -> { + Map firstMap = new HashMap<>(); + Map secondMap = new HashMap<>(); + Map thirdMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("value", 0); + secondMap.put("name", DateUtil.formatDate(dateTime)); + secondMap.put("value", 0); + thirdMap.put("name", DateUtil.formatDate(dateTime)); + thirdMap.put("value", 0); + tagResponseList.forEach(tagResponse -> { + if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { + if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { + firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { + secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { + thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); + } + } + }); + dpMap.put("value", firstMap.get("value")); + dpMap.put("value1", secondMap.get("value")); + dpMap.put("value2", thirdMap.get("value")); + firstMapList.add(firstMap); + secondMapList.add(secondMap); + thirdMapList.add(thirdMap); + dpMapList.add(dpMap); + }); + //修改封装数据结构 + hashMap.put("zdzj", firstMapList); + hashMap.put("sjmg", secondMapList); + hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); + return hashMap; + } + + // public Map getDataByOther(JudgmentRequest judgmentRequest) { +// +// Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// //涉党政军 +// if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// list.forEach(commonRequest -> { +// CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue()); +// dpList.add(commonResponse); +// }); +// } +// +// // Map hashMap = new HashMap<>(); // List> firstMapList = new ArrayList<>(); // List> secondMapList = new ArrayList<>(); @@ -128,88 +190,6 @@ // return hashMap; // } - - public Map getDataByOther(JudgmentRequest judgmentRequest) { - - Judgment judgment = this.getById(judgmentRequest.getSecondId()); - List tagNames1 = new ArrayList<>(); - List tagNames2 = new ArrayList<>(); - List tagNames3 = new ArrayList<>(); - - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSjmgResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSjmgResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames1.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //常规信息 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getCgyqResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getCgyqResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames2.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //涉党政军 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames3.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - List tagResponseList = iCmdBodyRoamService.getTagResponses(DateUtil.formatDate(DateUtil.offsetDay(new Date(), -6)), DateUtil.formatDate(new Date())); - List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); - dateTimeList.forEach(dateTime -> { - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - - } - }); - }); - - Map hashMap = new HashMap<>(); - List> firstMapList = new ArrayList<>(); - List> secondMapList = new ArrayList<>(); - List> thirdMapList = new ArrayList<>(); - List> dpMapList = new ArrayList<>(); - - dateTimeList.forEach(dateTime -> { - Map firstMap = new HashMap<>(); - Map secondMap = new HashMap<>(); - Map thirdMap = new HashMap<>(); - Map dpMap = new HashMap<>(); - dpMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("value", 0); - secondMap.put("name", DateUtil.formatDate(dateTime)); - secondMap.put("value", 0); - thirdMap.put("name", DateUtil.formatDate(dateTime)); - thirdMap.put("value", 0); - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { - firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { - secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { - thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); - } - } - }); - dpMap.put("value", firstMap.get("value")); - dpMap.put("value1", secondMap.get("value")); - dpMap.put("value2", thirdMap.get("value")); - firstMapList.add(firstMap); - secondMapList.add(secondMap); - thirdMapList.add(thirdMap); - dpMapList.add(dpMap); - }); - //修改封装数据结构 - hashMap.put("zdzj", firstMapList); - hashMap.put("sjmg", secondMapList); - hashMap.put("cgxx", thirdMapList); - hashMap.put("dp", dpMapList); - return hashMap; - } - //根据录入历史数据统计(暂留) public Map getDataByLocal1(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); @@ -295,7 +275,8 @@ public Map getDataByLocal(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List dpList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// List> dpMapList = new ArrayList<>(); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); //涉党政军 if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); @@ -332,8 +313,9 @@ list.forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(dpList)) { dpList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue2(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(), commonRequest.getValue()); } }); } else { @@ -353,6 +335,7 @@ return iBusinessAccessService.getAccessStatus("2-sj") ? getDataByOther(judgmentRequest) : getDataByLocal(judgmentRequest); + } public List processUtil(List list1, List list2) { @@ -411,7 +394,7 @@ public Judgment getListByLocal(JudgmentRequest judgmentRequest) { - Judgment judgment = this.getById(judgmentRequest.getSecondId()); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ? iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); @@ -433,7 +416,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } return judgment; } @@ -687,7 +670,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } }); return judgmentList; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index be0440d..d4518b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -31,7 +31,7 @@ Object add(RealtimeWork realtimeWork); - Object delete(String realtimeWorkId); + Object delete(Long realtimeWorkId); Object batchDelete(List realtimeWorkIds); @@ -53,4 +53,6 @@ List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + List clickData(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index f7fd655..2b1cb1f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -60,4 +60,14 @@ public List getCountByStatus() { return this.baseMapper.getCountByStatus(); } + + @Override + public List getAreaCountByStatus(String type) { + return this.baseMapper.getAreaCountByStatus(type); + } + + @Override + public List getXfAreaCountByStatus(String type) { + return this.baseMapper.getXfAreaCountByStatus(type); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java index e588fc1..0571ceb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java @@ -23,8 +23,8 @@ public class CmdControlsInfoServiceImpl extends ServiceImpl implements ICmdControlsInfoService { @Override - public List getWebList() { + public List getWebList(String begTime,String endTime) { - return this.baseMapper.getWebList(); + return this.baseMapper.getWebList(begTime,endTime); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index c22f6b1..74b674a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -80,7 +80,69 @@ return hashMaps; } + public Map getDataByOther(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List> firstMapList = new ArrayList<>(); + List> secondMapList = new ArrayList<>(); + List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); + List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); + + List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); + dateTimeList.forEach(dateTime -> { + Map firstMap = new HashMap<>(); + Map secondMap = new HashMap<>(); + Map thirdMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("value", 0); + secondMap.put("name", DateUtil.formatDate(dateTime)); + secondMap.put("value", 0); + thirdMap.put("name", DateUtil.formatDate(dateTime)); + thirdMap.put("value", 0); + tagResponseList.forEach(tagResponse -> { + if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { + if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { + firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { + secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { + thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); + } + } + }); + dpMap.put("value", firstMap.get("value")); + dpMap.put("value1", secondMap.get("value")); + dpMap.put("value2", thirdMap.get("value")); + firstMapList.add(firstMap); + secondMapList.add(secondMap); + thirdMapList.add(thirdMap); + dpMapList.add(dpMap); + }); + //修改封装数据结构 + hashMap.put("zdzj", firstMapList); + hashMap.put("sjmg", secondMapList); + hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); + return hashMap; + } + + // public Map getDataByOther(JudgmentRequest judgmentRequest) { +// +// Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// //涉党政军 +// if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// list.forEach(commonRequest -> { +// CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue()); +// dpList.add(commonResponse); +// }); +// } +// +// // Map hashMap = new HashMap<>(); // List> firstMapList = new ArrayList<>(); // List> secondMapList = new ArrayList<>(); @@ -128,88 +190,6 @@ // return hashMap; // } - - public Map getDataByOther(JudgmentRequest judgmentRequest) { - - Judgment judgment = this.getById(judgmentRequest.getSecondId()); - List tagNames1 = new ArrayList<>(); - List tagNames2 = new ArrayList<>(); - List tagNames3 = new ArrayList<>(); - - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSjmgResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSjmgResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames1.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //常规信息 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getCgyqResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getCgyqResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames2.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //涉党政军 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames3.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - List tagResponseList = iCmdBodyRoamService.getTagResponses(DateUtil.formatDate(DateUtil.offsetDay(new Date(), -6)), DateUtil.formatDate(new Date())); - List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); - dateTimeList.forEach(dateTime -> { - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - - } - }); - }); - - Map hashMap = new HashMap<>(); - List> firstMapList = new ArrayList<>(); - List> secondMapList = new ArrayList<>(); - List> thirdMapList = new ArrayList<>(); - List> dpMapList = new ArrayList<>(); - - dateTimeList.forEach(dateTime -> { - Map firstMap = new HashMap<>(); - Map secondMap = new HashMap<>(); - Map thirdMap = new HashMap<>(); - Map dpMap = new HashMap<>(); - dpMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("value", 0); - secondMap.put("name", DateUtil.formatDate(dateTime)); - secondMap.put("value", 0); - thirdMap.put("name", DateUtil.formatDate(dateTime)); - thirdMap.put("value", 0); - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { - firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { - secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { - thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); - } - } - }); - dpMap.put("value", firstMap.get("value")); - dpMap.put("value1", secondMap.get("value")); - dpMap.put("value2", thirdMap.get("value")); - firstMapList.add(firstMap); - secondMapList.add(secondMap); - thirdMapList.add(thirdMap); - dpMapList.add(dpMap); - }); - //修改封装数据结构 - hashMap.put("zdzj", firstMapList); - hashMap.put("sjmg", secondMapList); - hashMap.put("cgxx", thirdMapList); - hashMap.put("dp", dpMapList); - return hashMap; - } - //根据录入历史数据统计(暂留) public Map getDataByLocal1(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); @@ -295,7 +275,8 @@ public Map getDataByLocal(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List dpList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// List> dpMapList = new ArrayList<>(); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); //涉党政军 if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); @@ -332,8 +313,9 @@ list.forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(dpList)) { dpList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue2(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(), commonRequest.getValue()); } }); } else { @@ -353,6 +335,7 @@ return iBusinessAccessService.getAccessStatus("2-sj") ? getDataByOther(judgmentRequest) : getDataByLocal(judgmentRequest); + } public List processUtil(List list1, List list2) { @@ -411,7 +394,7 @@ public Judgment getListByLocal(JudgmentRequest judgmentRequest) { - Judgment judgment = this.getById(judgmentRequest.getSecondId()); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ? iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); @@ -433,7 +416,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } return judgment; } @@ -687,7 +670,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } }); return judgmentList; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java index 87a08f6..d7efb55 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java @@ -110,7 +110,7 @@ } @Override - public Object delete(String realtimeWorkId) { + public Object delete(Long realtimeWorkId) { if (realtimeWorkMapper.deleteById(realtimeWorkId) > 0) { return ResponseData.success(); } @@ -153,18 +153,19 @@ for (CommonResponse commonResponse : commonResponseList) { if (ObjectUtil.isNotEmpty(commonResponse.getName())) { + Integer count = Double.valueOf(commonResponse.getValue()).intValue(); if (Arrays.binarySearch(DictMapDTO.sbArr, commonResponse.getName()) > -1) { - reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.cbypArr, commonResponse.getName()) > -1) { - firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zbzypArr, commonResponse.getName()) > -1) { - secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zzbzypArr, commonResponse.getName()) > -1) { - firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { - sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { - feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } } } @@ -175,8 +176,7 @@ @Override public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-lc") ? - getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-lc") ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); } public List> statisticsByHourTime() { @@ -199,8 +199,7 @@ List> mapList = new ArrayList<>(); reportInfoHashMap.put("sb", 0L); reportInfoList.forEach(reportInfo -> { - if (reportInfo.getReportTime() != null && - DateUtil.compare(reportInfo.getReportTime(), dateTime, "yyyy-MM-dd HH") == 0) { + if (reportInfo.getReportTime() != null && DateUtil.compare(reportInfo.getReportTime(), dateTime, "yyyy-MM-dd HH") == 0) { reportInfoHashMap.put("sb", reportInfoHashMap.get("sb") + 1); } @@ -240,16 +239,14 @@ List> mapList = new ArrayList<>(); reportInfoHashMap.put("sb", 0L); reportInfoList.forEach(reportInfo -> { - if (reportInfo.getReportTime() != null && - DateUtil.isSameDay(reportInfo.getReportTime(), dateTime)) { + if (reportInfo.getReportTime() != null && DateUtil.isSameDay(reportInfo.getReportTime(), dateTime)) { reportInfoHashMap.put("sb", reportInfoHashMap.get("sb") + 1); } }); handleRecordHashMap.put("xf", 0L); handleRecordList.forEach(handleRecord -> { - if (handleRecord.getHandleTime() != null && - DateUtil.isSameDay(handleRecord.getHandleTime(), dateTime)) { + if (handleRecord.getHandleTime() != null && DateUtil.isSameDay(handleRecord.getHandleTime(), dateTime)) { handleRecordHashMap.put("xf", handleRecordHashMap.get("xf") + 1); } }); @@ -337,18 +334,18 @@ } //从第三方获取平台统计结果 - public List> statisticsByOtherPlate() { + public List> statisticsByOtherPlate(BusinessReportInfoRequest businessReportInfoRequest) { List> resultMapList = new ArrayList<>(); //获取上报信息 - List list = iCmdControlsInfoService.getWebList(); + List list = iCmdControlsInfoService.getWebList(businessReportInfoRequest.getBeginTime(), + businessReportInfoRequest.getEndTime()); List dictList = dictService.findInDictByCode(DictEnum.PLATE); dictList.forEach(dict -> { HashMap resultMap = new HashMap<>(); resultMap.put("name", dict.getName()); resultMap.put("value", 0); list.forEach(cmdBodyCommonResponse -> { - if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && - cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) { + if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) { resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + 1); } }); @@ -359,20 +356,16 @@ @Override public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-pt") ? - statisticsByOtherPlate() : - statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-pt") ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); } //从第三方获取上报记录 public Map statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) { Map resultMap = new HashMap<>(); //获取上报信息 - List sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), - businessReportInfoRequest.getEndTime()); + List sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); //获取下发信息 - List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), - businessReportInfoRequest.getEndTime()); + List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); List> dpMapList = new ArrayList<>(); List> sbMapList = new ArrayList<>(); @@ -384,8 +377,7 @@ sbMap.put("name", DateUtil.hour(dateTime, true)); sbMap.put("value", 0); sbList.forEach(sb -> { - if (ObjectUtil.isNotEmpty(sb.getResultTime()) && - DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { + if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + 1); } }); @@ -400,8 +392,7 @@ xfMap.put("name", DateUtil.hour(dateTime, true)); xfMap.put("value", 0); xfList.forEach(xf -> { - if (ObjectUtil.isNotEmpty(xf.getResultTime()) && - DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { + if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + 1); } }); @@ -425,7 +416,7 @@ List> sbMapList = new ArrayList<>(); List> xfMapList = new ArrayList<>(); List> dpMapList = new ArrayList<>(); - Map dpMap = new HashMap<>(); + RealtimeWork realtimeWork = this.getById(id); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getReportResult())) { @@ -435,6 +426,7 @@ HashMap apiMap = new HashMap<>(); apiMap.put("value", it.getValue()); apiMap.put("name", it.getTime()); + Map dpMap = new HashMap<>(); dpMap.put("value", it.getValue()); dpMap.put("name", it.getTime()); dpMapList.add(dpMap); @@ -467,9 +459,7 @@ @Override public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-sj") ? - statisticsByOtherReport(businessReportInfoRequest) : - statisticsByLocalReport(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-sj") ? statisticsByOtherReport(businessReportInfoRequest) : statisticsByLocalReport(businessReportInfoRequest.getThirdId()); } @@ -481,7 +471,7 @@ //从本地获取标签统计结果 public List statisticsByLocalTag(BusinessReportInfoRequest request) { List commonRequestList = new ArrayList<>(); - RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); + RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getTagResult()); @@ -493,9 +483,7 @@ @Override public List statisticsByTag(BusinessReportInfoRequest request) { - return iBusinessAccessService.getAccessStatus("3-bq") ? - statisticsByOtherTag(request) : - statisticsByLocalTag(request); + return iBusinessAccessService.getAccessStatus("3-bq") ? statisticsByOtherTag(request) : statisticsByLocalTag(request); } @@ -574,8 +562,35 @@ @Override public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-qy") ? - statisticsByOtherArea(businessReportInfoRequest) : - statisticsByLocalArea(businessReportInfoRequest.getThirdId()); + + return businessReportInfoRequest.isFlag() ? clickData(businessReportInfoRequest) : + + (iBusinessAccessService.getAccessStatus("3-qy") ? statisticsByOtherArea(businessReportInfoRequest) : statisticsByLocalArea(businessReportInfoRequest.getThirdId())); + } + + @Override + public List clickData(BusinessReportInfoRequest businessReportInfoRequest) { + String type = businessReportInfoRequest.getSpecialItem(); + List commonResponseList = new ArrayList<>(); + + switch (type) { + case "1": + + case "2": + + case "5": + + case "6": + commonResponseList = iCmdBodyInfoService.getAreaCountByStatus(type); + break; + case "7": + + case "8.3": + commonResponseList = iCmdBodyInfoService.getXfAreaCountByStatus(type); + break; + default: + break; + } + return commonResponseList; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index be0440d..d4518b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -31,7 +31,7 @@ Object add(RealtimeWork realtimeWork); - Object delete(String realtimeWorkId); + Object delete(Long realtimeWorkId); Object batchDelete(List realtimeWorkIds); @@ -53,4 +53,6 @@ List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + List clickData(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index f7fd655..2b1cb1f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -60,4 +60,14 @@ public List getCountByStatus() { return this.baseMapper.getCountByStatus(); } + + @Override + public List getAreaCountByStatus(String type) { + return this.baseMapper.getAreaCountByStatus(type); + } + + @Override + public List getXfAreaCountByStatus(String type) { + return this.baseMapper.getXfAreaCountByStatus(type); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java index e588fc1..0571ceb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java @@ -23,8 +23,8 @@ public class CmdControlsInfoServiceImpl extends ServiceImpl implements ICmdControlsInfoService { @Override - public List getWebList() { + public List getWebList(String begTime,String endTime) { - return this.baseMapper.getWebList(); + return this.baseMapper.getWebList(begTime,endTime); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index c22f6b1..74b674a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -80,7 +80,69 @@ return hashMaps; } + public Map getDataByOther(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List> firstMapList = new ArrayList<>(); + List> secondMapList = new ArrayList<>(); + List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); + List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); + + List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); + dateTimeList.forEach(dateTime -> { + Map firstMap = new HashMap<>(); + Map secondMap = new HashMap<>(); + Map thirdMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("value", 0); + secondMap.put("name", DateUtil.formatDate(dateTime)); + secondMap.put("value", 0); + thirdMap.put("name", DateUtil.formatDate(dateTime)); + thirdMap.put("value", 0); + tagResponseList.forEach(tagResponse -> { + if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { + if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { + firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { + secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { + thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); + } + } + }); + dpMap.put("value", firstMap.get("value")); + dpMap.put("value1", secondMap.get("value")); + dpMap.put("value2", thirdMap.get("value")); + firstMapList.add(firstMap); + secondMapList.add(secondMap); + thirdMapList.add(thirdMap); + dpMapList.add(dpMap); + }); + //修改封装数据结构 + hashMap.put("zdzj", firstMapList); + hashMap.put("sjmg", secondMapList); + hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); + return hashMap; + } + + // public Map getDataByOther(JudgmentRequest judgmentRequest) { +// +// Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// //涉党政军 +// if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// list.forEach(commonRequest -> { +// CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue()); +// dpList.add(commonResponse); +// }); +// } +// +// // Map hashMap = new HashMap<>(); // List> firstMapList = new ArrayList<>(); // List> secondMapList = new ArrayList<>(); @@ -128,88 +190,6 @@ // return hashMap; // } - - public Map getDataByOther(JudgmentRequest judgmentRequest) { - - Judgment judgment = this.getById(judgmentRequest.getSecondId()); - List tagNames1 = new ArrayList<>(); - List tagNames2 = new ArrayList<>(); - List tagNames3 = new ArrayList<>(); - - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSjmgResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSjmgResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames1.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //常规信息 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getCgyqResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getCgyqResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames2.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //涉党政军 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames3.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - List tagResponseList = iCmdBodyRoamService.getTagResponses(DateUtil.formatDate(DateUtil.offsetDay(new Date(), -6)), DateUtil.formatDate(new Date())); - List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); - dateTimeList.forEach(dateTime -> { - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - - } - }); - }); - - Map hashMap = new HashMap<>(); - List> firstMapList = new ArrayList<>(); - List> secondMapList = new ArrayList<>(); - List> thirdMapList = new ArrayList<>(); - List> dpMapList = new ArrayList<>(); - - dateTimeList.forEach(dateTime -> { - Map firstMap = new HashMap<>(); - Map secondMap = new HashMap<>(); - Map thirdMap = new HashMap<>(); - Map dpMap = new HashMap<>(); - dpMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("value", 0); - secondMap.put("name", DateUtil.formatDate(dateTime)); - secondMap.put("value", 0); - thirdMap.put("name", DateUtil.formatDate(dateTime)); - thirdMap.put("value", 0); - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { - firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { - secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { - thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); - } - } - }); - dpMap.put("value", firstMap.get("value")); - dpMap.put("value1", secondMap.get("value")); - dpMap.put("value2", thirdMap.get("value")); - firstMapList.add(firstMap); - secondMapList.add(secondMap); - thirdMapList.add(thirdMap); - dpMapList.add(dpMap); - }); - //修改封装数据结构 - hashMap.put("zdzj", firstMapList); - hashMap.put("sjmg", secondMapList); - hashMap.put("cgxx", thirdMapList); - hashMap.put("dp", dpMapList); - return hashMap; - } - //根据录入历史数据统计(暂留) public Map getDataByLocal1(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); @@ -295,7 +275,8 @@ public Map getDataByLocal(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List dpList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// List> dpMapList = new ArrayList<>(); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); //涉党政军 if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); @@ -332,8 +313,9 @@ list.forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(dpList)) { dpList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue2(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(), commonRequest.getValue()); } }); } else { @@ -353,6 +335,7 @@ return iBusinessAccessService.getAccessStatus("2-sj") ? getDataByOther(judgmentRequest) : getDataByLocal(judgmentRequest); + } public List processUtil(List list1, List list2) { @@ -411,7 +394,7 @@ public Judgment getListByLocal(JudgmentRequest judgmentRequest) { - Judgment judgment = this.getById(judgmentRequest.getSecondId()); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ? iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); @@ -433,7 +416,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } return judgment; } @@ -687,7 +670,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } }); return judgmentList; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java index 87a08f6..d7efb55 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java @@ -110,7 +110,7 @@ } @Override - public Object delete(String realtimeWorkId) { + public Object delete(Long realtimeWorkId) { if (realtimeWorkMapper.deleteById(realtimeWorkId) > 0) { return ResponseData.success(); } @@ -153,18 +153,19 @@ for (CommonResponse commonResponse : commonResponseList) { if (ObjectUtil.isNotEmpty(commonResponse.getName())) { + Integer count = Double.valueOf(commonResponse.getValue()).intValue(); if (Arrays.binarySearch(DictMapDTO.sbArr, commonResponse.getName()) > -1) { - reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.cbypArr, commonResponse.getName()) > -1) { - firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zbzypArr, commonResponse.getName()) > -1) { - secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zzbzypArr, commonResponse.getName()) > -1) { - firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { - sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { - feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } } } @@ -175,8 +176,7 @@ @Override public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-lc") ? - getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-lc") ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); } public List> statisticsByHourTime() { @@ -199,8 +199,7 @@ List> mapList = new ArrayList<>(); reportInfoHashMap.put("sb", 0L); reportInfoList.forEach(reportInfo -> { - if (reportInfo.getReportTime() != null && - DateUtil.compare(reportInfo.getReportTime(), dateTime, "yyyy-MM-dd HH") == 0) { + if (reportInfo.getReportTime() != null && DateUtil.compare(reportInfo.getReportTime(), dateTime, "yyyy-MM-dd HH") == 0) { reportInfoHashMap.put("sb", reportInfoHashMap.get("sb") + 1); } @@ -240,16 +239,14 @@ List> mapList = new ArrayList<>(); reportInfoHashMap.put("sb", 0L); reportInfoList.forEach(reportInfo -> { - if (reportInfo.getReportTime() != null && - DateUtil.isSameDay(reportInfo.getReportTime(), dateTime)) { + if (reportInfo.getReportTime() != null && DateUtil.isSameDay(reportInfo.getReportTime(), dateTime)) { reportInfoHashMap.put("sb", reportInfoHashMap.get("sb") + 1); } }); handleRecordHashMap.put("xf", 0L); handleRecordList.forEach(handleRecord -> { - if (handleRecord.getHandleTime() != null && - DateUtil.isSameDay(handleRecord.getHandleTime(), dateTime)) { + if (handleRecord.getHandleTime() != null && DateUtil.isSameDay(handleRecord.getHandleTime(), dateTime)) { handleRecordHashMap.put("xf", handleRecordHashMap.get("xf") + 1); } }); @@ -337,18 +334,18 @@ } //从第三方获取平台统计结果 - public List> statisticsByOtherPlate() { + public List> statisticsByOtherPlate(BusinessReportInfoRequest businessReportInfoRequest) { List> resultMapList = new ArrayList<>(); //获取上报信息 - List list = iCmdControlsInfoService.getWebList(); + List list = iCmdControlsInfoService.getWebList(businessReportInfoRequest.getBeginTime(), + businessReportInfoRequest.getEndTime()); List dictList = dictService.findInDictByCode(DictEnum.PLATE); dictList.forEach(dict -> { HashMap resultMap = new HashMap<>(); resultMap.put("name", dict.getName()); resultMap.put("value", 0); list.forEach(cmdBodyCommonResponse -> { - if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && - cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) { + if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) { resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + 1); } }); @@ -359,20 +356,16 @@ @Override public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-pt") ? - statisticsByOtherPlate() : - statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-pt") ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); } //从第三方获取上报记录 public Map statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) { Map resultMap = new HashMap<>(); //获取上报信息 - List sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), - businessReportInfoRequest.getEndTime()); + List sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); //获取下发信息 - List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), - businessReportInfoRequest.getEndTime()); + List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); List> dpMapList = new ArrayList<>(); List> sbMapList = new ArrayList<>(); @@ -384,8 +377,7 @@ sbMap.put("name", DateUtil.hour(dateTime, true)); sbMap.put("value", 0); sbList.forEach(sb -> { - if (ObjectUtil.isNotEmpty(sb.getResultTime()) && - DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { + if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + 1); } }); @@ -400,8 +392,7 @@ xfMap.put("name", DateUtil.hour(dateTime, true)); xfMap.put("value", 0); xfList.forEach(xf -> { - if (ObjectUtil.isNotEmpty(xf.getResultTime()) && - DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { + if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + 1); } }); @@ -425,7 +416,7 @@ List> sbMapList = new ArrayList<>(); List> xfMapList = new ArrayList<>(); List> dpMapList = new ArrayList<>(); - Map dpMap = new HashMap<>(); + RealtimeWork realtimeWork = this.getById(id); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getReportResult())) { @@ -435,6 +426,7 @@ HashMap apiMap = new HashMap<>(); apiMap.put("value", it.getValue()); apiMap.put("name", it.getTime()); + Map dpMap = new HashMap<>(); dpMap.put("value", it.getValue()); dpMap.put("name", it.getTime()); dpMapList.add(dpMap); @@ -467,9 +459,7 @@ @Override public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-sj") ? - statisticsByOtherReport(businessReportInfoRequest) : - statisticsByLocalReport(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-sj") ? statisticsByOtherReport(businessReportInfoRequest) : statisticsByLocalReport(businessReportInfoRequest.getThirdId()); } @@ -481,7 +471,7 @@ //从本地获取标签统计结果 public List statisticsByLocalTag(BusinessReportInfoRequest request) { List commonRequestList = new ArrayList<>(); - RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); + RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getTagResult()); @@ -493,9 +483,7 @@ @Override public List statisticsByTag(BusinessReportInfoRequest request) { - return iBusinessAccessService.getAccessStatus("3-bq") ? - statisticsByOtherTag(request) : - statisticsByLocalTag(request); + return iBusinessAccessService.getAccessStatus("3-bq") ? statisticsByOtherTag(request) : statisticsByLocalTag(request); } @@ -574,8 +562,35 @@ @Override public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-qy") ? - statisticsByOtherArea(businessReportInfoRequest) : - statisticsByLocalArea(businessReportInfoRequest.getThirdId()); + + return businessReportInfoRequest.isFlag() ? clickData(businessReportInfoRequest) : + + (iBusinessAccessService.getAccessStatus("3-qy") ? statisticsByOtherArea(businessReportInfoRequest) : statisticsByLocalArea(businessReportInfoRequest.getThirdId())); + } + + @Override + public List clickData(BusinessReportInfoRequest businessReportInfoRequest) { + String type = businessReportInfoRequest.getSpecialItem(); + List commonResponseList = new ArrayList<>(); + + switch (type) { + case "1": + + case "2": + + case "5": + + case "6": + commonResponseList = iCmdBodyInfoService.getAreaCountByStatus(type); + break; + case "7": + + case "8.3": + commonResponseList = iCmdBodyInfoService.getXfAreaCountByStatus(type); + break; + default: + break; + } + return commonResponseList; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java index 5944569..aa81ba2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -86,6 +87,7 @@ Summary summary = this.getById(id); List commonResponseList = new ArrayList<>(); +// List> mapList = new ArrayList<>(); if (ObjectUtil.isNotEmpty(summary.getForeignDetail())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignDetail()); @@ -128,14 +130,19 @@ commonResponse.setName(commonRequest.getTime()); commonResponse.setValue(commonRequest.getValue()); commonResponseList.add(commonResponse); +// Map map = new HashMap<>(); +// map.put("name",commonRequest.getTime()); +// map.put(commonRequest.getTimeType(),commonRequest.getValue()); +// mapList.add(map); }); } if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { summary.getForeignResultList().forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(commonResponseList)) { commonResponseList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue1(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(),commonRequest.getValue()); } }); } else { @@ -150,8 +157,9 @@ summary.getSpreadResultList().forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(commonResponseList)) { commonResponseList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue2(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(),commonRequest.getValue()); } }); } else { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 3139ff5..5aa1d4d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -10,6 +10,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.JudgmentRequest; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; @@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -54,7 +56,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgment = judgmentService.getList(judgmentRequest); + List judgment = judgmentService.getList(judgmentRequest); return ResponseData.success(judgment); } @@ -91,16 +93,16 @@ @ResponseBody public Object add(@RequestBody Judgment judgment) { - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.save(judgment)); @@ -111,11 +113,14 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String judgmentId) { - judgmentService.removeById(judgmentId); - return ResponseData.success(); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ResponseData.success(judgmentService.removeById(idDTO.getId())); } + /** * 批量删除 */ @@ -135,16 +140,16 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle1List())) { judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle2List())) { judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + if (ObjectUtil.isNotEmpty(judgment.getTitle3List())) { judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getDescDetail())){ + if (ObjectUtil.isNotEmpty(judgment.getDescDetail())) { judgment.setDescription(JSON.toJSONString(judgment.getDescDetail(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -159,17 +164,18 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getCgyqResultList())) { judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSdzjResultList())) { judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); } - if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + if (ObjectUtil.isNotEmpty(judgment.getSjmgResultList())) { judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); } + /** * 修改每日研判通报标签分类占比 */ @@ -179,7 +185,7 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + if (ObjectUtil.isNotEmpty(judgment.getTagList())) { judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); } return ResponseData.success(judgmentService.updateById(judgment)); @@ -221,7 +227,7 @@ @ResponseBody public Object testUrl(String url) throws Exception { - cmdBodyRoamService.getMapList("",""); + cmdBodyRoamService.getMapList("", ""); return true; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index a04d952..fc11153 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -9,6 +9,7 @@ import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; @@ -155,8 +156,11 @@ */ @RequestMapping(value = "/delete") @ResponseBody - public Object delete(@RequestParam String realtimeWorkId) { - return realtimeWorkService.delete(realtimeWorkId); + public Object delete(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return realtimeWorkService.delete(idDTO.getId()); } /** @@ -265,4 +269,13 @@ public Object getAreas() { return ResponseData.success(iAreaService.list()); } + + /** + * 流程图中点击事件 + */ + @RequestMapping(value = "/clickData") + @ResponseBody + public Object clickData(BusinessReportInfoRequest request) { + return ResponseData.success(realtimeWorkService.clickData(request)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index ee3b738..5608e1b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -172,6 +172,21 @@ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); Summary summaryDetail = summaryService.getById(summary.getId()); + + + if (ObjectUtil.isNotEmpty(summary.getCommonRequestList())) { + summary.setPlateResult(JSON.toJSONString(summary.getCommonRequestList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getDiscoveryResultList())) { + summary.setDiscoveryResult(JSON.toJSONString(summary.getDiscoveryResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { + summary.setForeignResult(JSON.toJSONString(summary.getForeignResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getSpreadResultList())) { + summary.setSpreadResult(JSON.toJSONString(summary.getSpreadResultList(), true)); + } + if (ObjectUtil.isNotEmpty(summary.getForeignDetailList())) { summaryDetail.setForeignDetail(JSON.toJSONString(summary.getForeignDetailList(), true)); } @@ -182,7 +197,7 @@ summaryDetail.setProcessDetail(JSON.toJSONString(summary.getProcessDetailList(), true)); } - return ResponseData.success(summaryService.update(summary)); + return ResponseData.success(summaryService.update(summaryDetail)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java index fc7cbb4..d69b570 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java @@ -31,6 +31,10 @@ List getCountByStatus(); + List getAreaCountByStatus( @Param("type") String type); + + List getXfAreaCountByStatus( @Param("type") String type); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java index 29ae738..6e751b0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.model.CmdControlsInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.RealtimeWork; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,6 +19,7 @@ public interface CmdControlsInfoMapper extends BaseMapper { - List getWebList(); + List getWebList(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml index 30fe80e..e7fa8df 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml @@ -6,11 +6,11 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -75,9 +75,6 @@ - - - - SELECT t.bodyState AS name, sum(t.links ) AS value FROM ( - SELECT cb.`body_state` as bodyState ,cc.`controls_link` as links FROM cmd_body_info cb - LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.`body_nature`=0 and cb.body_state in('1','2','5','6','7','8.3')) t GROUP BY - t.bodyState + SELECT t.bodyState AS name, sum(t.links) AS value + FROM ( + SELECT cb.`body_state` as bodyState, cc.`controls_link` as links FROM cmd_body_info cb + LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id + WHERE cb.`body_nature`=0 and cb.body_state in ('1', '2', '5', '6', '7', '8.3')) t + GROUP BY + t.bodyState + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 457025c..4c4ebce 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -22,34 +22,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java index 65ae7b7..8142f95 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java @@ -15,5 +15,8 @@ private Long thirdId; + //用于初始化和点击事件刷新地图数据区分 1：点击事件，0：初始化 + private boolean flag; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index f6acec9..8ef61d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; /** *

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 33cf5c4..66a8432 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -30,5 +30,9 @@ List getCmdBodyInfosByStatus(); //查询实时上报至返回条数 List getCountByStatus(); + //查询实时上报至返回条数对应区域 + List getAreaCountByStatus(String type); + //查询实时下发至返回条数对应区域 + List getXfAreaCountByStatus(String type); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java index dbc171c..bad8785 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java @@ -16,6 +16,6 @@ */ public interface ICmdControlsInfoService extends IService { - List getWebList(); + List getWebList(String begTime,String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index be0440d..d4518b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -31,7 +31,7 @@ Object add(RealtimeWork realtimeWork); - Object delete(String realtimeWorkId); + Object delete(Long realtimeWorkId); Object batchDelete(List realtimeWorkIds); @@ -53,4 +53,6 @@ List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + List clickData(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index f7fd655..2b1cb1f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -60,4 +60,14 @@ public List getCountByStatus() { return this.baseMapper.getCountByStatus(); } + + @Override + public List getAreaCountByStatus(String type) { + return this.baseMapper.getAreaCountByStatus(type); + } + + @Override + public List getXfAreaCountByStatus(String type) { + return this.baseMapper.getXfAreaCountByStatus(type); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java index e588fc1..0571ceb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdControlsInfoServiceImpl.java @@ -23,8 +23,8 @@ public class CmdControlsInfoServiceImpl extends ServiceImpl implements ICmdControlsInfoService { @Override - public List getWebList() { + public List getWebList(String begTime,String endTime) { - return this.baseMapper.getWebList(); + return this.baseMapper.getWebList(begTime,endTime); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index c22f6b1..74b674a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -80,7 +80,69 @@ return hashMaps; } + public Map getDataByOther(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List> firstMapList = new ArrayList<>(); + List> secondMapList = new ArrayList<>(); + List> thirdMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); + List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); + + List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); + dateTimeList.forEach(dateTime -> { + Map firstMap = new HashMap<>(); + Map secondMap = new HashMap<>(); + Map thirdMap = new HashMap<>(); + Map dpMap = new HashMap<>(); + dpMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("name", DateUtil.formatDate(dateTime)); + firstMap.put("value", 0); + secondMap.put("name", DateUtil.formatDate(dateTime)); + secondMap.put("value", 0); + thirdMap.put("name", DateUtil.formatDate(dateTime)); + thirdMap.put("value", 0); + tagResponseList.forEach(tagResponse -> { + if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { + if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { + firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { + secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); + } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { + thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); + } + } + }); + dpMap.put("value", firstMap.get("value")); + dpMap.put("value1", secondMap.get("value")); + dpMap.put("value2", thirdMap.get("value")); + firstMapList.add(firstMap); + secondMapList.add(secondMap); + thirdMapList.add(thirdMap); + dpMapList.add(dpMap); + }); + //修改封装数据结构 + hashMap.put("zdzj", firstMapList); + hashMap.put("sjmg", secondMapList); + hashMap.put("cgxx", thirdMapList); + hashMap.put("dp", dpMapList); + return hashMap; + } + + // public Map getDataByOther(JudgmentRequest judgmentRequest) { +// +// Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// //涉党政军 +// if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// list.forEach(commonRequest -> { +// CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue()); +// dpList.add(commonResponse); +// }); +// } +// +// // Map hashMap = new HashMap<>(); // List> firstMapList = new ArrayList<>(); // List> secondMapList = new ArrayList<>(); @@ -128,88 +190,6 @@ // return hashMap; // } - - public Map getDataByOther(JudgmentRequest judgmentRequest) { - - Judgment judgment = this.getById(judgmentRequest.getSecondId()); - List tagNames1 = new ArrayList<>(); - List tagNames2 = new ArrayList<>(); - List tagNames3 = new ArrayList<>(); - - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSjmgResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSjmgResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames1.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //常规信息 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getCgyqResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getCgyqResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames2.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - - //涉党政军 - if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - tagNames3.addAll(list.stream().map(commonRequest -> commonRequest.getName()).collect(Collectors.toList())); - } - List tagResponseList = iCmdBodyRoamService.getTagResponses(DateUtil.formatDate(DateUtil.offsetDay(new Date(), -6)), DateUtil.formatDate(new Date())); - List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); - dateTimeList.forEach(dateTime -> { - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - - } - }); - }); - - Map hashMap = new HashMap<>(); - List> firstMapList = new ArrayList<>(); - List> secondMapList = new ArrayList<>(); - List> thirdMapList = new ArrayList<>(); - List> dpMapList = new ArrayList<>(); - - dateTimeList.forEach(dateTime -> { - Map firstMap = new HashMap<>(); - Map secondMap = new HashMap<>(); - Map thirdMap = new HashMap<>(); - Map dpMap = new HashMap<>(); - dpMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("name", DateUtil.formatDate(dateTime)); - firstMap.put("value", 0); - secondMap.put("name", DateUtil.formatDate(dateTime)); - secondMap.put("value", 0); - thirdMap.put("name", DateUtil.formatDate(dateTime)); - thirdMap.put("value", 0); - tagResponseList.forEach(tagResponse -> { - if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { - if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) { - firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) { - secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1); - } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) { - thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1); - } - } - }); - dpMap.put("value", firstMap.get("value")); - dpMap.put("value1", secondMap.get("value")); - dpMap.put("value2", thirdMap.get("value")); - firstMapList.add(firstMap); - secondMapList.add(secondMap); - thirdMapList.add(thirdMap); - dpMapList.add(dpMap); - }); - //修改封装数据结构 - hashMap.put("zdzj", firstMapList); - hashMap.put("sjmg", secondMapList); - hashMap.put("cgxx", thirdMapList); - hashMap.put("dp", dpMapList); - return hashMap; - } - //根据录入历史数据统计(暂留) public Map getDataByLocal1(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); @@ -295,7 +275,8 @@ public Map getDataByLocal(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List dpList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getSecondId()); +// List> dpMapList = new ArrayList<>(); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); //涉党政军 if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); @@ -332,8 +313,9 @@ list.forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(dpList)) { dpList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue2(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(), commonRequest.getValue()); } }); } else { @@ -353,6 +335,7 @@ return iBusinessAccessService.getAccessStatus("2-sj") ? getDataByOther(judgmentRequest) : getDataByLocal(judgmentRequest); + } public List processUtil(List list1, List list2) { @@ -411,7 +394,7 @@ public Judgment getListByLocal(JudgmentRequest judgmentRequest) { - Judgment judgment = this.getById(judgmentRequest.getSecondId()); + Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ? iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); @@ -433,7 +416,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } return judgment; } @@ -687,7 +670,7 @@ JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); // judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); judgment.setName(jsonObject.getString("name")); - judgment.setName(jsonObject.getString("value")); + judgment.setValue(jsonObject.getString("value")); } }); return judgmentList; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java index 87a08f6..d7efb55 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java @@ -110,7 +110,7 @@ } @Override - public Object delete(String realtimeWorkId) { + public Object delete(Long realtimeWorkId) { if (realtimeWorkMapper.deleteById(realtimeWorkId) > 0) { return ResponseData.success(); } @@ -153,18 +153,19 @@ for (CommonResponse commonResponse : commonResponseList) { if (ObjectUtil.isNotEmpty(commonResponse.getName())) { + Integer count = Double.valueOf(commonResponse.getValue()).intValue(); if (Arrays.binarySearch(DictMapDTO.sbArr, commonResponse.getName()) > -1) { - reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.cbypArr, commonResponse.getName()) > -1) { - firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zbzypArr, commonResponse.getName()) > -1) { - secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zzbzypArr, commonResponse.getName()) > -1) { - firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { - sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { - feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } } } @@ -175,8 +176,7 @@ @Override public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-lc") ? - getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-lc") ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); } public List> statisticsByHourTime() { @@ -199,8 +199,7 @@ List> mapList = new ArrayList<>(); reportInfoHashMap.put("sb", 0L); reportInfoList.forEach(reportInfo -> { - if (reportInfo.getReportTime() != null && - DateUtil.compare(reportInfo.getReportTime(), dateTime, "yyyy-MM-dd HH") == 0) { + if (reportInfo.getReportTime() != null && DateUtil.compare(reportInfo.getReportTime(), dateTime, "yyyy-MM-dd HH") == 0) { reportInfoHashMap.put("sb", reportInfoHashMap.get("sb") + 1); } @@ -240,16 +239,14 @@ List> mapList = new ArrayList<>(); reportInfoHashMap.put("sb", 0L); reportInfoList.forEach(reportInfo -> { - if (reportInfo.getReportTime() != null && - DateUtil.isSameDay(reportInfo.getReportTime(), dateTime)) { + if (reportInfo.getReportTime() != null && DateUtil.isSameDay(reportInfo.getReportTime(), dateTime)) { reportInfoHashMap.put("sb", reportInfoHashMap.get("sb") + 1); } }); handleRecordHashMap.put("xf", 0L); handleRecordList.forEach(handleRecord -> { - if (handleRecord.getHandleTime() != null && - DateUtil.isSameDay(handleRecord.getHandleTime(), dateTime)) { + if (handleRecord.getHandleTime() != null && DateUtil.isSameDay(handleRecord.getHandleTime(), dateTime)) { handleRecordHashMap.put("xf", handleRecordHashMap.get("xf") + 1); } }); @@ -337,18 +334,18 @@ } //从第三方获取平台统计结果 - public List> statisticsByOtherPlate() { + public List> statisticsByOtherPlate(BusinessReportInfoRequest businessReportInfoRequest) { List> resultMapList = new ArrayList<>(); //获取上报信息 - List list = iCmdControlsInfoService.getWebList(); + List list = iCmdControlsInfoService.getWebList(businessReportInfoRequest.getBeginTime(), + businessReportInfoRequest.getEndTime()); List dictList = dictService.findInDictByCode(DictEnum.PLATE); dictList.forEach(dict -> { HashMap resultMap = new HashMap<>(); resultMap.put("name", dict.getName()); resultMap.put("value", 0); list.forEach(cmdBodyCommonResponse -> { - if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && - cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) { + if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) { resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + 1); } }); @@ -359,20 +356,16 @@ @Override public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-pt") ? - statisticsByOtherPlate() : - statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-pt") ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); } //从第三方获取上报记录 public Map statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) { Map resultMap = new HashMap<>(); //获取上报信息 - List sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), - businessReportInfoRequest.getEndTime()); + List sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); //获取下发信息 - List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), - businessReportInfoRequest.getEndTime()); + List xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); List> dpMapList = new ArrayList<>(); List> sbMapList = new ArrayList<>(); @@ -384,8 +377,7 @@ sbMap.put("name", DateUtil.hour(dateTime, true)); sbMap.put("value", 0); sbList.forEach(sb -> { - if (ObjectUtil.isNotEmpty(sb.getResultTime()) && - DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { + if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + 1); } }); @@ -400,8 +392,7 @@ xfMap.put("name", DateUtil.hour(dateTime, true)); xfMap.put("value", 0); xfList.forEach(xf -> { - if (ObjectUtil.isNotEmpty(xf.getResultTime()) && - DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { + if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) { xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + 1); } }); @@ -425,7 +416,7 @@ List> sbMapList = new ArrayList<>(); List> xfMapList = new ArrayList<>(); List> dpMapList = new ArrayList<>(); - Map dpMap = new HashMap<>(); + RealtimeWork realtimeWork = this.getById(id); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getReportResult())) { @@ -435,6 +426,7 @@ HashMap apiMap = new HashMap<>(); apiMap.put("value", it.getValue()); apiMap.put("name", it.getTime()); + Map dpMap = new HashMap<>(); dpMap.put("value", it.getValue()); dpMap.put("name", it.getTime()); dpMapList.add(dpMap); @@ -467,9 +459,7 @@ @Override public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-sj") ? - statisticsByOtherReport(businessReportInfoRequest) : - statisticsByLocalReport(businessReportInfoRequest.getThirdId()); + return iBusinessAccessService.getAccessStatus("3-sj") ? statisticsByOtherReport(businessReportInfoRequest) : statisticsByLocalReport(businessReportInfoRequest.getThirdId()); } @@ -481,7 +471,7 @@ //从本地获取标签统计结果 public List statisticsByLocalTag(BusinessReportInfoRequest request) { List commonRequestList = new ArrayList<>(); - RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); + RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getTagResult()); @@ -493,9 +483,7 @@ @Override public List statisticsByTag(BusinessReportInfoRequest request) { - return iBusinessAccessService.getAccessStatus("3-bq") ? - statisticsByOtherTag(request) : - statisticsByLocalTag(request); + return iBusinessAccessService.getAccessStatus("3-bq") ? statisticsByOtherTag(request) : statisticsByLocalTag(request); } @@ -574,8 +562,35 @@ @Override public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-qy") ? - statisticsByOtherArea(businessReportInfoRequest) : - statisticsByLocalArea(businessReportInfoRequest.getThirdId()); + + return businessReportInfoRequest.isFlag() ? clickData(businessReportInfoRequest) : + + (iBusinessAccessService.getAccessStatus("3-qy") ? statisticsByOtherArea(businessReportInfoRequest) : statisticsByLocalArea(businessReportInfoRequest.getThirdId())); + } + + @Override + public List clickData(BusinessReportInfoRequest businessReportInfoRequest) { + String type = businessReportInfoRequest.getSpecialItem(); + List commonResponseList = new ArrayList<>(); + + switch (type) { + case "1": + + case "2": + + case "5": + + case "6": + commonResponseList = iCmdBodyInfoService.getAreaCountByStatus(type); + break; + case "7": + + case "8.3": + commonResponseList = iCmdBodyInfoService.getXfAreaCountByStatus(type); + break; + default: + break; + } + return commonResponseList; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java index 5944569..aa81ba2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -86,6 +87,7 @@ Summary summary = this.getById(id); List commonResponseList = new ArrayList<>(); +// List> mapList = new ArrayList<>(); if (ObjectUtil.isNotEmpty(summary.getForeignDetail())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignDetail()); @@ -128,14 +130,19 @@ commonResponse.setName(commonRequest.getTime()); commonResponse.setValue(commonRequest.getValue()); commonResponseList.add(commonResponse); +// Map map = new HashMap<>(); +// map.put("name",commonRequest.getTime()); +// map.put(commonRequest.getTimeType(),commonRequest.getValue()); +// mapList.add(map); }); } if (ObjectUtil.isNotEmpty(summary.getForeignResultList())) { summary.getForeignResultList().forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(commonResponseList)) { commonResponseList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue1(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(),commonRequest.getValue()); } }); } else { @@ -150,8 +157,9 @@ summary.getSpreadResultList().forEach(commonRequest -> { if (ObjectUtil.isNotEmpty(commonResponseList)) { commonResponseList.forEach(commonResponse -> { - if (commonResponse.getName().equals(commonRequest.getTime())) { + if ((commonResponse.getName()).equals(commonRequest.getTime())) { commonResponse.setValue2(commonRequest.getValue()); +// map.put(commonRequest.getTimeType(),commonRequest.getValue()); } }); } else { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 41718db..6e82c8e 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: dm.jdbc.driver.DmDriver - url: jdbc:dm://139.198.29.133:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8 + url: jdbc:dm://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8 username: CASIC_XINJIANG password: Casic203! dynamic: @@ -12,12 +12,12 @@ strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 datasource: master: - url: jdbc:dm://139.198.29.133:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8 + url: jdbc:dm://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8 driver-class-name: dm.jdbc.driver.DmDriver username: CASIC_XINJIANG password: Casic203! subdepot: - url: jdbc:mysql://139.198.18.188:3306/casic_jy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://139.198.18.188:3306/casic_jy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useCursorFetch=true&defaultFetchSize=100 driver-class-name: com.mysql.jdbc.Driver username: emsroot password: emsroot#203