diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(businessReportInfoRequest)); + } } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} 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 dd67189..27c998c 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,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; @@ -22,5 +23,7 @@ List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 List getCountByTime(String begTime, String endTime); + //根据区域统计上报、下发数据 + List statisticsByArea(String begTime, String endTime); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} 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 dd67189..27c998c 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,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; @@ -22,5 +23,7 @@ List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 List getCountByTime(String begTime, String endTime); + //根据区域统计上报、下发数据 + List statisticsByArea(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java index b2223a5..b7f6a61 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java @@ -1,8 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 主体信息分类标签 服务类 @@ -12,5 +16,5 @@ * @since 2023-06-15 */ public interface ICmdBodyTagService extends IService { - + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} 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 dd67189..27c998c 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,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; @@ -22,5 +23,7 @@ List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 List getCountByTime(String begTime, String endTime); + //根据区域统计上报、下发数据 + List statisticsByArea(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java index b2223a5..b7f6a61 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java @@ -1,8 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 主体信息分类标签 服务类 @@ -12,5 +16,5 @@ * @since 2023-06-15 */ public interface ICmdBodyTagService extends IService { - + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); } 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 532af34..37ace11 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,8 +3,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.RealtimeWork; import org.springframework.web.bind.annotation.RequestBody; @@ -45,4 +47,8 @@ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest); + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); + + List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest); + } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} 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 dd67189..27c998c 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,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; @@ -22,5 +23,7 @@ List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 List getCountByTime(String begTime, String endTime); + //根据区域统计上报、下发数据 + List statisticsByArea(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java index b2223a5..b7f6a61 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java @@ -1,8 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 主体信息分类标签 服务类 @@ -12,5 +16,5 @@ * @since 2023-06-15 */ public interface ICmdBodyTagService extends IService { - + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); } 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 532af34..37ace11 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,8 +3,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.RealtimeWork; import org.springframework.web.bind.annotation.RequestBody; @@ -45,4 +47,8 @@ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest); + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); + + List statisticsByArea(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 0730ae5..eeba69c 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.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; @@ -45,4 +46,10 @@ public List getCountByTime(String begTime, String endTime) { return this.baseMapper.getCountByTime(begTime,endTime); } + + @Override + public List statisticsByArea(String begTime, String endTime) { + + return this.baseMapper.statisticsByArea(begTime,endTime); + } } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} 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 dd67189..27c998c 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,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; @@ -22,5 +23,7 @@ List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 List getCountByTime(String begTime, String endTime); + //根据区域统计上报、下发数据 + List statisticsByArea(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java index b2223a5..b7f6a61 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java @@ -1,8 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 主体信息分类标签 服务类 @@ -12,5 +16,5 @@ * @since 2023-06-15 */ public interface ICmdBodyTagService extends IService { - + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); } 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 532af34..37ace11 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,8 +3,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.RealtimeWork; import org.springframework.web.bind.annotation.RequestBody; @@ -45,4 +47,8 @@ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest); + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); + + List statisticsByArea(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 0730ae5..eeba69c 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.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; @@ -45,4 +46,10 @@ public List getCountByTime(String begTime, String endTime) { return this.baseMapper.getCountByTime(begTime,endTime); } + + @Override + public List statisticsByArea(String begTime, String endTime) { + + return this.baseMapper.statisticsByArea(begTime,endTime); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java index c5f5fa7..9581bea 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java @@ -1,12 +1,16 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.casic.missiles.modular.system.dao.CmdBodyTagMapper; import com.casic.missiles.modular.system.service.ICmdBodyTagService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 主体信息分类标签 服务实现类 @@ -19,4 +23,9 @@ @DS("subdepot") public class CmdBodyTagServiceImpl extends ServiceImpl implements ICmdBodyTagService { + @Override + public List statisticsByTag(BusinessReportInfoRequest request) { + return this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime()); + } + } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} 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 dd67189..27c998c 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,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; @@ -22,5 +23,7 @@ List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 List getCountByTime(String begTime, String endTime); + //根据区域统计上报、下发数据 + List statisticsByArea(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java index b2223a5..b7f6a61 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java @@ -1,8 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 主体信息分类标签 服务类 @@ -12,5 +16,5 @@ * @since 2023-06-15 */ public interface ICmdBodyTagService extends IService { - + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); } 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 532af34..37ace11 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,8 +3,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.RealtimeWork; import org.springframework.web.bind.annotation.RequestBody; @@ -45,4 +47,8 @@ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest); + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); + + List statisticsByArea(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 0730ae5..eeba69c 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.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; @@ -45,4 +46,10 @@ public List getCountByTime(String begTime, String endTime) { return this.baseMapper.getCountByTime(begTime,endTime); } + + @Override + public List statisticsByArea(String begTime, String endTime) { + + return this.baseMapper.statisticsByArea(begTime,endTime); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java index c5f5fa7..9581bea 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java @@ -1,12 +1,16 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.casic.missiles.modular.system.dao.CmdBodyTagMapper; import com.casic.missiles.modular.system.service.ICmdBodyTagService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 主体信息分类标签 服务实现类 @@ -19,4 +23,9 @@ @DS("subdepot") public class CmdBodyTagServiceImpl extends ServiceImpl implements ICmdBodyTagService { + @Override + public List statisticsByTag(BusinessReportInfoRequest request) { + return this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime()); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index fa9319b..17d8de5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -239,6 +239,8 @@ judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); } }); + //用于大屏回显 + judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); return judgmentResult; } @@ -301,6 +303,7 @@ Integer sum2 = judgmentResult.getTitle2List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); Integer sum3 = judgmentResult.getTitle3List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); judgmentResult.setJudgmentTotal(sum1 + sum2 + sum3); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); return judgmentResult; } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 979fde7..ce312ad 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-area-starter + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} 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 f57768f..5efddb3 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 @@ -147,4 +147,22 @@ return ResponseData.success(realtimeWorkService.statisticsByReport(businessReportInfoRequest)); } + + /** + * 内容标签分类统计接口 + */ + @RequestMapping(value = "/statisticsByTag") + @ResponseBody + public Object statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByTag(businessReportInfoRequest)); + } + + /** + * 区域汇总统计接口 + */ + @RequestMapping(value = "/statisticsByArea") + @ResponseBody + public Object statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + return ResponseData.success(realtimeWorkService.statisticsByArea(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 0cce8b6..19d35cd 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,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import org.apache.ibatis.annotations.Param; @@ -20,4 +21,9 @@ List getCountByTime(@Param("begTime") String begTime, @Param("endTime") String endTime); + + List statisticsByArea(@Param("begTime") String begTime, + @Param("endTime") String endTime); + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java index c77acb8..f58099e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyTagMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +17,6 @@ * @since 2023-06-15 */ public interface CmdBodyTagMapper extends BaseMapper { - + List statisticsByTag(@Param("begTime") String begTime, + @Param("endTime") String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java index 8d9d1f6..d06a1b3 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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 com.casic.missiles.modular.system.model.Summary; import org.apache.ibatis.annotations.Param; @@ -23,4 +25,5 @@ List statisticsByDept(); + } 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 8f436c0..e10c5c4 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 @@ -59,4 +59,24 @@ + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml index 40f084c..5fae90a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml @@ -15,4 +15,22 @@ tag_id AS tagId, tag_name AS tagName, tag_order AS tagOrder, hide + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml index b0a424d..bd74e02 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml @@ -22,9 +22,10 @@ - select * from business_summary + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java new file mode 100644 index 0000000..3ab6334 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AreaReportResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class AreaReportResponse { + + private String submitCode; + + private String submitOrgan; + + private String instructCode; + + private String instructOrgan; + +} 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 539abfa..869e215 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 @@ -2,9 +2,6 @@ import lombok.Data; -import javax.validation.constraints.NotNull; -import java.util.List; - /** * @Description: for batch use * @Author: zt diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java new file mode 100644 index 0000000..486b07d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CommonResponse.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: for batch use + * @Author: zt + * @Date: 2022/11/26 9:51 + */ +@Data +public class CommonResponse { + + + private String name; + + private String value; + + private String value1; + + public CommonResponse() { + } + + public CommonResponse(String name, String value, String value1) { + this.name = name; + this.value = value; + this.value1 = value1; + } +} 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 dd67189..27c998c 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,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; @@ -22,5 +23,7 @@ List getCmdBodyInfoByTag(String begTime, String endTime); //根据上报、下发时间统计信息数 List getCountByTime(String begTime, String endTime); + //根据区域统计上报、下发数据 + List statisticsByArea(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java index b2223a5..b7f6a61 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyTagService.java @@ -1,8 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 主体信息分类标签 服务类 @@ -12,5 +16,5 @@ * @since 2023-06-15 */ public interface ICmdBodyTagService extends IService { - + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); } 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 532af34..37ace11 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,8 +3,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.dto.AreaReportResponse; import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.CommonResponse; import com.casic.missiles.modular.system.model.RealtimeWork; import org.springframework.web.bind.annotation.RequestBody; @@ -45,4 +47,8 @@ Map statisticsByReport(BusinessReportInfoRequest businessReportInfoRequest); + List statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest); + + List statisticsByArea(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 0730ae5..eeba69c 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.AreaReportResponse; import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.casic.missiles.modular.system.service.ICmdBodyInfoService; @@ -45,4 +46,10 @@ public List getCountByTime(String begTime, String endTime) { return this.baseMapper.getCountByTime(begTime,endTime); } + + @Override + public List statisticsByArea(String begTime, String endTime) { + + return this.baseMapper.statisticsByArea(begTime,endTime); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java index c5f5fa7..9581bea 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java @@ -1,12 +1,16 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; +import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.model.CmdBodyTag; import com.casic.missiles.modular.system.dao.CmdBodyTagMapper; import com.casic.missiles.modular.system.service.ICmdBodyTagService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 主体信息分类标签 服务实现类 @@ -19,4 +23,9 @@ @DS("subdepot") public class CmdBodyTagServiceImpl extends ServiceImpl implements ICmdBodyTagService { + @Override + public List statisticsByTag(BusinessReportInfoRequest request) { + return this.baseMapper.statisticsByTag(request.getBeginTime(),request.getEndTime()); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index fa9319b..17d8de5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -239,6 +239,8 @@ judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); } }); + //用于大屏回显 + judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); return judgmentResult; } @@ -301,6 +303,7 @@ Integer sum2 = judgmentResult.getTitle2List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); Integer sum3 = judgmentResult.getTitle3List().stream().mapToInt(commonRequest -> Integer.valueOf(commonRequest.getValue())).sum(); judgmentResult.setJudgmentTotal(sum1 + sum2 + sum3); + judgmentResult.setStartTime(judgmentRequest.getBeginTime()+","+judgmentRequest.getEndTime()); return judgmentResult; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java index 1a6e246..e918948 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java @@ -12,9 +12,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.RealtimeWorkMapper; -import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest; -import com.casic.missiles.modular.system.dto.CmdBodyCommonResponse; -import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.*; @@ -54,6 +52,12 @@ @Resource private ICmdBodyInfoService iCmdBodyInfoService; + @Resource + private ICmdBodyTagService iCmdBodyTagService; + + @Resource + private IAreaService iAreaService; + @Override public Object realtimeWorkList(RealtimeWork realtimeWork) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -304,4 +308,31 @@ resultMap.put("xf", xfMapList); return resultMap; } + + @Override + public List statisticsByTag(BusinessReportInfoRequest request) { + return iCmdBodyTagService.statisticsByTag(request); + } + + @Override + public List statisticsByArea(BusinessReportInfoRequest businessReportInfoRequest) { + List resultList = new ArrayList<>(); + //toDo:若以区域编号匹配,前面加“B0” + List areaList = iAreaService.list(); + List responseList = iCmdBodyInfoService.statisticsByArea(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime()); + areaList.forEach(area -> { + CommonResponse commonResponse = new CommonResponse(area.getAreaName(), "0", "0"); + responseList.forEach(res -> { + if (area.getAreaName().equals(res.getSubmitOrgan())) { + commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + 1) + ""); + } + if (area.getAreaName().equals(res.getInstructOrgan())) { + commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + 1) + ""); + } + }); + resultList.add(commonResponse); + }); + resultList.sort(Comparator.comparing(CommonResponse::getValue).reversed()); + return resultList; + } }