diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(request)); + } + + + // // /** // * 获取主题信息分类标签分页列表 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8e88387..99d9da1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -119,6 +119,13 @@ //备注动态详情 @TableField(exist = false) private CommonRequest descDetail; + + //用于显示备注自定义名称 + @TableField(exist = false) + private String name; + //用于显示备注自定义值 + @TableField(exist = false) + private String value; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8e88387..99d9da1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -119,6 +119,13 @@ //备注动态详情 @TableField(exist = false) private CommonRequest descDetail; + + //用于显示备注自定义名称 + @TableField(exist = false) + private String name; + //用于显示备注自定义值 + @TableField(exist = false) + private String value; @Override public String toString() { return "Judgment{" + 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 eabacaf..33cf5c4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import java.util.List; @@ -18,7 +19,7 @@ public interface ICmdBodyInfoService extends IService { //获取研判总数 - List getCmdBodyInfoByTime(String begTime, String endTime); + Integer getCmdBodyInfoByTime(String begTime, String endTime); //标签分类占比 List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 @@ -27,5 +28,7 @@ List statisticsByArea(String begTime, String endTime); List getCmdBodyInfosByStatus(); + //查询实时上报至返回条数 + List getCountByStatus(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8e88387..99d9da1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -119,6 +119,13 @@ //备注动态详情 @TableField(exist = false) private CommonRequest descDetail; + + //用于显示备注自定义名称 + @TableField(exist = false) + private String name; + //用于显示备注自定义值 + @TableField(exist = false) + private String value; @Override public String toString() { return "Judgment{" + 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 eabacaf..33cf5c4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import java.util.List; @@ -18,7 +19,7 @@ public interface ICmdBodyInfoService extends IService { //获取研判总数 - List getCmdBodyInfoByTime(String begTime, String endTime); + Integer getCmdBodyInfoByTime(String begTime, String endTime); //标签分类占比 List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 @@ -27,5 +28,7 @@ List statisticsByArea(String begTime, String endTime); List getCmdBodyInfosByStatus(); + //查询实时上报至返回条数 + List getCountByStatus(); } 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 399bebb..be0440d 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 @@ -39,7 +39,7 @@ Object detail(String realtimeWorkId); - RealtimeWork getResult(Long id); + RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest); List> statisticsByTime(CommonRequest commonRequest); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8e88387..99d9da1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -119,6 +119,13 @@ //备注动态详情 @TableField(exist = false) private CommonRequest descDetail; + + //用于显示备注自定义名称 + @TableField(exist = false) + private String name; + //用于显示备注自定义值 + @TableField(exist = false) + private String value; @Override public String toString() { return "Judgment{" + 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 eabacaf..33cf5c4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import java.util.List; @@ -18,7 +19,7 @@ public interface ICmdBodyInfoService extends IService { //获取研判总数 - List getCmdBodyInfoByTime(String begTime, String endTime); + Integer getCmdBodyInfoByTime(String begTime, String endTime); //标签分类占比 List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 @@ -27,5 +28,7 @@ List statisticsByArea(String begTime, String endTime); List getCmdBodyInfosByStatus(); + //查询实时上报至返回条数 + List getCountByStatus(); } 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 399bebb..be0440d 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 @@ -39,7 +39,7 @@ Object detail(String realtimeWorkId); - RealtimeWork getResult(Long id); + RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest); List> statisticsByTime(CommonRequest commonRequest); 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 471d8c8..f7fd655 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 @@ -6,6 +6,7 @@ import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import org.springframework.stereotype.Service; @@ -26,14 +27,9 @@ @Override - public List getCmdBodyInfoByTime(String begTime, String endTime) { + public Integer getCmdBodyInfoByTime(String begTime, String endTime) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("hand_time", begTime); - queryWrapper.le("hand_time", endTime); - //取初步研判状态及以后的信息 - queryWrapper.ge("body_state", 2); - return this.list(queryWrapper); + return this.baseMapper.getJudgeCountByTime(begTime, endTime); } @Override @@ -59,4 +55,9 @@ queryWrapper.eq("body_nature", "0"); return this.list(queryWrapper); } + + @Override + public List getCountByStatus() { + return this.baseMapper.getCountByStatus(); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8e88387..99d9da1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -119,6 +119,13 @@ //备注动态详情 @TableField(exist = false) private CommonRequest descDetail; + + //用于显示备注自定义名称 + @TableField(exist = false) + private String name; + //用于显示备注自定义值 + @TableField(exist = false) + private String value; @Override public String toString() { return "Judgment{" + 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 eabacaf..33cf5c4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import java.util.List; @@ -18,7 +19,7 @@ public interface ICmdBodyInfoService extends IService { //获取研判总数 - List getCmdBodyInfoByTime(String begTime, String endTime); + Integer getCmdBodyInfoByTime(String begTime, String endTime); //标签分类占比 List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 @@ -27,5 +28,7 @@ List statisticsByArea(String begTime, String endTime); List getCmdBodyInfosByStatus(); + //查询实时上报至返回条数 + List getCountByStatus(); } 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 399bebb..be0440d 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 @@ -39,7 +39,7 @@ Object detail(String realtimeWorkId); - RealtimeWork getResult(Long id); + RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest); List> statisticsByTime(CommonRequest commonRequest); 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 471d8c8..f7fd655 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 @@ -6,6 +6,7 @@ import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import org.springframework.stereotype.Service; @@ -26,14 +27,9 @@ @Override - public List getCmdBodyInfoByTime(String begTime, String endTime) { + public Integer getCmdBodyInfoByTime(String begTime, String endTime) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("hand_time", begTime); - queryWrapper.le("hand_time", endTime); - //取初步研判状态及以后的信息 - queryWrapper.ge("body_state", 2); - return this.list(queryWrapper); + return this.baseMapper.getJudgeCountByTime(begTime, endTime); } @Override @@ -59,4 +55,9 @@ queryWrapper.eq("body_nature", "0"); return this.list(queryWrapper); } + + @Override + public List getCountByStatus() { + return this.baseMapper.getCountByStatus(); + } } 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 21a54cd..c22f6b1 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 @@ -17,6 +17,7 @@ import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.IBusinessAccessService; +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; @@ -46,6 +47,9 @@ @Autowired private ICmdBodyRoamService iCmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; + @Override public List> statisticsByTime() { List judgmentList = this.list(); @@ -76,15 +80,97 @@ 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()); + 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<>(); - 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<>(); @@ -209,7 +295,7 @@ public Map getDataByLocal(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List dpList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getId()); + Judgment judgment = this.getById(judgmentRequest.getSecondId()); //涉党政军 if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); @@ -285,41 +371,71 @@ return list2; } +// public Judgment getListByLocal(JudgmentRequest judgmentRequest) { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); +// queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); +// List judgmentList = this.list(queryWrapper); +// Judgment judgmentResult = new Judgment(); +// judgmentList.forEach(judgment -> { +// judgmentResult.setDescription(judgment.getDescription()); +// judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal()); +// if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list); +// } +// if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list); +// +// } +// if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); +// } +// +// if (ObjectUtil.isNotEmpty(judgment.getDescription())) { +// JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); +// judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); +// } +// }); +// //用于大屏回显 +// judgmentResult.setStartTime(judgmentRequest.getBeginTime()); +// judgmentResult.setEndTime(judgmentRequest.getEndTime()); +// return judgmentResult; +// } + + public Judgment getListByLocal(JudgmentRequest judgmentRequest) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); - queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); - List judgmentList = this.list(queryWrapper); - Judgment judgmentResult = new Judgment(); - judgmentList.forEach(judgment -> { - judgmentResult.setDescription(judgment.getDescription()); - judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal()); - if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list); - } - if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list); - } - if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); - } + Judgment judgment = this.getById(judgmentRequest.getSecondId()); - if (ObjectUtil.isNotEmpty(judgment.getDescription())) { - JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); - judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); - } - }); - //用于大屏回显 - judgmentResult.setStartTime(judgmentRequest.getBeginTime()); - judgmentResult.setEndTime(judgmentRequest.getEndTime()); - return judgmentResult; + judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ? + iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); + if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); + judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); + judgment.setTitle2List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + + } + if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); + judgment.setTitle3List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + + if (ObjectUtil.isNotEmpty(judgment.getDescription())) { + 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")); + } + return judgment; } public Judgment getListByOther(JudgmentRequest judgmentRequest) { @@ -389,8 +505,9 @@ @Override public Judgment getListByTime(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-bt") ? - getListByOther(judgmentRequest) : getListByLocal(judgmentRequest); +// return iBusinessAccessService.getAccessStatus("2-bt") ? +// getListByOther(judgmentRequest) : getListByLocal(judgmentRequest); + return getListByLocal(judgmentRequest); } public List getAllDictByPid(Long pid) { @@ -485,7 +602,7 @@ //从本地接口获取 public List> getByLocal(JudgmentRequest judgmentRequest) { List> resultList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getId()); + Judgment judgment = this.getById(judgmentRequest.getSecondId()); if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult()); List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); @@ -540,8 +657,9 @@ @Override public List> statisticsByTag(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-bq") ? - getByOther(judgmentRequest) : getByLocal(judgmentRequest); +// return iBusinessAccessService.getAccessStatus("2-bq") ? +// getByOther(judgmentRequest) : getByLocal(judgmentRequest); + return getByLocal(judgmentRequest); } @Override @@ -567,7 +685,9 @@ if (ObjectUtil.isNotEmpty(judgment.getDescription())) { JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); - judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); +// judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); + judgment.setName(jsonObject.getString("name")); + judgment.setName(jsonObject.getString("value")); } }); return judgmentList; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8e88387..99d9da1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -119,6 +119,13 @@ //备注动态详情 @TableField(exist = false) private CommonRequest descDetail; + + //用于显示备注自定义名称 + @TableField(exist = false) + private String name; + //用于显示备注自定义值 + @TableField(exist = false) + private String value; @Override public String toString() { return "Judgment{" + 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 eabacaf..33cf5c4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import java.util.List; @@ -18,7 +19,7 @@ public interface ICmdBodyInfoService extends IService { //获取研判总数 - List getCmdBodyInfoByTime(String begTime, String endTime); + Integer getCmdBodyInfoByTime(String begTime, String endTime); //标签分类占比 List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 @@ -27,5 +28,7 @@ List statisticsByArea(String begTime, String endTime); List getCmdBodyInfosByStatus(); + //查询实时上报至返回条数 + List getCountByStatus(); } 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 399bebb..be0440d 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 @@ -39,7 +39,7 @@ Object detail(String realtimeWorkId); - RealtimeWork getResult(Long id); + RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest); List> statisticsByTime(CommonRequest commonRequest); 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 471d8c8..f7fd655 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 @@ -6,6 +6,7 @@ import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import org.springframework.stereotype.Service; @@ -26,14 +27,9 @@ @Override - public List getCmdBodyInfoByTime(String begTime, String endTime) { + public Integer getCmdBodyInfoByTime(String begTime, String endTime) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("hand_time", begTime); - queryWrapper.le("hand_time", endTime); - //取初步研判状态及以后的信息 - queryWrapper.ge("body_state", 2); - return this.list(queryWrapper); + return this.baseMapper.getJudgeCountByTime(begTime, endTime); } @Override @@ -59,4 +55,9 @@ queryWrapper.eq("body_nature", "0"); return this.list(queryWrapper); } + + @Override + public List getCountByStatus() { + return this.baseMapper.getCountByStatus(); + } } 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 21a54cd..c22f6b1 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 @@ -17,6 +17,7 @@ import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.IBusinessAccessService; +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; @@ -46,6 +47,9 @@ @Autowired private ICmdBodyRoamService iCmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; + @Override public List> statisticsByTime() { List judgmentList = this.list(); @@ -76,15 +80,97 @@ 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()); + 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<>(); - 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<>(); @@ -209,7 +295,7 @@ public Map getDataByLocal(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List dpList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getId()); + Judgment judgment = this.getById(judgmentRequest.getSecondId()); //涉党政军 if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); @@ -285,41 +371,71 @@ return list2; } +// public Judgment getListByLocal(JudgmentRequest judgmentRequest) { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); +// queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); +// List judgmentList = this.list(queryWrapper); +// Judgment judgmentResult = new Judgment(); +// judgmentList.forEach(judgment -> { +// judgmentResult.setDescription(judgment.getDescription()); +// judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal()); +// if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list); +// } +// if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list); +// +// } +// if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); +// } +// +// if (ObjectUtil.isNotEmpty(judgment.getDescription())) { +// JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); +// judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); +// } +// }); +// //用于大屏回显 +// judgmentResult.setStartTime(judgmentRequest.getBeginTime()); +// judgmentResult.setEndTime(judgmentRequest.getEndTime()); +// return judgmentResult; +// } + + public Judgment getListByLocal(JudgmentRequest judgmentRequest) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); - queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); - List judgmentList = this.list(queryWrapper); - Judgment judgmentResult = new Judgment(); - judgmentList.forEach(judgment -> { - judgmentResult.setDescription(judgment.getDescription()); - judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal()); - if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list); - } - if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list); - } - if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); - } + Judgment judgment = this.getById(judgmentRequest.getSecondId()); - if (ObjectUtil.isNotEmpty(judgment.getDescription())) { - JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); - judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); - } - }); - //用于大屏回显 - judgmentResult.setStartTime(judgmentRequest.getBeginTime()); - judgmentResult.setEndTime(judgmentRequest.getEndTime()); - return judgmentResult; + judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ? + iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); + if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); + judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); + judgment.setTitle2List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + + } + if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); + judgment.setTitle3List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + + if (ObjectUtil.isNotEmpty(judgment.getDescription())) { + 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")); + } + return judgment; } public Judgment getListByOther(JudgmentRequest judgmentRequest) { @@ -389,8 +505,9 @@ @Override public Judgment getListByTime(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-bt") ? - getListByOther(judgmentRequest) : getListByLocal(judgmentRequest); +// return iBusinessAccessService.getAccessStatus("2-bt") ? +// getListByOther(judgmentRequest) : getListByLocal(judgmentRequest); + return getListByLocal(judgmentRequest); } public List getAllDictByPid(Long pid) { @@ -485,7 +602,7 @@ //从本地接口获取 public List> getByLocal(JudgmentRequest judgmentRequest) { List> resultList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getId()); + Judgment judgment = this.getById(judgmentRequest.getSecondId()); if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult()); List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); @@ -540,8 +657,9 @@ @Override public List> statisticsByTag(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-bq") ? - getByOther(judgmentRequest) : getByLocal(judgmentRequest); +// return iBusinessAccessService.getAccessStatus("2-bq") ? +// getByOther(judgmentRequest) : getByLocal(judgmentRequest); + return getByLocal(judgmentRequest); } @Override @@ -567,7 +685,9 @@ if (ObjectUtil.isNotEmpty(judgment.getDescription())) { JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); - judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); +// judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); + judgment.setName(jsonObject.getString("name")); + judgment.setName(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 adc9da7..87a08f6 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 @@ -18,6 +18,7 @@ import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -138,43 +139,44 @@ } - public RealtimeWork getListByLocalResult(Long id){ + public RealtimeWork getListByLocalResult(Long id) { - return this.getById(id); + return this.getById(id); } - public RealtimeWork getListByOtherResult( ){ + public RealtimeWork getListByOtherResult(BusinessReportInfoRequest businessReportInfoRequest) { - List cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus(); - int reportedCount=0,firstJudgmentCount=0,secondLeaderCount=0,firstLeaderCount=0,sendCount=0,feedbackCount=0; + List commonResponseList = iCmdBodyInfoService.getCountByStatus(); +// List cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus(); + int reportedCount = 0, firstJudgmentCount = 0, secondLeaderCount = 0, firstLeaderCount = 0, sendCount = 0, feedbackCount = 0; - for(CmdBodyInfo cmdBodyInfo:cmdBodyInfoList){ - if(ObjectUtil.isNotEmpty(cmdBodyInfo.getBodyState())){ - if(Arrays.binarySearch(DictMapDTO.sbArr,cmdBodyInfo.getBodyState())>-1 ){ - reportedCount =reportedCount+1; - }else if(Arrays.binarySearch(DictMapDTO.cbypArr,cmdBodyInfo.getBodyState())>-1){ - firstJudgmentCount +=firstJudgmentCount+1; - }else if(Arrays.binarySearch(DictMapDTO.zbzypArr,cmdBodyInfo.getBodyState())>-1){ - secondLeaderCount +=secondLeaderCount+1; - }else if(Arrays.binarySearch(DictMapDTO.zzbzypArr,cmdBodyInfo.getBodyState())>-1){ - firstLeaderCount +=firstLeaderCount+1; - }else if(Arrays.binarySearch(DictMapDTO.xfArr,cmdBodyInfo.getBodyState())>-1){ - sendCount +=sendCount+1; - }else if(Arrays.binarySearch(DictMapDTO.fkArr,cmdBodyInfo.getBodyState())>-1){ - feedbackCount +=feedbackCount+1; + for (CommonResponse commonResponse : commonResponseList) { + if (ObjectUtil.isNotEmpty(commonResponse.getName())) { + if (Arrays.binarySearch(DictMapDTO.sbArr, commonResponse.getName()) > -1) { + reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.cbypArr, commonResponse.getName()) > -1) { + firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.zbzypArr, commonResponse.getName()) > -1) { + secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.zzbzypArr, commonResponse.getName()) > -1) { + firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { + sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { + feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; } } } - return new RealtimeWork(reportedCount,firstJudgmentCount,secondLeaderCount,firstLeaderCount,sendCount,feedbackCount); + return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount); } @Override - public RealtimeWork getResult(Long id) { + public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-lc") ? - getListByOtherResult() : getListByLocalResult(id); + getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); } public List> statisticsByHourTime() { @@ -359,7 +361,7 @@ public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-pt") ? statisticsByOtherPlate() : - statisticsByLocalPlate(businessReportInfoRequest.getId()); + statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); } //从第三方获取上报记录 @@ -374,7 +376,7 @@ List> dpMapList = new ArrayList<>(); List> sbMapList = new ArrayList<>(); - List dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -7), new Date(), DateField.HOUR_OF_DAY); + List dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -12), new Date(), DateField.HOUR_OF_DAY); dateTimeList.forEach(dateTime -> { Map sbMap = new HashMap<>(); Map dpMap = new HashMap<>(); @@ -467,7 +469,7 @@ public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-sj") ? statisticsByOtherReport(businessReportInfoRequest) : - statisticsByLocalReport(businessReportInfoRequest.getId()); + statisticsByLocalReport(businessReportInfoRequest.getThirdId()); } @@ -479,7 +481,7 @@ //从本地获取标签统计结果 public List statisticsByLocalTag(BusinessReportInfoRequest request) { List commonRequestList = new ArrayList<>(); - RealtimeWork realtimeWork = this.getById(request.getId()); + RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getTagResult()); @@ -514,11 +516,13 @@ //判断是否是子节点 public boolean isChild(Long pid, List areaList, String id) { - if (ObjectUtil.isNotEmpty(id)) { - Area area = areaList.stream().filter(o -> Objects.equals(o.getId(), Long.valueOf(id))).findFirst().orElse(null); - if (ObjectUtil.isNotEmpty(area)) { - if (area.getPids().indexOf("[" + pid + "]") > -1) { - return true; + if (StringUtils.isNumeric(id)) { + if (ObjectUtil.isNotEmpty(id)) { + Area area = areaList.stream().filter(o -> Objects.equals(o.getId(), Long.valueOf(id))).findFirst().orElse(null); + if (ObjectUtil.isNotEmpty(area)) { + if (area.getPids().indexOf("[" + pid + "]") > -1) { + return true; + } } } } @@ -572,6 +576,6 @@ return iBusinessAccessService.getAccessStatus("3-qy") ? statisticsByOtherArea(businessReportInfoRequest) : - statisticsByLocalArea(businessReportInfoRequest.getId()); + statisticsByLocalArea(businessReportInfoRequest.getThirdId()); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java index e772971..cf8ed65 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java @@ -1,8 +1,18 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.controller.ExportController; +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.model.CmdBodyTag; +import com.casic.missiles.modular.system.service.ICmdBodyTagService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 主题信息分类标签控制器 @@ -15,18 +25,32 @@ public class CmdBodyTagController extends ExportController { -// @Autowired -// private ICmdBodyTagService cmdBodyTagService; -// -// -// /** -// * 获取主题信息分类标签列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return cmdBodyTagService.selectList(null); -// } + @Autowired + private ICmdBodyTagService cmdBodyTagService; + + + /** + * 获取主题信息分类标签列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("hide",1); + return ResponseData.success(cmdBodyTagService.list(queryWrapper)); + } + + /** + * 获取分类标签下拉列表 + */ + @RequestMapping(value = "/selectList") + @ResponseBody + public Object selectList(BusinessReportInfoRequest request) { + return ResponseData.success(cmdBodyTagService.statisticsByTag(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 a6f0429..3139ff5 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 @@ -54,13 +54,13 @@ 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); } /** - * 获取每日研判通报结果 + * 获取每日研判通报结果 大屏显示标签 总数 备注 */ @RequestMapping(value = "/result") @ResponseBody 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 2648e8e..a04d952 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 @@ -211,12 +211,12 @@ } /** - * 实时流程数据信息 + * 实时流程数据信息 大屏显示 */ @RequestMapping(value = "/result") @ResponseBody - public Object getResult(@RequestParam Long id) { - return ResponseData.success(realtimeWorkService.getResult(id)); + public Object getResult(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.getResult(businessReportInfoRequest)); } /** 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 19d35cd..fc7cbb4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -25,5 +26,11 @@ List statisticsByArea(@Param("begTime") String begTime, @Param("endTime") String endTime); + Integer getJudgeCountByTime(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + List getCountByStatus(); + + } 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 e10c5c4..30fe80e 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,14 +37,14 @@ - - + + body_id - AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq + AS bodyId, body_title AS bodyTitle, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent,body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan,submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle + + + + + + + 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 073fd6e..457025c 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,26 +22,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 5fae90a..87d02db 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -20,7 +20,7 @@ SELECT t1.`tag_name` AS name, IFNULL(t0.tagCount,0) AS value FROM cmd_body_tag t1 LEFT JOIN - (SELECT a.`tag_id` AS tagId, COUNT(1) AS tagCount + (SELECT a.`tag_id` AS tagId, SUM(a.`controls_link`) AS tagCount FROM cmd_controls_info a WHERE 1=1 AND a.publish_time = ]]> #{begTime} @@ -30,7 +30,8 @@ GROUP BY a.`tag_id`) t0 ON t0.tagId = t1.`tag_id` - ORDER BY t0.tagCount DESC LIMIT 20 + WHERE t1.`hide`=1 + ORDER BY t0.tagCount DESC diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml index ff64738..71b0734 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml @@ -26,15 +26,16 @@ - - + + controls_id - AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag + AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, + legal_base_tag AS legalBaseTag 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 51f2489..65ae7b7 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 @@ -10,7 +10,10 @@ private String beginTime; private String endTime; + private Long id; + private Long thirdId; + } 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 431c10e..10b055c 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={"0.49","0.5","0.61","0.62","0.63","0.64","1"}; + public static String[] sbArr={"1"}; //1.1 联合传播行动队长研判 //2 初步研判 - public static String[] cbypArr={"1.1","2"}; + public static String[] cbypArr={"2"}; //5 值班长研判 public static String[] zbzypArr={"5"}; // 6 主值班长审核 //6.1 待请示 //6.2 请示中 //6.3 请示完成 - public static String[] zzbzypArr={"6","6.1","6.2","6.3"}; + public static String[] zzbzypArr={"6"}; //7 指令分发 public static String[] xfArr={"7"}; //8.3 反馈 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java index f726a65..d2c480c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java @@ -11,4 +11,6 @@ private String endTime; + private Long secondId; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 600f574..1fa6722 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -13,6 +13,11 @@ private String tagId; + private String tagName; + + private String links; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java index b7cf670..1f57074 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdBodyInfo.java @@ -29,8 +29,8 @@ private String bodyId; @TableField("body_title") private String bodyTitle; - @TableField("body_title_digest") - private String bodyTitleDigest; +// @TableField("body_title_digest") +// private String bodyTitleDigest; @TableField("body_sn") private String bodySn; /** @@ -40,8 +40,8 @@ private String bodyNature; @TableField("body_content") private String bodyContent; - @TableField("body_content_digest") - private String bodyContentDigest; +// @TableField("body_content_digest") +// private String bodyContentDigest; @TableField("body_state") private String bodyState; @TableField("state_child") @@ -83,8 +83,8 @@ private String submitOrgancode; @TableField("submit_organ") private String submitOrgan; - @TableField("submit_organ_digest") - private String submitOrganDigest; +// @TableField("submit_organ_digest") +// private String submitOrganDigest; @TableField("submit_time") private Date submitTime; /** @@ -115,24 +115,24 @@ /** * 是否初筛已上报自治区 0：未 1：已上报 */ - @TableField("reported_ZZQ") - private Integer reportedZzq; - /** - * 是否来着自治区指令情报 0：本地 1：自治区指令情报 - */ - @TableField("from_ZZQ") - private Integer fromZzq; +// @TableField("reported_ZZQ") +// private Integer reportedZzq; +// /** +// * 是否来着自治区指令情报 0：本地 1：自治区指令情报 +// */ +// @TableField("from_ZZQ") +// private Integer fromZzq; @Override public String toString() { return "CmdBodyInfo{" + "bodyId=" + bodyId + ", bodyTitle=" + bodyTitle + - ", bodyTitleDigest=" + bodyTitleDigest + +// ", bodyTitleDigest=" + bodyTitleDigest + ", bodySn=" + bodySn + ", bodyNature=" + bodyNature + ", bodyContent=" + bodyContent + - ", bodyContentDigest=" + bodyContentDigest + +// ", bodyContentDigest=" + bodyContentDigest + ", bodyState=" + bodyState + ", stateChild=" + stateChild + ", bodyLanguage=" + bodyLanguage + @@ -149,7 +149,7 @@ ", submitUser=" + submitUser + ", submitOrgancode=" + submitOrgancode + ", submitOrgan=" + submitOrgan + - ", submitOrganDigest=" + submitOrganDigest + +// ", submitOrganDigest=" + submitOrganDigest + ", submitTime=" + submitTime + ", flagOversee=" + flagOversee + ", emergencyState=" + emergencyState + @@ -159,8 +159,8 @@ ", bodyRemark=" + bodyRemark + ", sendBackReason=" + sendBackReason + ", yqHandle=" + yqHandle + - ", reportedZzq=" + reportedZzq + - ", fromZzq=" + fromZzq + +// ", reportedZzq=" + reportedZzq + +// ", fromZzq=" + fromZzq + "}"; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java index 4d72634..dffe4d1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/CmdControlsInfo.java @@ -115,10 +115,10 @@ */ @TableField("tag_id") private String tagId; - @TableField("harmful_tag_code") - private String harmfulTagCode; - @TableField("harmful_tag_name") - private String harmfulTagName; +// @TableField("harmful_tag_code") +// private String harmfulTagCode; +// @TableField("harmful_tag_name") +// private String harmfulTagName; /** * 法律依据 */ @@ -153,8 +153,8 @@ ", publishTime=" + publishTime + ", foundDuration=" + foundDuration + ", tagId=" + tagId + - ", harmfulTagCode=" + harmfulTagCode + - ", harmfulTagName=" + harmfulTagName + +// ", harmfulTagCode=" + harmfulTagCode + +// ", harmfulTagName=" + harmfulTagName + ", legalBaseTag=" + legalBaseTag + "}"; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index 8e88387..99d9da1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -119,6 +119,13 @@ //备注动态详情 @TableField(exist = false) private CommonRequest descDetail; + + //用于显示备注自定义名称 + @TableField(exist = false) + private String name; + //用于显示备注自定义值 + @TableField(exist = false) + private String value; @Override public String toString() { return "Judgment{" + 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 eabacaf..33cf5c4 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import java.util.List; @@ -18,7 +19,7 @@ public interface ICmdBodyInfoService extends IService { //获取研判总数 - List getCmdBodyInfoByTime(String begTime, String endTime); + Integer getCmdBodyInfoByTime(String begTime, String endTime); //标签分类占比 List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 @@ -27,5 +28,7 @@ List statisticsByArea(String begTime, String endTime); List getCmdBodyInfosByStatus(); + //查询实时上报至返回条数 + List getCountByStatus(); } 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 399bebb..be0440d 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 @@ -39,7 +39,7 @@ Object detail(String realtimeWorkId); - RealtimeWork getResult(Long id); + RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest); List> statisticsByTime(CommonRequest commonRequest); 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 471d8c8..f7fd655 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 @@ -6,6 +6,7 @@ import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import org.springframework.stereotype.Service; @@ -26,14 +27,9 @@ @Override - public List getCmdBodyInfoByTime(String begTime, String endTime) { + public Integer getCmdBodyInfoByTime(String begTime, String endTime) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("hand_time", begTime); - queryWrapper.le("hand_time", endTime); - //取初步研判状态及以后的信息 - queryWrapper.ge("body_state", 2); - return this.list(queryWrapper); + return this.baseMapper.getJudgeCountByTime(begTime, endTime); } @Override @@ -59,4 +55,9 @@ queryWrapper.eq("body_nature", "0"); return this.list(queryWrapper); } + + @Override + public List getCountByStatus() { + return this.baseMapper.getCountByStatus(); + } } 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 21a54cd..c22f6b1 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 @@ -17,6 +17,7 @@ import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.IBusinessAccessService; +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; @@ -46,6 +47,9 @@ @Autowired private ICmdBodyRoamService iCmdBodyRoamService; + @Autowired + private ICmdBodyInfoService iCmdBodyInfoService; + @Override public List> statisticsByTime() { List judgmentList = this.list(); @@ -76,15 +80,97 @@ 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()); + 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<>(); - 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<>(); @@ -209,7 +295,7 @@ public Map getDataByLocal(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List dpList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getId()); + Judgment judgment = this.getById(judgmentRequest.getSecondId()); //涉党政军 if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); @@ -285,41 +371,71 @@ return list2; } +// public Judgment getListByLocal(JudgmentRequest judgmentRequest) { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); +// queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); +// List judgmentList = this.list(queryWrapper); +// Judgment judgmentResult = new Judgment(); +// judgmentList.forEach(judgment -> { +// judgmentResult.setDescription(judgment.getDescription()); +// judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal()); +// if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list); +// } +// if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list); +// +// } +// if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { +// JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); +// List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); +// judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); +// } +// +// if (ObjectUtil.isNotEmpty(judgment.getDescription())) { +// JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); +// judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); +// } +// }); +// //用于大屏回显 +// judgmentResult.setStartTime(judgmentRequest.getBeginTime()); +// judgmentResult.setEndTime(judgmentRequest.getEndTime()); +// return judgmentResult; +// } + + public Judgment getListByLocal(JudgmentRequest judgmentRequest) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); - queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); - List judgmentList = this.list(queryWrapper); - Judgment judgmentResult = new Judgment(); - judgmentList.forEach(judgment -> { - judgmentResult.setDescription(judgment.getDescription()); - judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal()); - if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list); - } - if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list); - } - if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { - JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); - List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); - } + Judgment judgment = this.getById(judgmentRequest.getSecondId()); - if (ObjectUtil.isNotEmpty(judgment.getDescription())) { - JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); - judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); - } - }); - //用于大屏回显 - judgmentResult.setStartTime(judgmentRequest.getBeginTime()); - judgmentResult.setEndTime(judgmentRequest.getEndTime()); - return judgmentResult; + judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") ? + iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()) : judgment.getJudgmentTotal()); + if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); + judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); + judgment.setTitle2List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + + } + if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); + judgment.setTitle3List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + + if (ObjectUtil.isNotEmpty(judgment.getDescription())) { + 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")); + } + return judgment; } public Judgment getListByOther(JudgmentRequest judgmentRequest) { @@ -389,8 +505,9 @@ @Override public Judgment getListByTime(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-bt") ? - getListByOther(judgmentRequest) : getListByLocal(judgmentRequest); +// return iBusinessAccessService.getAccessStatus("2-bt") ? +// getListByOther(judgmentRequest) : getListByLocal(judgmentRequest); + return getListByLocal(judgmentRequest); } public List getAllDictByPid(Long pid) { @@ -485,7 +602,7 @@ //从本地接口获取 public List> getByLocal(JudgmentRequest judgmentRequest) { List> resultList = new ArrayList<>(); - Judgment judgment = this.getById(judgmentRequest.getId()); + Judgment judgment = this.getById(judgmentRequest.getSecondId()); if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult()); List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); @@ -540,8 +657,9 @@ @Override public List> statisticsByTag(JudgmentRequest judgmentRequest) { - return iBusinessAccessService.getAccessStatus("2-bq") ? - getByOther(judgmentRequest) : getByLocal(judgmentRequest); +// return iBusinessAccessService.getAccessStatus("2-bq") ? +// getByOther(judgmentRequest) : getByLocal(judgmentRequest); + return getByLocal(judgmentRequest); } @Override @@ -567,7 +685,9 @@ if (ObjectUtil.isNotEmpty(judgment.getDescription())) { JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription()); - judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); +// judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class)); + judgment.setName(jsonObject.getString("name")); + judgment.setName(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 adc9da7..87a08f6 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 @@ -18,6 +18,7 @@ import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -138,43 +139,44 @@ } - public RealtimeWork getListByLocalResult(Long id){ + public RealtimeWork getListByLocalResult(Long id) { - return this.getById(id); + return this.getById(id); } - public RealtimeWork getListByOtherResult( ){ + public RealtimeWork getListByOtherResult(BusinessReportInfoRequest businessReportInfoRequest) { - List cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus(); - int reportedCount=0,firstJudgmentCount=0,secondLeaderCount=0,firstLeaderCount=0,sendCount=0,feedbackCount=0; + List commonResponseList = iCmdBodyInfoService.getCountByStatus(); +// List cmdBodyInfoList = iCmdBodyInfoService.getCmdBodyInfosByStatus(); + int reportedCount = 0, firstJudgmentCount = 0, secondLeaderCount = 0, firstLeaderCount = 0, sendCount = 0, feedbackCount = 0; - for(CmdBodyInfo cmdBodyInfo:cmdBodyInfoList){ - if(ObjectUtil.isNotEmpty(cmdBodyInfo.getBodyState())){ - if(Arrays.binarySearch(DictMapDTO.sbArr,cmdBodyInfo.getBodyState())>-1 ){ - reportedCount =reportedCount+1; - }else if(Arrays.binarySearch(DictMapDTO.cbypArr,cmdBodyInfo.getBodyState())>-1){ - firstJudgmentCount +=firstJudgmentCount+1; - }else if(Arrays.binarySearch(DictMapDTO.zbzypArr,cmdBodyInfo.getBodyState())>-1){ - secondLeaderCount +=secondLeaderCount+1; - }else if(Arrays.binarySearch(DictMapDTO.zzbzypArr,cmdBodyInfo.getBodyState())>-1){ - firstLeaderCount +=firstLeaderCount+1; - }else if(Arrays.binarySearch(DictMapDTO.xfArr,cmdBodyInfo.getBodyState())>-1){ - sendCount +=sendCount+1; - }else if(Arrays.binarySearch(DictMapDTO.fkArr,cmdBodyInfo.getBodyState())>-1){ - feedbackCount +=feedbackCount+1; + for (CommonResponse commonResponse : commonResponseList) { + if (ObjectUtil.isNotEmpty(commonResponse.getName())) { + if (Arrays.binarySearch(DictMapDTO.sbArr, commonResponse.getName()) > -1) { + reportedCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.cbypArr, commonResponse.getName()) > -1) { + firstJudgmentCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.zbzypArr, commonResponse.getName()) > -1) { + secondLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.zzbzypArr, commonResponse.getName()) > -1) { + firstLeaderCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) { + sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; + } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) { + feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? Integer.valueOf(commonResponse.getValue()) : 0; } } } - return new RealtimeWork(reportedCount,firstJudgmentCount,secondLeaderCount,firstLeaderCount,sendCount,feedbackCount); + return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount); } @Override - public RealtimeWork getResult(Long id) { + public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-lc") ? - getListByOtherResult() : getListByLocalResult(id); + getListByOtherResult(businessReportInfoRequest) : getListByLocalResult(businessReportInfoRequest.getThirdId()); } public List> statisticsByHourTime() { @@ -359,7 +361,7 @@ public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-pt") ? statisticsByOtherPlate() : - statisticsByLocalPlate(businessReportInfoRequest.getId()); + statisticsByLocalPlate(businessReportInfoRequest.getThirdId()); } //从第三方获取上报记录 @@ -374,7 +376,7 @@ List> dpMapList = new ArrayList<>(); List> sbMapList = new ArrayList<>(); - List dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -7), new Date(), DateField.HOUR_OF_DAY); + List dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -12), new Date(), DateField.HOUR_OF_DAY); dateTimeList.forEach(dateTime -> { Map sbMap = new HashMap<>(); Map dpMap = new HashMap<>(); @@ -467,7 +469,7 @@ public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { return iBusinessAccessService.getAccessStatus("3-sj") ? statisticsByOtherReport(businessReportInfoRequest) : - statisticsByLocalReport(businessReportInfoRequest.getId()); + statisticsByLocalReport(businessReportInfoRequest.getThirdId()); } @@ -479,7 +481,7 @@ //从本地获取标签统计结果 public List statisticsByLocalTag(BusinessReportInfoRequest request) { List commonRequestList = new ArrayList<>(); - RealtimeWork realtimeWork = this.getById(request.getId()); + RealtimeWork realtimeWork = this.baseMapper.selectById(request.getThirdId()); if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getTagResult())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getTagResult()); @@ -514,11 +516,13 @@ //判断是否是子节点 public boolean isChild(Long pid, List areaList, String id) { - if (ObjectUtil.isNotEmpty(id)) { - Area area = areaList.stream().filter(o -> Objects.equals(o.getId(), Long.valueOf(id))).findFirst().orElse(null); - if (ObjectUtil.isNotEmpty(area)) { - if (area.getPids().indexOf("[" + pid + "]") > -1) { - return true; + if (StringUtils.isNumeric(id)) { + if (ObjectUtil.isNotEmpty(id)) { + Area area = areaList.stream().filter(o -> Objects.equals(o.getId(), Long.valueOf(id))).findFirst().orElse(null); + if (ObjectUtil.isNotEmpty(area)) { + if (area.getPids().indexOf("[" + pid + "]") > -1) { + return true; + } } } } @@ -572,6 +576,6 @@ return iBusinessAccessService.getAccessStatus("3-qy") ? statisticsByOtherArea(businessReportInfoRequest) : - statisticsByLocalArea(businessReportInfoRequest.getId()); + statisticsByLocalArea(businessReportInfoRequest.getThirdId()); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 16bbe34..41718db 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://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8 + url: jdbc:dm://139.198.29.133:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8 username: CASIC_XINJIANG password: Casic203! dynamic: @@ -12,15 +12,15 @@ strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 datasource: master: - url: jdbc:dm://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8 + url: jdbc:dm://139.198.29.133:5236/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://111.198.10.15:11102/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 driver-class-name: com.mysql.jdbc.Driver - username: root - password: Casic203! + username: emsroot + password: emsroot#203 jms: pub-sub-domain: true # session: