getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 8c9dd72..dd67189 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
@@ -1,8 +1,8 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.dto.TagResponse;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
import java.util.List;
@@ -18,9 +18,9 @@
//获取研判总数
List getCmdBodyInfoByTime(String begTime, String endTime);
-// //标签分类占比
+ //标签分类占比
List getCmdBodyInfoByTag(String begTime, String endTime);
-
-
+ //根据上报、下发时间统计信息数
+ List getCountByTime(String begTime, String endTime);
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 8c9dd72..dd67189 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
@@ -1,8 +1,8 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.dto.TagResponse;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
import java.util.List;
@@ -18,9 +18,9 @@
//获取研判总数
List getCmdBodyInfoByTime(String begTime, String endTime);
-// //标签分类占比
+ //标签分类占比
List getCmdBodyInfoByTag(String begTime, String endTime);
-
-
+ //根据上报、下发时间统计信息数
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
index 75fffba..3fbdf3e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+
+import java.util.List;
/**
*
@@ -12,5 +15,5 @@
* @since 2023-06-15
*/
public interface ICmdBodyInstructService extends IService {
-
+ List getCountByTime(String begTime, String endTime);
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 8c9dd72..dd67189 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
@@ -1,8 +1,8 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.dto.TagResponse;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
import java.util.List;
@@ -18,9 +18,9 @@
//获取研判总数
List getCmdBodyInfoByTime(String begTime, String endTime);
-// //标签分类占比
+ //标签分类占比
List getCmdBodyInfoByTag(String begTime, String endTime);
-
-
+ //根据上报、下发时间统计信息数
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
index 75fffba..3fbdf3e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+
+import java.util.List;
/**
*
@@ -12,5 +15,5 @@
* @since 2023-06-15
*/
public interface ICmdBodyInstructService extends IService {
-
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
index 36abf4f..dbc171c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
@@ -1,8 +1,11 @@
package com.casic.missiles.modular.system.service;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 管控信息表 服务类
@@ -13,4 +16,6 @@
*/
public interface ICmdControlsInfoService extends IService {
+ List getWebList();
+
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 8c9dd72..dd67189 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
@@ -1,8 +1,8 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.dto.TagResponse;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
import java.util.List;
@@ -18,9 +18,9 @@
//获取研判总数
List getCmdBodyInfoByTime(String begTime, String endTime);
-// //标签分类占比
+ //标签分类占比
List getCmdBodyInfoByTag(String begTime, String endTime);
-
-
+ //根据上报、下发时间统计信息数
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
index 75fffba..3fbdf3e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+
+import java.util.List;
/**
*
@@ -12,5 +15,5 @@
* @since 2023-06-15
*/
public interface ICmdBodyInstructService extends IService {
-
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
index 36abf4f..dbc171c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
@@ -1,8 +1,11 @@
package com.casic.missiles.modular.system.service;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 管控信息表 服务类
@@ -13,4 +16,6 @@
*/
public interface ICmdControlsInfoService extends IService {
+ List getWebList();
+
}
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 ef35e7e..532af34 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
import com.casic.missiles.modular.system.model.RealtimeWork;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,6 +11,7 @@
import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
*
@@ -37,5 +39,10 @@
List> statisticsByTime(CommonRequest commonRequest);
- List> statisticsByDept(@RequestBody @Valid CommonRequest commonRequest);
+ List> statisticsByDept(CommonRequest commonRequest);
+
+ List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest);
+
+ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest);
+
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 8c9dd72..dd67189 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
@@ -1,8 +1,8 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.dto.TagResponse;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
import java.util.List;
@@ -18,9 +18,9 @@
//获取研判总数
List getCmdBodyInfoByTime(String begTime, String endTime);
-// //标签分类占比
+ //标签分类占比
List getCmdBodyInfoByTag(String begTime, String endTime);
-
-
+ //根据上报、下发时间统计信息数
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
index 75fffba..3fbdf3e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+
+import java.util.List;
/**
*
@@ -12,5 +15,5 @@
* @since 2023-06-15
*/
public interface ICmdBodyInstructService extends IService {
-
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
index 36abf4f..dbc171c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
@@ -1,8 +1,11 @@
package com.casic.missiles.modular.system.service;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 管控信息表 服务类
@@ -13,4 +16,6 @@
*/
public interface ICmdControlsInfoService extends IService {
+ List getWebList();
+
}
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 ef35e7e..532af34 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
import com.casic.missiles.modular.system.model.RealtimeWork;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,6 +11,7 @@
import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
*
@@ -37,5 +39,10 @@
List> statisticsByTime(CommonRequest commonRequest);
- List> statisticsByDept(@RequestBody @Valid CommonRequest commonRequest);
+ List> statisticsByDept(CommonRequest commonRequest);
+
+ List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest);
+
+ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 9d76787..0730ae5 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
import org.springframework.stereotype.Service;
@@ -39,4 +40,9 @@
return null;
}
+
+ @Override
+ public List getCountByTime(String begTime, String endTime) {
+ return this.baseMapper.getCountByTime(begTime,endTime);
+ }
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 8c9dd72..dd67189 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
@@ -1,8 +1,8 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.dto.TagResponse;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
import java.util.List;
@@ -18,9 +18,9 @@
//获取研判总数
List getCmdBodyInfoByTime(String begTime, String endTime);
-// //标签分类占比
+ //标签分类占比
List getCmdBodyInfoByTag(String begTime, String endTime);
-
-
+ //根据上报、下发时间统计信息数
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
index 75fffba..3fbdf3e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+
+import java.util.List;
/**
*
@@ -12,5 +15,5 @@
* @since 2023-06-15
*/
public interface ICmdBodyInstructService extends IService {
-
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
index 36abf4f..dbc171c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdControlsInfoService.java
@@ -1,8 +1,11 @@
package com.casic.missiles.modular.system.service;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
*
* 管控信息表 服务类
@@ -13,4 +16,6 @@
*/
public interface ICmdControlsInfoService extends IService {
+ List getWebList();
+
}
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 ef35e7e..532af34 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
import com.casic.missiles.modular.system.model.RealtimeWork;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,6 +11,7 @@
import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
*
@@ -37,5 +39,10 @@
List> statisticsByTime(CommonRequest commonRequest);
- List> statisticsByDept(@RequestBody @Valid CommonRequest commonRequest);
+ List> statisticsByDept(CommonRequest commonRequest);
+
+ List> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest);
+
+ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java
index 9d76787..0730ae5 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
import org.springframework.stereotype.Service;
@@ -39,4 +40,9 @@
return null;
}
+
+ @Override
+ public List getCountByTime(String begTime, String endTime) {
+ return this.baseMapper.getCountByTime(begTime,endTime);
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInstructServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInstructServiceImpl.java
index 7dd3bb5..6075ca5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInstructServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInstructServiceImpl.java
@@ -1,12 +1,15 @@
package com.casic.missiles.modular.system.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
-import com.casic.missiles.modular.system.dao.CmdBodyInstructMapper;
-import com.casic.missiles.modular.system.service.ICmdBodyInstructService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.CmdBodyInstructMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import com.casic.missiles.modular.system.service.ICmdBodyInstructService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 指令信息表 服务实现类
@@ -19,4 +22,8 @@
@DS("subdepot")
public class CmdBodyInstructServiceImpl extends ServiceImpl implements ICmdBodyInstructService {
+ @Override
+ public List getCountByTime(String begTime, String endTime) {
+ return this.baseMapper.getCountByTime(begTime,endTime);
+ }
}
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 9e9bbbc..f57768f 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,10 +1,15 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.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.IRealtimeWorkService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +21,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* 实时工作情况控制器
@@ -37,7 +43,7 @@
*/
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(@RequestBody RealtimeWork realtimeWork) {
+ public Object list(RealtimeWork realtimeWork) {
return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork));
}
@@ -56,8 +62,10 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(RealtimeWork realtimeWork) {
- return realtimeWorkService.add(realtimeWork);
+ public Object add(@RequestBody RealtimeWork realtimeWork) {
+ //删除所有,只保留最新数据
+ realtimeWorkService.remove(new QueryWrapper<>());
+ return ResponseData.success(realtimeWorkService.add(realtimeWork));
}
/**
@@ -79,9 +87,8 @@
}
-
/**
- * 上报下发时间分析接口
+ * 上报下发时间分析接口(旧)
*/
@RequestMapping(value = "/statisticsByTime")
@ResponseBody
@@ -90,7 +97,6 @@
}
-
/**
* 舆情数据区域汇总接口
*/
@@ -106,8 +112,11 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(RealtimeWork realtimeWork) {
- return realtimeWorkService.update(realtimeWork);
+ public Object update(@RequestBody @Valid RealtimeWork realtimeWork) {
+ Assert.isFalse(Objects.isNull(realtimeWork.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ResponseData.success(realtimeWorkService.update(realtimeWork));
}
/**
@@ -118,4 +127,24 @@
public Object detail(@RequestParam String realtimeWorkId) {
return ResponseData.success(realtimeWorkService.detail(realtimeWorkId));
}
+
+ /**
+ * 实时工作发布平台占比接口
+ */
+ @RequestMapping(value = "/statisticsByPlate")
+ @ResponseBody
+ public Object statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByPlate(businessReportInfoRequest));
+ }
+
+
+ /**
+ * 实时工作上报下发时间分析接口
+ */
+ @RequestMapping(value = "/statisticsByReport")
+ @ResponseBody
+ public Object statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest));
+ }
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
index 36582bd..0cce8b6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInfoMapper.java
@@ -1,11 +1,15 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +17,7 @@
*/
public interface CmdBodyInfoMapper extends BaseMapper {
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
index aca2c34..1c0b79c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyInstructMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -12,5 +16,6 @@
* @since 2023-06-15
*/
public interface CmdBodyInstructMapper extends BaseMapper {
-
+ List getCountByTime(@Param("begTime") String begTime,
+ @Param("endTime") String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
index d5e85a3..29ae738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdControlsInfoMapper.java
@@ -1,7 +1,11 @@
package com.casic.missiles.modular.system.dao;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
import com.casic.missiles.modular.system.model.CmdControlsInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.RealtimeWork;
+
+import java.util.List;
/**
*
@@ -13,4 +17,7 @@
*/
public interface CmdControlsInfoMapper extends BaseMapper {
+
+ List getWebList();
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 0ce8dbf..8f436c0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
@@ -4,46 +4,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- body_id AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+ body_id
+ AS bodyId, body_title AS bodyTitle, body_title_digest AS bodyTitleDigest, body_sn AS bodySn, body_nature AS bodyNature, body_content AS bodyContent, body_content_digest AS bodyContentDigest, body_state AS bodyState, state_child AS stateChild, body_language AS bodyLanguage, body_level AS bodyLevel, body_timelimit AS bodyTimelimit, body_phone AS bodyPhone, body_ident AS bodyIdent, preview_state AS previewState, copy_state AS copyState, itgmng_state AS itgmngState, spl_id AS splId, case_state AS caseState, submit_userid AS submitUserid, submit_user AS submitUser, submit_organcode AS submitOrgancode, submit_organ AS submitOrgan, submit_organ_digest AS submitOrganDigest, submit_time AS submitTime, flag_oversee AS flagOversee, emergency_state AS emergencyState, hand_time AS handTime, blue_state AS blueState, found_time AS foundTime, body_remark AS bodyRemark, send_back_reason AS sendBackReason, yq_handle AS yqHandle, reported_ZZQ AS reportedZzq, from_ZZQ AS fromZzq
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
index 83e75fd..5829a79 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInstructMapper.xml
@@ -4,25 +4,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- instruct_id AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+ instruct_id
+ AS instructId, body_id AS bodyId, instruct_organ AS instructOrgan, instruct_post AS instructPost, instruct_type AS instructType, instruct_opinion AS instructOpinion, instruct_state AS instructState, instruct_person AS instructPerson, instruct_time AS instructTime, instruct_ident AS instructIdent, instruct_cpt AS instructCpt, is_forward AS isForward, p_instruct_id AS pInstructId, forward_opinion AS forwardOpinion
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 893927c..ff64738 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -4,36 +4,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- controls_id AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+ controls_id
+ AS controlsId, body_id AS bodyId, controls_classify AS controlsClassify, controls_type AS controlsType, controls_web AS controlsWeb, controls_link AS controlsLink, controls_territory AS controlsTerritory, record_nation AS recordNation, controls_rank AS controlsRank, blue_state AS blueState, manage_suggest AS manageSuggest, create_time AS createTime, record_ip AS recordIp, controls_disposal AS controlsDisposal, controls_telnum AS controlsTelnum, controls_issuer AS controlsIssuer, controls_target AS controlsTarget, controls_letternum AS controlsLetternum, controls_picnum AS controlsPicnum, publish_time AS publishTime, found_duration AS foundDuration, tag_id AS tagId, harmful_tag_code AS harmfulTagCode, harmful_tag_name AS harmfulTagName, legal_base_tag AS legalBaseTag
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
new file mode 100644
index 0000000..c620ea2
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class CmdBodyCommonResponse {
+
+ //信息主键id
+ private String bodyId;
+
+ //发布平台
+ private String controlsWeb;
+
+ //时间
+ private String resultTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
index e500fc8..539abfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonRequest.java
@@ -13,11 +13,20 @@
@Data
public class CommonRequest {
- private String value;
private String time;
private String timeType;//按天:day,按小时:hour
private String name;
+
+ private String value;
+
+ public CommonRequest() {
+ }
+
+ public CommonRequest(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
}
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
new file mode 100644
index 0000000..0deab82
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictMapDTO {
+
+ //统计类别
+ public static Map firstHashMap = new HashMap();
+ static {
+ firstHashMap.put("sdzj", "2");
+ firstHashMap.put("sjmgsj", "6");
+ firstHashMap.put("cgxx", "7");
+ }
+
+ //涉党政军类
+ public static Map sdzjHashMap = new HashMap();
+ static {
+ sdzjHashMap.put("涉党信息", "2-1");
+ sdzjHashMap.put("涉政信息", "2-2");
+ sdzjHashMap.put("涉军信息", "2-3");
+ sdzjHashMap.put("其他相关", "2-4");
+ }
+ //涉疆敏感事件
+ public static Map sjmgMap = new HashMap();
+ static {
+ sjmgMap.put("涉疆案件", "6-1");
+ sjmgMap.put("涉疆事件", "6-2");
+ sjmgMap.put("其他相关", "6-3");
+ }
+ //常规信息
+ public static Map cgxxHashMap = new HashMap();
+ static {
+ cgxxHashMap.put("安全生产", "7-1");
+ cgxxHashMap.put("网络安全", "7-2");
+ cgxxHashMap.put("信息安全", "7-3");
+ cgxxHashMap.put("灾害类", "7-4");
+ cgxxHashMap.put("交通安全", "7-5");
+ cgxxHashMap.put("食品安全", "7-6");
+ cgxxHashMap.put("其他相关", "7-7");
+ }
+}
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 8c9dd72..dd67189 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
@@ -1,8 +1,8 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.dto.TagResponse;
-import com.casic.missiles.modular.system.model.CmdBodyInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInfo;
import java.util.List;
@@ -18,9 +18,9 @@
//获取研判总数
List getCmdBodyInfoByTime(String begTime, String endTime);
-// //标签分类占比
+ //标签分类占比
List getCmdBodyInfoByTag(String begTime, String endTime);
-
-
+ //根据上报、下发时间统计信息数
+ List getCountByTime(String begTime, String endTime);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
index 75fffba..3fbdf3e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInstructService.java
@@ -1,7 +1,10 @@
package com.casic.missiles.modular.system.service;
-import com.casic.missiles.modular.system.model.CmdBodyInstruct;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse;
+import com.casic.missiles.modular.system.model.CmdBodyInstruct;
+
+import java.util.List;
/**
*
@@ -12,5 +15,5 @@
* @since 2023-06-15
*/
public interface ICmdBodyInstructService extends IService