diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"8.3"}; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + 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 cbf710e..8b8e9fc 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 @@ -70,6 +70,39 @@ @TableField("DESCRIPTION") private String description; + /** + * 涉疆敏感时间趋势 + */ + @TableField("SJMG_RESULT") + private String sjmgResult; + + /** + * 常规舆情时间趋势 + */ + @TableField("CGYQ_RESULT") + private String cgyqResult; + + /** + * 涉党政军时间趋势 + */ + @TableField("SDZJ_RESULT") + private String sdzjResult; + + /** + * 标签分类统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + + + @TableField(exist = false) + private List sjmgResultList; + + @TableField(exist = false) + private List cgyqResultList; + + @TableField(exist = false) + private List sdzjResultList; //涉党政军标签 @TableField(exist = false) @@ -80,7 +113,9 @@ //常规信息标签 @TableField(exist = false) private List title3List; - + //标签分类统计 + @TableField(exist = false) + private List tagList; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + 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 cbf710e..8b8e9fc 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 @@ -70,6 +70,39 @@ @TableField("DESCRIPTION") private String description; + /** + * 涉疆敏感时间趋势 + */ + @TableField("SJMG_RESULT") + private String sjmgResult; + + /** + * 常规舆情时间趋势 + */ + @TableField("CGYQ_RESULT") + private String cgyqResult; + + /** + * 涉党政军时间趋势 + */ + @TableField("SDZJ_RESULT") + private String sdzjResult; + + /** + * 标签分类统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + + + @TableField(exist = false) + private List sjmgResultList; + + @TableField(exist = false) + private List cgyqResultList; + + @TableField(exist = false) + private List sdzjResultList; //涉党政军标签 @TableField(exist = false) @@ -80,7 +113,9 @@ //常规信息标签 @TableField(exist = false) private List title3List; - + //标签分类统计 + @TableField(exist = false) + private List tagList; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index 430a345..acb2ed7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -31,8 +34,8 @@ /** * 上报条数 */ - @TableField("REPORTED_CONUT") - private Integer reportedConut; + @TableField("REPORTED_COUNT") + private Integer reportedCount; /** * 初步研判条数 */ @@ -69,13 +72,69 @@ @TableField("DESCRIPTION") private String description; + /** + * 内容标签统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + /** + * 发布平台占比分析结果 + */ + @TableField("PLATE_RESULT") + private String plateResult; + + /** + * 上报时间分析结果 + */ + @TableField("REPORT_RESULT") + private String reportResult; + + /** + * 下发时间分析结果 + */ + @TableField("SEND_RESULT") + private String sendResult; + + /** + * 区域汇总统计结果 + */ + @TableField("AREA_RESULT") + private String areaResult; + + @TableField(exist = false) + private List areaResultList; + + @TableField(exist = false) + private List sendResultList; + + @TableField(exist = false) + private List reportResultList; + + @TableField(exist = false) + private List plateResultList; + + @TableField(exist = false) + private List tagResultList; + + public RealtimeWork() { + } + + public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount, + Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) { + this.reportedCount = reportedCount; + this.firstJudgmentCount = firstJudgmentCount; + this.secondLeaderCount = secondLeaderCount; + this.firstLeaderCount = firstLeaderCount; + this.sendCount = sendCount; + this.feedbackCount = feedbackCount; + } @Override public String toString() { return "RealtimeWork{" + "id=" + id + - ", reportedConut=" + reportedConut + + ", reportedCount=" + reportedCount + ", firstJudgmentCount=" + firstJudgmentCount + ", secondLeaderCount=" + secondLeaderCount + ", firstLeaderCount=" + firstLeaderCount + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + 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 cbf710e..8b8e9fc 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 @@ -70,6 +70,39 @@ @TableField("DESCRIPTION") private String description; + /** + * 涉疆敏感时间趋势 + */ + @TableField("SJMG_RESULT") + private String sjmgResult; + + /** + * 常规舆情时间趋势 + */ + @TableField("CGYQ_RESULT") + private String cgyqResult; + + /** + * 涉党政军时间趋势 + */ + @TableField("SDZJ_RESULT") + private String sdzjResult; + + /** + * 标签分类统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + + + @TableField(exist = false) + private List sjmgResultList; + + @TableField(exist = false) + private List cgyqResultList; + + @TableField(exist = false) + private List sdzjResultList; //涉党政军标签 @TableField(exist = false) @@ -80,7 +113,9 @@ //常规信息标签 @TableField(exist = false) private List title3List; - + //标签分类统计 + @TableField(exist = false) + private List tagList; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index 430a345..acb2ed7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -31,8 +34,8 @@ /** * 上报条数 */ - @TableField("REPORTED_CONUT") - private Integer reportedConut; + @TableField("REPORTED_COUNT") + private Integer reportedCount; /** * 初步研判条数 */ @@ -69,13 +72,69 @@ @TableField("DESCRIPTION") private String description; + /** + * 内容标签统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + /** + * 发布平台占比分析结果 + */ + @TableField("PLATE_RESULT") + private String plateResult; + + /** + * 上报时间分析结果 + */ + @TableField("REPORT_RESULT") + private String reportResult; + + /** + * 下发时间分析结果 + */ + @TableField("SEND_RESULT") + private String sendResult; + + /** + * 区域汇总统计结果 + */ + @TableField("AREA_RESULT") + private String areaResult; + + @TableField(exist = false) + private List areaResultList; + + @TableField(exist = false) + private List sendResultList; + + @TableField(exist = false) + private List reportResultList; + + @TableField(exist = false) + private List plateResultList; + + @TableField(exist = false) + private List tagResultList; + + public RealtimeWork() { + } + + public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount, + Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) { + this.reportedCount = reportedCount; + this.firstJudgmentCount = firstJudgmentCount; + this.secondLeaderCount = secondLeaderCount; + this.firstLeaderCount = firstLeaderCount; + this.sendCount = sendCount; + this.feedbackCount = feedbackCount; + } @Override public String toString() { return "RealtimeWork{" + "id=" + id + - ", reportedConut=" + reportedConut + + ", reportedCount=" + reportedCount + ", firstJudgmentCount=" + firstJudgmentCount + ", secondLeaderCount=" + secondLeaderCount + ", firstLeaderCount=" + firstLeaderCount + 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 27c998c..eabacaf 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 @@ -26,4 +26,6 @@ //根据区域统计上报、下发数据 List statisticsByArea(String begTime, String endTime); + List getCmdBodyInfosByStatus(); + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + 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 cbf710e..8b8e9fc 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 @@ -70,6 +70,39 @@ @TableField("DESCRIPTION") private String description; + /** + * 涉疆敏感时间趋势 + */ + @TableField("SJMG_RESULT") + private String sjmgResult; + + /** + * 常规舆情时间趋势 + */ + @TableField("CGYQ_RESULT") + private String cgyqResult; + + /** + * 涉党政军时间趋势 + */ + @TableField("SDZJ_RESULT") + private String sdzjResult; + + /** + * 标签分类统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + + + @TableField(exist = false) + private List sjmgResultList; + + @TableField(exist = false) + private List cgyqResultList; + + @TableField(exist = false) + private List sdzjResultList; //涉党政军标签 @TableField(exist = false) @@ -80,7 +113,9 @@ //常规信息标签 @TableField(exist = false) private List title3List; - + //标签分类统计 + @TableField(exist = false) + private List tagList; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index 430a345..acb2ed7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -31,8 +34,8 @@ /** * 上报条数 */ - @TableField("REPORTED_CONUT") - private Integer reportedConut; + @TableField("REPORTED_COUNT") + private Integer reportedCount; /** * 初步研判条数 */ @@ -69,13 +72,69 @@ @TableField("DESCRIPTION") private String description; + /** + * 内容标签统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + /** + * 发布平台占比分析结果 + */ + @TableField("PLATE_RESULT") + private String plateResult; + + /** + * 上报时间分析结果 + */ + @TableField("REPORT_RESULT") + private String reportResult; + + /** + * 下发时间分析结果 + */ + @TableField("SEND_RESULT") + private String sendResult; + + /** + * 区域汇总统计结果 + */ + @TableField("AREA_RESULT") + private String areaResult; + + @TableField(exist = false) + private List areaResultList; + + @TableField(exist = false) + private List sendResultList; + + @TableField(exist = false) + private List reportResultList; + + @TableField(exist = false) + private List plateResultList; + + @TableField(exist = false) + private List tagResultList; + + public RealtimeWork() { + } + + public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount, + Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) { + this.reportedCount = reportedCount; + this.firstJudgmentCount = firstJudgmentCount; + this.secondLeaderCount = secondLeaderCount; + this.firstLeaderCount = firstLeaderCount; + this.sendCount = sendCount; + this.feedbackCount = feedbackCount; + } @Override public String toString() { return "RealtimeWork{" + "id=" + id + - ", reportedConut=" + reportedConut + + ", reportedCount=" + reportedCount + ", firstJudgmentCount=" + firstJudgmentCount + ", secondLeaderCount=" + secondLeaderCount + ", firstLeaderCount=" + firstLeaderCount + 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 27c998c..eabacaf 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 @@ -26,4 +26,6 @@ //根据区域统计上报、下发数据 List statisticsByArea(String begTime, String endTime); + List getCmdBodyInfosByStatus(); + } 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 37ace11..399bebb 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,6 +39,8 @@ Object detail(String realtimeWorkId); + RealtimeWork getResult(Long id); + List> statisticsByTime(CommonRequest commonRequest); List> statisticsByDept(CommonRequest commonRequest); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + 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 cbf710e..8b8e9fc 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 @@ -70,6 +70,39 @@ @TableField("DESCRIPTION") private String description; + /** + * 涉疆敏感时间趋势 + */ + @TableField("SJMG_RESULT") + private String sjmgResult; + + /** + * 常规舆情时间趋势 + */ + @TableField("CGYQ_RESULT") + private String cgyqResult; + + /** + * 涉党政军时间趋势 + */ + @TableField("SDZJ_RESULT") + private String sdzjResult; + + /** + * 标签分类统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + + + @TableField(exist = false) + private List sjmgResultList; + + @TableField(exist = false) + private List cgyqResultList; + + @TableField(exist = false) + private List sdzjResultList; //涉党政军标签 @TableField(exist = false) @@ -80,7 +113,9 @@ //常规信息标签 @TableField(exist = false) private List title3List; - + //标签分类统计 + @TableField(exist = false) + private List tagList; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index 430a345..acb2ed7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -31,8 +34,8 @@ /** * 上报条数 */ - @TableField("REPORTED_CONUT") - private Integer reportedConut; + @TableField("REPORTED_COUNT") + private Integer reportedCount; /** * 初步研判条数 */ @@ -69,13 +72,69 @@ @TableField("DESCRIPTION") private String description; + /** + * 内容标签统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + /** + * 发布平台占比分析结果 + */ + @TableField("PLATE_RESULT") + private String plateResult; + + /** + * 上报时间分析结果 + */ + @TableField("REPORT_RESULT") + private String reportResult; + + /** + * 下发时间分析结果 + */ + @TableField("SEND_RESULT") + private String sendResult; + + /** + * 区域汇总统计结果 + */ + @TableField("AREA_RESULT") + private String areaResult; + + @TableField(exist = false) + private List areaResultList; + + @TableField(exist = false) + private List sendResultList; + + @TableField(exist = false) + private List reportResultList; + + @TableField(exist = false) + private List plateResultList; + + @TableField(exist = false) + private List tagResultList; + + public RealtimeWork() { + } + + public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount, + Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) { + this.reportedCount = reportedCount; + this.firstJudgmentCount = firstJudgmentCount; + this.secondLeaderCount = secondLeaderCount; + this.firstLeaderCount = firstLeaderCount; + this.sendCount = sendCount; + this.feedbackCount = feedbackCount; + } @Override public String toString() { return "RealtimeWork{" + "id=" + id + - ", reportedConut=" + reportedConut + + ", reportedCount=" + reportedCount + ", firstJudgmentCount=" + firstJudgmentCount + ", secondLeaderCount=" + secondLeaderCount + ", firstLeaderCount=" + firstLeaderCount + 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 27c998c..eabacaf 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 @@ -26,4 +26,6 @@ //根据区域统计上报、下发数据 List statisticsByArea(String begTime, String endTime); + List getCmdBodyInfosByStatus(); + } 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 37ace11..399bebb 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,6 +39,8 @@ Object detail(String realtimeWorkId); + RealtimeWork getResult(Long id); + List> statisticsByTime(CommonRequest commonRequest); List> statisticsByDept(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 eeba69c..471d8c8 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 @@ -14,7 +14,7 @@ /** *

- * 服务实现类 + * 服务实现类 *

* * @author stylefeng123 @@ -29,10 +29,10 @@ public List getCmdBodyInfoByTime(String begTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("hand_time",begTime); - queryWrapper.le("hand_time",endTime); + queryWrapper.ge("hand_time", begTime); + queryWrapper.le("hand_time", endTime); //取初步研判状态及以后的信息 - queryWrapper.ge("body_state",2); + queryWrapper.ge("body_state", 2); return this.list(queryWrapper); } @@ -44,12 +44,19 @@ @Override public List getCountByTime(String begTime, String endTime) { - return this.baseMapper.getCountByTime(begTime,endTime); + return this.baseMapper.getCountByTime(begTime, endTime); } @Override public List statisticsByArea(String begTime, String endTime) { - return this.baseMapper.statisticsByArea(begTime,endTime); + return this.baseMapper.statisticsByArea(begTime, endTime); + } + + @Override + public List getCmdBodyInfosByStatus() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("body_nature", "0"); + return this.list(queryWrapper); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + 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 cbf710e..8b8e9fc 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 @@ -70,6 +70,39 @@ @TableField("DESCRIPTION") private String description; + /** + * 涉疆敏感时间趋势 + */ + @TableField("SJMG_RESULT") + private String sjmgResult; + + /** + * 常规舆情时间趋势 + */ + @TableField("CGYQ_RESULT") + private String cgyqResult; + + /** + * 涉党政军时间趋势 + */ + @TableField("SDZJ_RESULT") + private String sdzjResult; + + /** + * 标签分类统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + + + @TableField(exist = false) + private List sjmgResultList; + + @TableField(exist = false) + private List cgyqResultList; + + @TableField(exist = false) + private List sdzjResultList; //涉党政军标签 @TableField(exist = false) @@ -80,7 +113,9 @@ //常规信息标签 @TableField(exist = false) private List title3List; - + //标签分类统计 + @TableField(exist = false) + private List tagList; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index 430a345..acb2ed7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -31,8 +34,8 @@ /** * 上报条数 */ - @TableField("REPORTED_CONUT") - private Integer reportedConut; + @TableField("REPORTED_COUNT") + private Integer reportedCount; /** * 初步研判条数 */ @@ -69,13 +72,69 @@ @TableField("DESCRIPTION") private String description; + /** + * 内容标签统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + /** + * 发布平台占比分析结果 + */ + @TableField("PLATE_RESULT") + private String plateResult; + + /** + * 上报时间分析结果 + */ + @TableField("REPORT_RESULT") + private String reportResult; + + /** + * 下发时间分析结果 + */ + @TableField("SEND_RESULT") + private String sendResult; + + /** + * 区域汇总统计结果 + */ + @TableField("AREA_RESULT") + private String areaResult; + + @TableField(exist = false) + private List areaResultList; + + @TableField(exist = false) + private List sendResultList; + + @TableField(exist = false) + private List reportResultList; + + @TableField(exist = false) + private List plateResultList; + + @TableField(exist = false) + private List tagResultList; + + public RealtimeWork() { + } + + public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount, + Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) { + this.reportedCount = reportedCount; + this.firstJudgmentCount = firstJudgmentCount; + this.secondLeaderCount = secondLeaderCount; + this.firstLeaderCount = firstLeaderCount; + this.sendCount = sendCount; + this.feedbackCount = feedbackCount; + } @Override public String toString() { return "RealtimeWork{" + "id=" + id + - ", reportedConut=" + reportedConut + + ", reportedCount=" + reportedCount + ", firstJudgmentCount=" + firstJudgmentCount + ", secondLeaderCount=" + secondLeaderCount + ", firstLeaderCount=" + firstLeaderCount + 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 27c998c..eabacaf 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 @@ -26,4 +26,6 @@ //根据区域统计上报、下发数据 List statisticsByArea(String begTime, String endTime); + List getCmdBodyInfosByStatus(); + } 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 37ace11..399bebb 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,6 +39,8 @@ Object detail(String realtimeWorkId); + RealtimeWork getResult(Long id); + List> statisticsByTime(CommonRequest commonRequest); List> statisticsByDept(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 eeba69c..471d8c8 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 @@ -14,7 +14,7 @@ /** *

- * 服务实现类 + * 服务实现类 *

* * @author stylefeng123 @@ -29,10 +29,10 @@ public List getCmdBodyInfoByTime(String begTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("hand_time",begTime); - queryWrapper.le("hand_time",endTime); + queryWrapper.ge("hand_time", begTime); + queryWrapper.le("hand_time", endTime); //取初步研判状态及以后的信息 - queryWrapper.ge("body_state",2); + queryWrapper.ge("body_state", 2); return this.list(queryWrapper); } @@ -44,12 +44,19 @@ @Override public List getCountByTime(String begTime, String endTime) { - return this.baseMapper.getCountByTime(begTime,endTime); + return this.baseMapper.getCountByTime(begTime, endTime); } @Override public List statisticsByArea(String begTime, String endTime) { - return this.baseMapper.statisticsByArea(begTime,endTime); + return this.baseMapper.statisticsByArea(begTime, endTime); + } + + @Override + public List getCmdBodyInfosByStatus() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("body_nature", "0"); + return this.list(queryWrapper); } } 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 00e5254..7d413f8 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 @@ -12,10 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.dao.JudgmentMapper; -import com.casic.missiles.modular.system.dto.CommonRequest; -import com.casic.missiles.modular.system.dto.DictMapDTO; -import com.casic.missiles.modular.system.dto.JudgmentRequest; -import com.casic.missiles.modular.system.dto.TagResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.Judgment; @@ -127,7 +124,8 @@ return hashMap; } - public Map getDataByLocal(JudgmentRequest judgmentRequest) { + //根据录入历史数据统计(暂留) + public Map getDataByLocal1(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); @@ -208,6 +206,62 @@ return hashMap; } + public Map getDataByLocal(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List dpList = new ArrayList<>(); + Judgment judgment = this.getById(judgmentRequest.getId()); + //涉党政军 + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + list.forEach(commonRequest -> { + CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue()); + dpList.add(commonResponse); + }); + } + //涉疆敏感 + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSjmgResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSjmgResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + list.forEach(commonRequest -> { + if (ObjectUtil.isNotEmpty(dpList)) { + dpList.forEach(commonResponse -> { + if (commonResponse.getName().equals(commonRequest.getTime())) { + commonResponse.setValue1(commonRequest.getValue()); + } + }); + } else { + CommonResponse commonResponse = new CommonResponse(); + commonResponse.setName(commonRequest.getTime()); + commonResponse.setValue1(commonRequest.getValue()); + dpList.add(commonResponse); + } + }); + } + + //常规信息 + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getCgyqResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getCgyqResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + list.forEach(commonRequest -> { + if (ObjectUtil.isNotEmpty(dpList)) { + dpList.forEach(commonResponse -> { + if (commonResponse.getName().equals(commonRequest.getTime())) { + commonResponse.setValue2(commonRequest.getValue()); + } + }); + } else { + CommonResponse commonResponse = new CommonResponse(); + commonResponse.setName(commonRequest.getTime()); + commonResponse.setValue2(commonRequest.getValue()); + dpList.add(commonResponse); + } + }); + } + hashMap.put("dp", dpList); + return hashMap; + } + @Override public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { return iBusinessAccessService.getAccessStatus("2-sj") ? @@ -346,8 +400,8 @@ return list; } - //从本地接口获取 - public List> getByLocal(JudgmentRequest judgmentRequest) { + //从本地接口获取（暂留） + public List> getByLocal1(JudgmentRequest judgmentRequest) { List> resultList = new ArrayList<>(); List firstTagDicts = dictService.findInDictByCode(DictEnum.FIRST_TAG); //从本地获取 @@ -422,6 +476,24 @@ return resultList; } + + //从本地接口获取 + public List> getByLocal(JudgmentRequest judgmentRequest) { + List> resultList = new ArrayList<>(); + Judgment judgment = this.getById(judgmentRequest.getId()); + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + resultList = list.stream().map(it -> { + Map apiMap = new HashMap<>(); + apiMap.put("value", it.getValue()); + apiMap.put("name", it.getName()); + return apiMap; + }).collect(Collectors.toList()); + } + return resultList; + } + //从第三方获取数据 public List> getByOther(JudgmentRequest judgmentRequest) { List> resultList = new ArrayList<>(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java index 307ee0d..d31f899 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -77,4 +78,22 @@ return ResponseData.success(); } + /** + * 修改访问方式 + */ + @RequestMapping(value = "/updateBatch") + @ResponseBody + public Object updateBatch(@RequestBody BusinessAccess businessAccess) { + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("MENU_CODE", businessAccess.getCodeList()); + List businessAccesses = businessAccessService.list(queryWrapper); + businessAccesses.forEach(businessAccess1 -> { + businessAccess1.setIsActive(flag); + businessAccess1.setUptime(new Date()); + businessAccessService.updateById(businessAccess1); + }); + return ResponseData.success(); + } + } 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 e38da10..5bca3cc 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 @@ -124,7 +124,7 @@ } /** - * 修改每日研判通报(已废弃) + * 修改每日研判通报 */ @RequestMapping(value = "/update") @ResponseBody @@ -132,7 +132,6 @@ Assert.isFalse(Objects.isNull(judgment.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); } @@ -145,6 +144,41 @@ return ResponseData.success(judgmentService.updateById(judgment)); } + /** + * 修改每日研判通报时间趋势 + */ + @RequestMapping(value = "/updateTime") + @ResponseBody + public Object updateTime(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getCgyqResultList())){ + judgment.setCgyqResult(JSON.toJSONString(judgment.getCgyqResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSdzjResultList())){ + judgment.setSdzjResult(JSON.toJSONString(judgment.getSdzjResultList(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getSjmgResultList())){ + judgment.setSjmgResult(JSON.toJSONString(judgment.getSjmgResultList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** + * 修改每日研判通报标签分类占比 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(ObjectUtil.isNotEmpty(judgment.getTagList())){ + judgment.setTagResult(JSON.toJSONString(judgment.getTagList(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); + } + /** * 时间趋势分析接口 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 5efddb3..2648e8e 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 @@ -1,7 +1,8 @@ package com.casic.missiles.modular.system.controller; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.modular.system.service.IAreaService; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -37,6 +40,9 @@ @Autowired private IRealtimeWorkService realtimeWorkService; + @Resource + private IAreaService iAreaService; + /** * 获取实时工作情况列表 @@ -64,11 +70,87 @@ @ResponseBody public Object add(@RequestBody RealtimeWork realtimeWork) { //删除所有，只保留最新数据 - realtimeWorkService.remove(new QueryWrapper<>()); +// realtimeWorkService.remove(new QueryWrapper<>()); return ResponseData.success(realtimeWorkService.add(realtimeWork)); } /** + * 更新发布平台占比分析 + */ + @RequestMapping(value = "/updatePlate") + @ResponseBody + public Object updatePlate(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getPlateResultList())) { + realtimeWork.setPlateResult(JSON.toJSONString(realtimeWork.getPlateResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新上报时间分析 + */ + @RequestMapping(value = "/updateReport") + @ResponseBody + public Object updateReport(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getReportResultList())) { + realtimeWork.setReportResult(JSON.toJSONString(realtimeWork.getReportResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新下发时间分析 + */ + @RequestMapping(value = "/updateSend") + @ResponseBody + public Object updateSend(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getSendResultList())) { + realtimeWork.setSendResult(JSON.toJSONString(realtimeWork.getSendResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新内容标签分类统计 + */ + @RequestMapping(value = "/updateTag") + @ResponseBody + public Object updateTag(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getTagResultList())) { + realtimeWork.setTagResult(JSON.toJSONString(realtimeWork.getTagResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + /** + * 更新区域汇总 + */ + @RequestMapping(value = "/updateArea") + @ResponseBody + public Object updateArea(@RequestBody RealtimeWork realtimeWork) { + Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if (ObjectUtil.isNotEmpty(realtimeWork.getAreaResultList())) { + realtimeWork.setAreaResult(JSON.toJSONString(realtimeWork.getAreaResultList(), true)); + } + return ResponseData.success(realtimeWorkService.updateById(realtimeWork)); + } + + + /** * 删除实时工作情况 */ @RequestMapping(value = "/delete") @@ -129,6 +211,15 @@ } /** + * 实时流程数据信息 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object getResult(@RequestParam Long id) { + return ResponseData.success(realtimeWorkService.getResult(id)); + } + + /** * 实时工作发布平台占比接口 */ @RequestMapping(value = "/statisticsByPlate") @@ -165,4 +256,13 @@ public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/getAreas") + @ResponseBody + public Object getAreas() { + return ResponseData.success(iAreaService.list()); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index bd74e02..ce40e01 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ ID - AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description + AS id, REPORTED_COUNT AS reportedCount, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description 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 2857128..51f2489 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,5 +10,7 @@ private String beginTime; private String endTime; + private Long id; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java index 8a5c7db..b00b6f1 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -28,11 +28,9 @@ this.value1 = value1; } - public CommonResponse(String name, String value, String value1, String value2) { + public CommonResponse(String name, String value) { this.name = name; this.value = value; - this.value1 = value1; - this.value2 = value2; } 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 0deab82..431c10e 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 @@ -39,4 +39,27 @@ cgxxHashMap.put("食品安全", "7-6"); cgxxHashMap.put("其他相关", "7-7"); } + + //0.5 地州初筛（上报给初筛研判） + //0.49 地州上报 + //0.61 二科（政务舆情科 A20400） + //0.62 三科（社会一科 A20600） + //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"}; + //1.1 联合传播行动队长研判 + //2 初步研判 + public static String[] cbypArr={"1.1","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"}; + //7 指令分发 + public static String[] xfArr={"7"}; + //8.3 反馈 + public static String[] fkArr={"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 0119d89..f726a65 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 @@ -5,6 +5,8 @@ @Data public class JudgmentRequest { + private Long id; + private String beginTime; private String endTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java index 55bfb85..9ed13f8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; import java.util.Date; +import java.util.List; /** *

@@ -58,6 +60,10 @@ @TableField("UPTIME") private Date uptime; + + @TableField(exist = false) + private List codeList; + @Override public String toString() { return "BusinessAccess{" + 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 cbf710e..8b8e9fc 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 @@ -70,6 +70,39 @@ @TableField("DESCRIPTION") private String description; + /** + * 涉疆敏感时间趋势 + */ + @TableField("SJMG_RESULT") + private String sjmgResult; + + /** + * 常规舆情时间趋势 + */ + @TableField("CGYQ_RESULT") + private String cgyqResult; + + /** + * 涉党政军时间趋势 + */ + @TableField("SDZJ_RESULT") + private String sdzjResult; + + /** + * 标签分类统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + + + @TableField(exist = false) + private List sjmgResultList; + + @TableField(exist = false) + private List cgyqResultList; + + @TableField(exist = false) + private List sdzjResultList; //涉党政军标签 @TableField(exist = false) @@ -80,7 +113,9 @@ //常规信息标签 @TableField(exist = false) private List title3List; - + //标签分类统计 + @TableField(exist = false) + private List tagList; @Override public String toString() { return "Judgment{" + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java index 430a345..acb2ed7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -31,8 +34,8 @@ /** * 上报条数 */ - @TableField("REPORTED_CONUT") - private Integer reportedConut; + @TableField("REPORTED_COUNT") + private Integer reportedCount; /** * 初步研判条数 */ @@ -69,13 +72,69 @@ @TableField("DESCRIPTION") private String description; + /** + * 内容标签统计结果 + */ + @TableField("TAG_RESULT") + private String tagResult; + /** + * 发布平台占比分析结果 + */ + @TableField("PLATE_RESULT") + private String plateResult; + + /** + * 上报时间分析结果 + */ + @TableField("REPORT_RESULT") + private String reportResult; + + /** + * 下发时间分析结果 + */ + @TableField("SEND_RESULT") + private String sendResult; + + /** + * 区域汇总统计结果 + */ + @TableField("AREA_RESULT") + private String areaResult; + + @TableField(exist = false) + private List areaResultList; + + @TableField(exist = false) + private List sendResultList; + + @TableField(exist = false) + private List reportResultList; + + @TableField(exist = false) + private List plateResultList; + + @TableField(exist = false) + private List tagResultList; + + public RealtimeWork() { + } + + public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount, + Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) { + this.reportedCount = reportedCount; + this.firstJudgmentCount = firstJudgmentCount; + this.secondLeaderCount = secondLeaderCount; + this.firstLeaderCount = firstLeaderCount; + this.sendCount = sendCount; + this.feedbackCount = feedbackCount; + } @Override public String toString() { return "RealtimeWork{" + "id=" + id + - ", reportedConut=" + reportedConut + + ", reportedCount=" + reportedCount + ", firstJudgmentCount=" + firstJudgmentCount + ", secondLeaderCount=" + secondLeaderCount + ", firstLeaderCount=" + firstLeaderCount + 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 27c998c..eabacaf 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 @@ -26,4 +26,6 @@ //根据区域统计上报、下发数据 List statisticsByArea(String begTime, String endTime); + List getCmdBodyInfosByStatus(); + } 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 37ace11..399bebb 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,6 +39,8 @@ Object detail(String realtimeWorkId); + RealtimeWork getResult(Long id); + List> statisticsByTime(CommonRequest commonRequest); List> statisticsByDept(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 eeba69c..471d8c8 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 @@ -14,7 +14,7 @@ /** *

- * 服务实现类 + * 服务实现类 *

* * @author stylefeng123 @@ -29,10 +29,10 @@ public List getCmdBodyInfoByTime(String begTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("hand_time",begTime); - queryWrapper.le("hand_time",endTime); + queryWrapper.ge("hand_time", begTime); + queryWrapper.le("hand_time", endTime); //取初步研判状态及以后的信息 - queryWrapper.ge("body_state",2); + queryWrapper.ge("body_state", 2); return this.list(queryWrapper); } @@ -44,12 +44,19 @@ @Override public List getCountByTime(String begTime, String endTime) { - return this.baseMapper.getCountByTime(begTime,endTime); + return this.baseMapper.getCountByTime(begTime, endTime); } @Override public List statisticsByArea(String begTime, String endTime) { - return this.baseMapper.statisticsByArea(begTime,endTime); + return this.baseMapper.statisticsByArea(begTime, endTime); + } + + @Override + public List getCmdBodyInfosByStatus() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("body_nature", "0"); + return this.list(queryWrapper); } } 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 00e5254..7d413f8 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 @@ -12,10 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.dao.JudgmentMapper; -import com.casic.missiles.modular.system.dto.CommonRequest; -import com.casic.missiles.modular.system.dto.DictMapDTO; -import com.casic.missiles.modular.system.dto.JudgmentRequest; -import com.casic.missiles.modular.system.dto.TagResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.Judgment; @@ -127,7 +124,8 @@ return hashMap; } - public Map getDataByLocal(JudgmentRequest judgmentRequest) { + //根据录入历史数据统计(暂留) + public Map getDataByLocal1(JudgmentRequest judgmentRequest) { Map hashMap = new HashMap<>(); List> firstMapList = new ArrayList<>(); List> secondMapList = new ArrayList<>(); @@ -208,6 +206,62 @@ return hashMap; } + public Map getDataByLocal(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List dpList = new ArrayList<>(); + Judgment judgment = this.getById(judgmentRequest.getId()); + //涉党政军 + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + list.forEach(commonRequest -> { + CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue()); + dpList.add(commonResponse); + }); + } + //涉疆敏感 + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSjmgResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSjmgResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + list.forEach(commonRequest -> { + if (ObjectUtil.isNotEmpty(dpList)) { + dpList.forEach(commonResponse -> { + if (commonResponse.getName().equals(commonRequest.getTime())) { + commonResponse.setValue1(commonRequest.getValue()); + } + }); + } else { + CommonResponse commonResponse = new CommonResponse(); + commonResponse.setName(commonRequest.getTime()); + commonResponse.setValue1(commonRequest.getValue()); + dpList.add(commonResponse); + } + }); + } + + //常规信息 + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getCgyqResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getCgyqResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + list.forEach(commonRequest -> { + if (ObjectUtil.isNotEmpty(dpList)) { + dpList.forEach(commonResponse -> { + if (commonResponse.getName().equals(commonRequest.getTime())) { + commonResponse.setValue2(commonRequest.getValue()); + } + }); + } else { + CommonResponse commonResponse = new CommonResponse(); + commonResponse.setName(commonRequest.getTime()); + commonResponse.setValue2(commonRequest.getValue()); + dpList.add(commonResponse); + } + }); + } + hashMap.put("dp", dpList); + return hashMap; + } + @Override public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { return iBusinessAccessService.getAccessStatus("2-sj") ? @@ -346,8 +400,8 @@ return list; } - //从本地接口获取 - public List> getByLocal(JudgmentRequest judgmentRequest) { + //从本地接口获取（暂留） + public List> getByLocal1(JudgmentRequest judgmentRequest) { List> resultList = new ArrayList<>(); List firstTagDicts = dictService.findInDictByCode(DictEnum.FIRST_TAG); //从本地获取 @@ -422,6 +476,24 @@ return resultList; } + + //从本地接口获取 + public List> getByLocal(JudgmentRequest judgmentRequest) { + List> resultList = new ArrayList<>(); + Judgment judgment = this.getById(judgmentRequest.getId()); + if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getTagResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getTagResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + resultList = list.stream().map(it -> { + Map apiMap = new HashMap<>(); + apiMap.put("value", it.getValue()); + apiMap.put("name", it.getName()); + return apiMap; + }).collect(Collectors.toList()); + } + return resultList; + } + //从第三方获取数据 public List> getByOther(JudgmentRequest judgmentRequest) { List> resultList = new ArrayList<>(); 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 36ce485..adc9da7 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 @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,12 +18,14 @@ import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.*; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -58,10 +62,37 @@ @Resource private IAreaService iAreaService; + @Autowired + private IBusinessAccessService iBusinessAccessService; + + @Override public Object realtimeWorkList(RealtimeWork realtimeWork) { QueryWrapper wrapper = new QueryWrapper<>(); - return realtimeWorkMapper.selectList(wrapper); + List realtimeWorkList = realtimeWorkMapper.selectList(wrapper); + realtimeWorkList.forEach(obj -> { + if (ObjectUtil.isNotEmpty(obj.getAreaResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getAreaResult()); + obj.setAreaResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonResponse.class)); + } + if (ObjectUtil.isNotEmpty(obj.getSendResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getSendResult()); + obj.setSendResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + if (ObjectUtil.isNotEmpty(obj.getReportResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getReportResult()); + obj.setReportResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + if (ObjectUtil.isNotEmpty(obj.getTagResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getTagResult()); + obj.setTagResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + if (ObjectUtil.isNotEmpty(obj.getPlateResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getPlateResult()); + obj.setPlateResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + }); + return realtimeWorkList; } @Override @@ -106,6 +137,46 @@ return realtimeWorkMapper.selectById(realtimeWorkId); } + + public RealtimeWork getListByLocalResult(Long id){ + + return this.getById(id); + } + + public RealtimeWork getListByOtherResult( ){ + + + 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; + } + } + } + + return new RealtimeWork(reportedCount,firstJudgmentCount,secondLeaderCount,firstLeaderCount,sendCount,feedbackCount); + + } + + @Override + public RealtimeWork getResult(Long id) { + return iBusinessAccessService.getAccessStatus("3-lc") ? + getListByOtherResult() : getListByLocalResult(id); + } + public List> statisticsByHourTime() { //获取8小时内的上报数据 @@ -244,8 +315,27 @@ return resultMapList; } - @Override - public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { + //从手动填入数据中获取平台统计结果 + public List> statisticsByLocalPlate(Long id) { + + List> resultList = new ArrayList<>(); + RealtimeWork realtimeWork = this.getById(id); + if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getPlateResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getPlateResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + resultList = list.stream().map(it -> { + HashMap apiMap = new HashMap<>(); + apiMap.put("value", it.getValue()); + apiMap.put("name", it.getName()); + return apiMap; + }).collect(Collectors.toList()); + } + return resultList; + + } + + //从第三方获取平台统计结果 + public List> statisticsByOtherPlate() { List> resultMapList = new ArrayList<>(); //获取上报信息 List list = iCmdControlsInfoService.getWebList(); @@ -266,8 +356,14 @@ } @Override - public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { + public List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) { + return iBusinessAccessService.getAccessStatus("3-pt") ? + statisticsByOtherPlate() : + statisticsByLocalPlate(businessReportInfoRequest.getId()); + } + //从第三方获取上报记录 + public Map statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) { Map resultMap = new HashMap<>(); //获取上报信息 List sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), @@ -318,26 +414,139 @@ resultMap.put("xf", xfMapList); resultMap.put("dp", dpMapList); return resultMap; + + } + + //从本地获取上报记录 + public Map statisticsByLocalReport(Long id) { + Map resultMap = new HashMap<>(); + List> sbMapList = new ArrayList<>(); + List> xfMapList = new ArrayList<>(); + List> dpMapList = new ArrayList<>(); + Map dpMap = new HashMap<>(); + RealtimeWork realtimeWork = this.getById(id); + + if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getReportResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getReportResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + sbMapList = list.stream().map(it -> { + HashMap apiMap = new HashMap<>(); + apiMap.put("value", it.getValue()); + apiMap.put("name", it.getTime()); + dpMap.put("value", it.getValue()); + dpMap.put("name", it.getTime()); + dpMapList.add(dpMap); + return apiMap; + }).collect(Collectors.toList()); + } + + if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getSendResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getSendResult()); + List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + xfMapList = list.stream().map(it -> { + HashMap apiMap = new HashMap<>(); + apiMap.put("value", it.getValue()); + apiMap.put("name", it.getTime()); + dpMapList.forEach(dp -> { + if (dp.get("name").equals(it.getTime())) { + dp.put("value1", it.getValue()); + } + }); + return apiMap; + }).collect(Collectors.toList()); + } + + resultMap.put("sb", sbMapList); + resultMap.put("xf", xfMapList); + resultMap.put("dp", dpMapList); + return resultMap; + + } + + @Override + public Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) { + return iBusinessAccessService.getAccessStatus("3-sj") ? + statisticsByOtherReport(businessReportInfoRequest) : + statisticsByLocalReport(businessReportInfoRequest.getId()); + } + + + //从第三方获取标签统计结果 + public List statisticsByOtherTag(BusinessReportInfoRequest request) { + return iCmdBodyTagService.statisticsByTag(request); + } + + //从本地获取标签统计结果 + public List statisticsByLocalTag(BusinessReportInfoRequest request) { + List commonRequestList = new ArrayList<>(); + RealtimeWork realtimeWork = this.getById(request.getId()); + + if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getTagResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getTagResult()); + commonRequestList = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); + } + return commonRequestList; } @Override public List statisticsByTag(BusinessReportInfoRequest request) { - return iCmdBodyTagService.statisticsByTag(request); + + return iBusinessAccessService.getAccessStatus("3-bq") ? + statisticsByOtherTag(request) : + statisticsByLocalTag(request); } - @Override - public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + + //处理区域编号转换 + public String processUtil(String orgCode) { + if (ObjectUtil.isNotEmpty(orgCode)) { + if (orgCode.indexOf("B0") > -1) { + orgCode = orgCode.replace("B0", ""); + } else { + orgCode = orgCode.substring(1, orgCode.length()); + if (orgCode.indexOf("10") == 0) { + orgCode.replaceFirst("10", "20"); + } + } + } + return orgCode; + } + + //判断是否是子节点 + 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; + } + } + } + return false; + } + + //从第三方获取区域统计数据 + public List statisticsByOtherArea(BusinessReportInfoRequest businessReportInfoRequest) { List resultList = new ArrayList<>(); - //toDo:若以区域编号匹配，前面加“B0” List areaList = iAreaService.list(); - List responseList = iCmdBodyInfoService.statisticsByArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); + List areaList1 = new ArrayList<>(); + areaList.forEach(area -> { + String pids = area.getPids(); + if (ObjectUtil.isNotEmpty(pids) && area.getPids().split(",").length == 2) { + areaList1.add(area); + } + }); + List responseList = iCmdBodyInfoService.statisticsByArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); + areaList1.forEach(area -> { CommonResponse commonResponse = new CommonResponse(area.getAreaName(), "0", "0"); responseList.forEach(res -> { - if (area.getAreaName().equals(res.getSubmitOrgan())) { + String submitCode = processUtil(res.getSubmitCode()); + String instructCode = processUtil(res.getInstructCode()); + if (area.getId().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) { commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + 1) + ""); } - if (area.getAreaName().equals(res.getInstructOrgan())) { + if (area.getId().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) { commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + 1) + ""); } }); @@ -346,4 +555,23 @@ resultList.sort(Comparator.comparing(CommonResponse::getValue).reversed()); return resultList; } + + //从本地获取区域统计数据 + public List statisticsByLocalArea(Long id) { + List commonResponseList = new ArrayList<>(); + RealtimeWork realtimeWork = this.getById(id); + if (ObjectUtil.isNotEmpty(realtimeWork) && ObjectUtil.isNotEmpty(realtimeWork.getAreaResult())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(realtimeWork.getAreaResult()); + commonResponseList = JSONObject.parseArray(jsonArray.toJSONString(), CommonResponse.class); + } + return commonResponseList; + } + + @Override + public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + + return iBusinessAccessService.getAccessStatus("3-qy") ? + statisticsByOtherArea(businessReportInfoRequest) : + statisticsByLocalArea(businessReportInfoRequest.getId()); + } }