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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java index 10b055c..2b5c5cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java @@ -47,17 +47,17 @@ //0.63 五科 （社会二科 A20500） //0.64 六科 （境外科 A20300）4 //1 上报 - public static String[] sbArr={"1"}; + public static String[] sbArr={"0.49","1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"2"}; + public static String[] cbypArr={"4"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6"}; + public static String[] zzbzypArr={"7"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java index 10b055c..2b5c5cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java @@ -47,17 +47,17 @@ //0.63 五科 （社会二科 A20500） //0.64 六科 （境外科 A20300）4 //1 上报 - public static String[] sbArr={"1"}; + public static String[] sbArr={"0.49","1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"2"}; + public static String[] cbypArr={"4"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6"}; + public static String[] zzbzypArr={"7"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index acb2ed7..b9ca4ad 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -102,6 +102,17 @@ @TableField("AREA_RESULT") private String areaResult; + /** + * 开始时间 + */ + @TableField("START_TIME") + private String startTime; + /** + * 结束时间,用于统计时间 + */ + @TableField("END_TIME") + private String endTime; + @TableField(exist = false) private List areaResultList; 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java index 10b055c..2b5c5cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java @@ -47,17 +47,17 @@ //0.63 五科 （社会二科 A20500） //0.64 六科 （境外科 A20300）4 //1 上报 - public static String[] sbArr={"1"}; + public static String[] sbArr={"0.49","1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"2"}; + public static String[] cbypArr={"4"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6"}; + public static String[] zzbzypArr={"7"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index acb2ed7..b9ca4ad 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -102,6 +102,17 @@ @TableField("AREA_RESULT") private String areaResult; + /** + * 开始时间 + */ + @TableField("START_TIME") + private String startTime; + /** + * 结束时间,用于统计时间 + */ + @TableField("END_TIME") + private String endTime; + @TableField(exist = false) private List areaResultList; 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 b300397..6eabe1f 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 @@ -37,5 +37,7 @@ List getAreaCountByStatus(String type); //查询实时下发至返回条数对应区域 List getXfAreaCountByStatus(String type); + //获取反馈数 body_state值>=8.3 + Integer getFeedCount(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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java index 10b055c..2b5c5cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java @@ -47,17 +47,17 @@ //0.63 五科 （社会二科 A20500） //0.64 六科 （境外科 A20300）4 //1 上报 - public static String[] sbArr={"1"}; + public static String[] sbArr={"0.49","1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"2"}; + public static String[] cbypArr={"4"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6"}; + public static String[] zzbzypArr={"7"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index acb2ed7..b9ca4ad 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -102,6 +102,17 @@ @TableField("AREA_RESULT") private String areaResult; + /** + * 开始时间 + */ + @TableField("START_TIME") + private String startTime; + /** + * 结束时间,用于统计时间 + */ + @TableField("END_TIME") + private String endTime; + @TableField(exist = false) private List areaResultList; 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 b300397..6eabe1f 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 @@ -37,5 +37,7 @@ List getAreaCountByStatus(String type); //查询实时下发至返回条数对应区域 List getXfAreaCountByStatus(String type); + //获取反馈数 body_state值>=8.3 + Integer getFeedCount(String begTime, String endTime); } 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 2386135..034998b 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 @@ -75,4 +75,10 @@ public List getXfAreaCountByStatus(String type) { return this.baseMapper.getXfAreaCountByStatus(type); } + + @Override + public Integer getFeedCount(String begTime, String endTime) { + Integer count = this.baseMapper.getFeedCount(begTime,endTime); + return count; + } } 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java index 10b055c..2b5c5cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java @@ -47,17 +47,17 @@ //0.63 五科 （社会二科 A20500） //0.64 六科 （境外科 A20300）4 //1 上报 - public static String[] sbArr={"1"}; + public static String[] sbArr={"0.49","1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"2"}; + public static String[] cbypArr={"4"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6"}; + public static String[] zzbzypArr={"7"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index acb2ed7..b9ca4ad 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -102,6 +102,17 @@ @TableField("AREA_RESULT") private String areaResult; + /** + * 开始时间 + */ + @TableField("START_TIME") + private String startTime; + /** + * 结束时间,用于统计时间 + */ + @TableField("END_TIME") + private String endTime; + @TableField(exist = false) private List areaResultList; 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 b300397..6eabe1f 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 @@ -37,5 +37,7 @@ List getAreaCountByStatus(String type); //查询实时下发至返回条数对应区域 List getXfAreaCountByStatus(String type); + //获取反馈数 body_state值>=8.3 + Integer getFeedCount(String begTime, String endTime); } 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 2386135..034998b 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 @@ -75,4 +75,10 @@ public List getXfAreaCountByStatus(String type) { return this.baseMapper.getXfAreaCountByStatus(type); } + + @Override + public Integer getFeedCount(String begTime, String endTime) { + Integer count = this.baseMapper.getFeedCount(begTime,endTime); + return count; + } } 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 fcbb89d..30dea56 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 @@ -335,8 +335,8 @@ public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { return iBusinessAccessService.getAccessStatus("2-sj")&& (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ? - getDataByOther(judgmentRequest) : - getDataByLocal(judgmentRequest); + getDataByLocal(judgmentRequest): + getDataByOther(judgmentRequest); } @@ -399,7 +399,7 @@ Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())? - iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); + judgment.getJudgmentTotal(): iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime())); if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java index 10b055c..2b5c5cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java @@ -47,17 +47,17 @@ //0.63 五科 （社会二科 A20500） //0.64 六科 （境外科 A20300）4 //1 上报 - public static String[] sbArr={"1"}; + public static String[] sbArr={"0.49","1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"2"}; + public static String[] cbypArr={"4"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6"}; + public static String[] zzbzypArr={"7"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index acb2ed7..b9ca4ad 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -102,6 +102,17 @@ @TableField("AREA_RESULT") private String areaResult; + /** + * 开始时间 + */ + @TableField("START_TIME") + private String startTime; + /** + * 结束时间,用于统计时间 + */ + @TableField("END_TIME") + private String endTime; + @TableField(exist = false) private List areaResultList; 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 b300397..6eabe1f 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 @@ -37,5 +37,7 @@ List getAreaCountByStatus(String type); //查询实时下发至返回条数对应区域 List getXfAreaCountByStatus(String type); + //获取反馈数 body_state值>=8.3 + Integer getFeedCount(String begTime, String endTime); } 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 2386135..034998b 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 @@ -75,4 +75,10 @@ public List getXfAreaCountByStatus(String type) { return this.baseMapper.getXfAreaCountByStatus(type); } + + @Override + public Integer getFeedCount(String begTime, String endTime) { + Integer count = this.baseMapper.getFeedCount(begTime,endTime); + return count; + } } 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 fcbb89d..30dea56 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 @@ -335,8 +335,8 @@ public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { return iBusinessAccessService.getAccessStatus("2-sj")&& (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ? - getDataByOther(judgmentRequest) : - getDataByLocal(judgmentRequest); + getDataByLocal(judgmentRequest): + getDataByOther(judgmentRequest); } @@ -399,7 +399,7 @@ Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())? - iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); + judgment.getJudgmentTotal(): iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime())); if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); 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 40a0497..5416b7d 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 @@ -155,6 +155,7 @@ // List cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus(); int reportedCount = 0, firstJudgmentCount = 0, secondLeaderCount = 0, firstLeaderCount = 0, sendCount = 0, feedbackCount = 0; + for (CommonResponse commonResponse : commonResponseList) { if (ObjectUtil.isNotEmpty(commonResponse.getName())) { Integer count = Double.valueOf(commonResponse.getValue()).intValue(); @@ -166,13 +167,18 @@ secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zzbzypArr, commonResponse.getName()) > -1) { firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; - } else if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { - sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; - } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { - feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } + + if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { + sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; + } +// else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { +// feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; +// } } } + feedbackCount = iCmdBodyInfoService.getFeedCount(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); + return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount); @@ -180,8 +186,14 @@ @Override public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-lc") && (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) - ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); + + businessReportInfoRequest.setEndTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime()); + businessReportInfoRequest.setBeginTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime()); + return iBusinessAccessService.getAccessStatus("3-lc") && + (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) + && (!businessReportInfoRequest.isReal()) ? + getListByLocalResult(businessReportInfoRequest.getThirdId()) : + getListByOtherResult(businessReportInfoRequest); } public List> statisticsByHourTime() { @@ -335,7 +347,6 @@ }).collect(Collectors.toList()); } return resultList; - } //从第三方获取平台统计结果 @@ -365,7 +376,8 @@ public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-pt") && (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) - ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); + ? statisticsByLocalPlate(businessReportInfoRequest.getThirdId()) : + statisticsByOtherPlate(businessReportInfoRequest); } //从第三方获取上报记录 @@ -471,11 +483,14 @@ } @Override - public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { + public Map statisticsByReport(BusinessReportInfoRequest request) { + request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime()); + request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime()); return iBusinessAccessService.getAccessStatus("3-sj") && - (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ? - statisticsByOtherReport(businessReportInfoRequest) : - statisticsByLocalReport(businessReportInfoRequest.getThirdId()); + (ToolUtils.pageArr[2] == request.getPage())&& + (!request.isReal()) ? + statisticsByLocalReport(request.getThirdId()) : + statisticsByOtherReport(request); } @@ -484,7 +499,7 @@ List commonRequestList = iCmdBodyTagService.statisticsByTag(request); commonRequestList.forEach(commonRequest -> { commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 6 ? commonRequest.getName().substring(0, 6) : commonRequest.getName()); - commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")) : commonRequest.getValue()); + commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) : commonRequest.getValue()); }); return commonRequestList; @@ -492,6 +507,8 @@ //从本地获取标签统计结果 public List statisticsByLocalTag(BusinessReportInfoRequest request) { + + List commonRequestList = new ArrayList<>(); RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); @@ -504,10 +521,13 @@ @Override public List statisticsByTag(BusinessReportInfoRequest request) { - + request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime()); + request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime()); return iBusinessAccessService.getAccessStatus("3-bq") && - (ToolUtils.pageArr[2] == request.getPage()) ? - statisticsByOtherTag(request) : statisticsByLocalTag(request); + (ToolUtils.pageArr[2] == request.getPage()) && + (!request.isReal()) ? + statisticsByLocalTag(request) : + statisticsByOtherTag(request); } @@ -588,15 +608,16 @@ } @Override - public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + public List statisticsByArea(BusinessReportInfoRequest request) { - - return businessReportInfoRequest.isFlag() ? clickData(businessReportInfoRequest) : - + request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime()); + request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime()); + return request.isFlag() ? clickData(request) : (iBusinessAccessService.getAccessStatus("3-qy") && - (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ? - statisticsByOtherArea(businessReportInfoRequest) : - statisticsByLocalArea(businessReportInfoRequest.getThirdId())); + (ToolUtils.pageArr[2] == request.getPage()) && + (!request.isReal())? + statisticsByLocalArea(request.getThirdId()) : + statisticsByOtherArea(request)); } @Override 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 5aa1d4d..b8be391 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 @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,8 @@ private IJudgmentService judgmentService; @Autowired private ICmdBodyRoamService cmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; /** @@ -232,4 +235,17 @@ } + + /** + * 获取每日研判通报 总数自动获取,需传开始、结束时间 + */ + @RequestMapping(value = "/totalAdd") + @ResponseBody + public Object totalAdd(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime())); + } + } 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 e727d42..1ed7084 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 @@ -27,17 +27,19 @@ @Param("endTime") String endTime); List statisticsByXfArea(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); Integer getJudgeCountByTime(@Param("begTime") String begTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime); - List getCountByStatus(); + List getCountByStatus(); - List getAreaCountByStatus( @Param("type") String type); + List getAreaCountByStatus(@Param("type") String type); - List getXfAreaCountByStatus( @Param("type") String type); + List getXfAreaCountByStatus(@Param("type") String type); + Integer getFeedCount(@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 aa7979e..3b5f5dc 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 @@ -134,12 +134,12 @@ and cb.body_state = #{type} - + ) t GROUP BY t.organ @@ -160,5 +160,23 @@ t.organ + + 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 87fb876..b505883 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 @@ -44,7 +44,7 @@ FROM ( SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id - WHERE cb.roam_operation in ('1', '2', '5', '6', '7', '8.3') + WHERE cb.roam_operation in ('0.49','1', '4', '5', '7') AND cb.roam_time = ]]> #{begTime} 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 f15a9d3..86905e0 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 @@ -20,5 +20,8 @@ private int page; + //用于是否是实时刷新 true实时刷新 + private boolean isReal; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java index 10b055c..2b5c5cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java @@ -47,17 +47,17 @@ //0.63 五科 （社会二科 A20500） //0.64 六科 （境外科 A20300）4 //1 上报 - public static String[] sbArr={"1"}; + public static String[] sbArr={"0.49","1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"2"}; + public static String[] cbypArr={"4"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6"}; + public static String[] zzbzypArr={"7"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index acb2ed7..b9ca4ad 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -102,6 +102,17 @@ @TableField("AREA_RESULT") private String areaResult; + /** + * 开始时间 + */ + @TableField("START_TIME") + private String startTime; + /** + * 结束时间,用于统计时间 + */ + @TableField("END_TIME") + private String endTime; + @TableField(exist = false) private List areaResultList; 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 b300397..6eabe1f 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 @@ -37,5 +37,7 @@ List getAreaCountByStatus(String type); //查询实时下发至返回条数对应区域 List getXfAreaCountByStatus(String type); + //获取反馈数 body_state值>=8.3 + Integer getFeedCount(String begTime, String endTime); } 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 2386135..034998b 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 @@ -75,4 +75,10 @@ public List getXfAreaCountByStatus(String type) { return this.baseMapper.getXfAreaCountByStatus(type); } + + @Override + public Integer getFeedCount(String begTime, String endTime) { + Integer count = this.baseMapper.getFeedCount(begTime,endTime); + return count; + } } 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 fcbb89d..30dea56 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 @@ -335,8 +335,8 @@ public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { return iBusinessAccessService.getAccessStatus("2-sj")&& (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ? - getDataByOther(judgmentRequest) : - getDataByLocal(judgmentRequest); + getDataByLocal(judgmentRequest): + getDataByOther(judgmentRequest); } @@ -399,7 +399,7 @@ Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId()); judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())? - iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); + judgment.getJudgmentTotal(): iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime())); if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); 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 40a0497..5416b7d 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 @@ -155,6 +155,7 @@ // List cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus(); int reportedCount = 0, firstJudgmentCount = 0, secondLeaderCount = 0, firstLeaderCount = 0, sendCount = 0, feedbackCount = 0; + for (CommonResponse commonResponse : commonResponseList) { if (ObjectUtil.isNotEmpty(commonResponse.getName())) { Integer count = Double.valueOf(commonResponse.getValue()).intValue(); @@ -166,13 +167,18 @@ secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } else if (Arrays.binarySearch(DictMapDTO.zzbzypArr, commonResponse.getName()) > -1) { firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; - } else if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { - sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; - } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { - feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; } + + if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { + sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; + } +// else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { +// feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0; +// } } } + feedbackCount = iCmdBodyInfoService.getFeedCount(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); + return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount); @@ -180,8 +186,14 @@ @Override public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) { - return iBusinessAccessService.getAccessStatus("3-lc") && (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) - ? getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); + + businessReportInfoRequest.setEndTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime()); + businessReportInfoRequest.setBeginTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime()); + return iBusinessAccessService.getAccessStatus("3-lc") && + (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) + && (!businessReportInfoRequest.isReal()) ? + getListByLocalResult(businessReportInfoRequest.getThirdId()) : + getListByOtherResult(businessReportInfoRequest); } public List> statisticsByHourTime() { @@ -335,7 +347,6 @@ }).collect(Collectors.toList()); } return resultList; - } //从第三方获取平台统计结果 @@ -365,7 +376,8 @@ public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-pt") && (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) - ? statisticsByOtherPlate(businessReportInfoRequest) : statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); + ? statisticsByLocalPlate(businessReportInfoRequest.getThirdId()) : + statisticsByOtherPlate(businessReportInfoRequest); } //从第三方获取上报记录 @@ -471,11 +483,14 @@ } @Override - public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { + public Map statisticsByReport(BusinessReportInfoRequest request) { + request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime()); + request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime()); return iBusinessAccessService.getAccessStatus("3-sj") && - (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ? - statisticsByOtherReport(businessReportInfoRequest) : - statisticsByLocalReport(businessReportInfoRequest.getThirdId()); + (ToolUtils.pageArr[2] == request.getPage())&& + (!request.isReal()) ? + statisticsByLocalReport(request.getThirdId()) : + statisticsByOtherReport(request); } @@ -484,7 +499,7 @@ List commonRequestList = iCmdBodyTagService.statisticsByTag(request); commonRequestList.forEach(commonRequest -> { commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 6 ? commonRequest.getName().substring(0, 6) : commonRequest.getName()); - commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue())&&commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0,commonRequest.getValue().indexOf(".")) : commonRequest.getValue()); + commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) : commonRequest.getValue()); }); return commonRequestList; @@ -492,6 +507,8 @@ //从本地获取标签统计结果 public List statisticsByLocalTag(BusinessReportInfoRequest request) { + + List commonRequestList = new ArrayList<>(); RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); @@ -504,10 +521,13 @@ @Override public List statisticsByTag(BusinessReportInfoRequest request) { - + request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime()); + request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime()); return iBusinessAccessService.getAccessStatus("3-bq") && - (ToolUtils.pageArr[2] == request.getPage()) ? - statisticsByOtherTag(request) : statisticsByLocalTag(request); + (ToolUtils.pageArr[2] == request.getPage()) && + (!request.isReal()) ? + statisticsByLocalTag(request) : + statisticsByOtherTag(request); } @@ -588,15 +608,16 @@ } @Override - public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + public List statisticsByArea(BusinessReportInfoRequest request) { - - return businessReportInfoRequest.isFlag() ? clickData(businessReportInfoRequest) : - + request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime()); + request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime()); + return request.isFlag() ? clickData(request) : (iBusinessAccessService.getAccessStatus("3-qy") && - (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage()) ? - statisticsByOtherArea(businessReportInfoRequest) : - statisticsByLocalArea(businessReportInfoRequest.getThirdId())); + (ToolUtils.pageArr[2] == request.getPage()) && + (!request.isReal())? + statisticsByLocalArea(request.getThirdId()) : + statisticsByOtherArea(request)); } @Override diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 6e82c8e..adef3d8 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -47,5 +47,5 @@ mybatis-plus: configuration: # 配置结果集属性为空时 是否映射返回结果 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用 # log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl \ No newline at end of file