diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }
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 b7f6a61..3f75025 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
@@ -16,5 +16,9 @@
  * @since 2023-06-15
  */
 public interface ICmdBodyTagService extends IService<CmdBodyTag> {
+
     List<CommonRequest> statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest);
+
+    List<CommonRequest> selectListTen(BusinessReportInfoRequest businessReportInfoRequest);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }
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 b7f6a61..3f75025 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
@@ -16,5 +16,9 @@
  * @since 2023-06-15
  */
 public interface ICmdBodyTagService extends IService<CmdBodyTag> {
+
     List<CommonRequest> statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest);
+
+    List<CommonRequest> selectListTen(BusinessReportInfoRequest businessReportInfoRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
index a5681cc..6f46ede 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
@@ -29,4 +29,6 @@
 
     List<Judgment> getList(JudgmentRequest judgmentRequest);
 
+    Map<String, Object>  addStatisticsByTime(Judgment judgment);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }
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 b7f6a61..3f75025 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
@@ -16,5 +16,9 @@
  * @since 2023-06-15
  */
 public interface ICmdBodyTagService extends IService<CmdBodyTag> {
+
     List<CommonRequest> statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest);
+
+    List<CommonRequest> selectListTen(BusinessReportInfoRequest businessReportInfoRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
index a5681cc..6f46ede 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
@@ -29,4 +29,6 @@
 
     List<Judgment> getList(JudgmentRequest judgmentRequest);
 
+    Map<String, Object>  addStatisticsByTime(Judgment judgment);
+
 }
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 5bbc644..25b0e02 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
@@ -2,12 +2,13 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.CmdBodyTagMapper;
 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;
@@ -34,8 +35,24 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
 
+    @Override
+    public List<CommonRequest> selectListTen(BusinessReportInfoRequest request) {
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTagTen(request.getBeginTime(), request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
+    }
+
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }
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 b7f6a61..3f75025 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
@@ -16,5 +16,9 @@
  * @since 2023-06-15
  */
 public interface ICmdBodyTagService extends IService<CmdBodyTag> {
+
     List<CommonRequest> statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest);
+
+    List<CommonRequest> selectListTen(BusinessReportInfoRequest businessReportInfoRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
index a5681cc..6f46ede 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
@@ -29,4 +29,6 @@
 
     List<Judgment> getList(JudgmentRequest judgmentRequest);
 
+    Map<String, Object>  addStatisticsByTime(Judgment judgment);
+
 }
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 5bbc644..25b0e02 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
@@ -2,12 +2,13 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.CmdBodyTagMapper;
 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;
@@ -34,8 +35,24 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
 
+    @Override
+    public List<CommonRequest> selectListTen(BusinessReportInfoRequest request) {
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTagTen(request.getBeginTime(), request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
+    }
+
+
 }
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 30dea56..c8fe2bf 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
@@ -16,15 +16,13 @@
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.model.Judgment;
-import com.casic.missiles.modular.system.service.IBusinessAccessService;
-import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
-import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
-import com.casic.missiles.modular.system.service.IJudgmentService;
+import com.casic.missiles.modular.system.service.*;
 import com.casic.missiles.modular.system.util.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -51,6 +49,9 @@
     @Autowired
     private ICmdBodyInfoService iCmdBodyInfoService;
 
+    @Autowired
+    private ICmdBodyTagService iCmdBodyTagService;
+
     @Override
     public List<HashMap<String, Object>> statisticsByTime() {
         List<Judgment> judgmentList = this.list();
@@ -81,15 +82,125 @@
         return hashMaps;
     }
 
+
+    public static boolean isInteger(String str) {
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(str).matches();
+    }
+
+
+    @Override
+    public Map<String, Object> addStatisticsByTime(Judgment judgment) {
+        Map<String, Object> hashMap = new HashMap<>();
+        List<Map<String, Object>> firstMapList = new ArrayList<>();
+        List<Map<String, Object>> secondMapList = new ArrayList<>();
+        List<Map<String, Object>> thirdMapList = new ArrayList<>();
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        List<CommonRequest> commonRequestList1 = judgment.getTitle1List();
+        List<CommonRequest> commonRequestList2 = judgment.getTitle2List();
+        List<CommonRequest> commonRequestList3 = judgment.getTitle3List();
+        for (int i = 0; i < commonRequestList1.size(); i++) {
+            String title1 = commonRequestList1.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title1)) {
+                firstTags.addAll(Arrays.asList(title1.split(",")));
+            }
+        }
+        for (int i = 0; i < commonRequestList2.size(); i++) {
+            String title2 = commonRequestList2.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title2))
+                secondTags.addAll(Arrays.asList(title2.split(",")));
+        }
+        for (int i = 0; i < commonRequestList3.size(); i++) {
+            String title3 = commonRequestList3.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title3))
+                thirdTags.addAll(Arrays.asList(title3.split(",")));
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6)),
+                judgment.getEndTime());
+
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6), DateUtil.parseDate(judgment.getEndTime()), DateField.DAY_OF_YEAR);
+        dateTimeList.forEach(dateTime -> {
+            Map<String, Object> firstMap = new HashMap<>();
+            Map<String, Object> secondMap = new HashMap<>();
+            Map<String, Object> thirdMap = new HashMap<>();
+            firstMap.put("name", DateUtil.formatDate(dateTime));
+            firstMap.put("value", 0);
+            secondMap.put("name", DateUtil.formatDate(dateTime));
+            secondMap.put("value", 0);
+            thirdMap.put("name", DateUtil.formatDate(dateTime));
+            thirdMap.put("value", 0);
+            tagResponseList.forEach(tagResponse -> {
+                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
+                    }
+                }
+            });
+            firstMapList.add(firstMap);
+            secondMapList.add(secondMap);
+            thirdMapList.add(thirdMap);
+        });
+        hashMap.put("zdzj", firstMapList);
+        hashMap.put("sjmg", secondMapList);
+        hashMap.put("cgxx", thirdMapList);
+        return hashMap;
+    }
+
     public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
         List<Map<String, Object>> firstMapList = new ArrayList<>();
         List<Map<String, Object>> secondMapList = new ArrayList<>();
         List<Map<String, Object>> thirdMapList = new ArrayList<>();
         List<Map<String, Object>> dpMapList = new ArrayList<>();
-        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+        Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        if (null != judgment) {
+            JSONArray jsonArray1 = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
+            JSONArray jsonArray2 = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
+            JSONArray jsonArray3 = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
+            for (int i = 0; i < jsonArray1.size(); i++) {
+                String title1 = ((JSONObject) jsonArray1.get(i)).getString("time");
+                if (ObjectUtil.isNotEmpty(title1)) {
+                    firstTags.addAll(Arrays.asList(title1.split(",")));
+                }else {
+                    firstTags.add(((JSONObject) jsonArray1.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray2.size(); i++) {
+                String title2 = ((JSONObject) jsonArray2.get(i)).getString("time");
+                if(ObjectUtil.isNotEmpty(title2)){
+                    secondTags.addAll(Arrays.asList(title2.split(",")));
+                }else {
+                    secondTags.add(((JSONObject) jsonArray2.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray3.size(); i++) {
+                String title3 = ((JSONObject) jsonArray3.get(i)).getString("name");
+                if(ObjectUtil.isNotEmpty(title3)){
+                    thirdTags.addAll(Arrays.asList(title3.split(",")));
+                }else {
+                    thirdTags.add(((JSONObject) jsonArray3.get(i)).getString("name"));
+                }
+            }
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6)),
+                judgmentRequest.getEndTime());
 
-        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6), DateUtil.parseDate(judgmentRequest.getEndTime()), DateField.DAY_OF_YEAR);
         dateTimeList.forEach(dateTime -> {
             Map<String, Object> firstMap = new HashMap<>();
             Map<String, Object> secondMap = new HashMap<>();
@@ -104,12 +215,15 @@
             thirdMap.put("value", 0);
             tagResponseList.forEach(tagResponse -> {
                 if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
                     }
                 }
             });
@@ -129,68 +243,6 @@
         return hashMap;
     }
 
-
-//    public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
-//
-//        Judgment judgment = this.getById(judgmentRequest.getSecondId());
-//        //涉党政军
-//        if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) {
-//            JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult());
-//            List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//            list.forEach(commonRequest -> {
-//                CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue());
-//                dpList.add(commonResponse);
-//            });
-//        }
-//
-//
-//        Map<String, Object> hashMap = new HashMap<>();
-//        List<Map<String, Object>> firstMapList = new ArrayList<>();
-//        List<Map<String, Object>> secondMapList = new ArrayList<>();
-//        List<Map<String, Object>> thirdMapList = new ArrayList<>();
-//        List<Map<String, Object>> dpMapList = new ArrayList<>();
-//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
-//
-//        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
-//        dateTimeList.forEach(dateTime -> {
-//            Map<String, Object> firstMap = new HashMap<>();
-//            Map<String, Object> secondMap = new HashMap<>();
-//            Map<String, Object> thirdMap = new HashMap<>();
-//            Map<String, Object> dpMap = new HashMap<>();
-//            dpMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("value", 0);
-//            secondMap.put("name", DateUtil.formatDate(dateTime));
-//            secondMap.put("value", 0);
-//            thirdMap.put("name", DateUtil.formatDate(dateTime));
-//            thirdMap.put("value", 0);
-//            tagResponseList.forEach(tagResponse -> {
-//                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-//                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-//                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-//                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-//                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
-//                    }
-//                }
-//            });
-//            dpMap.put("value", firstMap.get("value"));
-//            dpMap.put("value1", secondMap.get("value"));
-//            dpMap.put("value2", thirdMap.get("value"));
-//            firstMapList.add(firstMap);
-//            secondMapList.add(secondMap);
-//            thirdMapList.add(thirdMap);
-//            dpMapList.add(dpMap);
-//        });
-//        //修改封装数据结构
-//        hashMap.put("zdzj", firstMapList);
-//        hashMap.put("sjmg", secondMapList);
-//        hashMap.put("cgxx", thirdMapList);
-//        hashMap.put("dp", dpMapList);
-//        return hashMap;
-//    }
-
     //根据录入历史数据统计(暂留)
     public Map<String, Object> getDataByLocal1(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
@@ -333,11 +385,11 @@
 
     @Override
     public Map<String, Object> statisticsByDateTime(JudgmentRequest judgmentRequest) {
-        return iBusinessAccessService.getAccessStatus("2-sj")&&
-                (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ?
-                getDataByLocal(judgmentRequest):
+        return iBusinessAccessService.getAccessStatus("2-sj") &&
+                (ToolUtils.pageArr[1] == judgmentRequest.getPage()) &&
+                (!(judgmentRequest.getIsReal() != null && judgmentRequest.getIsReal())) ?
+                getDataByLocal(judgmentRequest) :
                 getDataByOther(judgmentRequest);
-
     }
 
     public List<CommonRequest> processUtil(List<CommonRequest> list1, List<CommonRequest> list2) {
@@ -356,50 +408,12 @@
         return list2;
     }
 
-//    public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
-//        QueryWrapper<Judgment> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime());
-//        queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime());
-//        List<Judgment> judgmentList = this.list(queryWrapper);
-//        Judgment judgmentResult = new Judgment();
-//        judgmentList.forEach(judgment -> {
-//            judgmentResult.setDescription(judgment.getDescription());
-//            judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal());
-//            if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list);
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list);
-//
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list);
-//            }
-//
-//            if (ObjectUtil.isNotEmpty(judgment.getDescription())) {
-//                JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription());
-//                judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class));
-//            }
-//        });
-//        //用于大屏回显
-//        judgmentResult.setStartTime(judgmentRequest.getBeginTime());
-//        judgmentResult.setEndTime(judgmentRequest.getEndTime());
-//        return judgmentResult;
-//    }
-
-
     public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
 
         Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
 
-        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())?
-                judgment.getJudgmentTotal(): iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
+        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1] == judgmentRequest.getPage()) ?
+                judgment.getJudgmentTotal() : iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
         if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
             judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class));
@@ -595,6 +609,7 @@
                 Map<String, Object> apiMap = new HashMap<>();
                 apiMap.put("value", it.getValue());
                 apiMap.put("name", it.getName());
+                apiMap.put("time", it.getTime());
                 return apiMap;
             }).collect(Collectors.toList());
         }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }
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 b7f6a61..3f75025 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
@@ -16,5 +16,9 @@
  * @since 2023-06-15
  */
 public interface ICmdBodyTagService extends IService<CmdBodyTag> {
+
     List<CommonRequest> statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest);
+
+    List<CommonRequest> selectListTen(BusinessReportInfoRequest businessReportInfoRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
index a5681cc..6f46ede 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
@@ -29,4 +29,6 @@
 
     List<Judgment> getList(JudgmentRequest judgmentRequest);
 
+    Map<String, Object>  addStatisticsByTime(Judgment judgment);
+
 }
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 5bbc644..25b0e02 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
@@ -2,12 +2,13 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.CmdBodyTagMapper;
 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;
@@ -34,8 +35,24 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
 
+    @Override
+    public List<CommonRequest> selectListTen(BusinessReportInfoRequest request) {
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTagTen(request.getBeginTime(), request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
+    }
+
+
 }
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 30dea56..c8fe2bf 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
@@ -16,15 +16,13 @@
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.model.Judgment;
-import com.casic.missiles.modular.system.service.IBusinessAccessService;
-import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
-import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
-import com.casic.missiles.modular.system.service.IJudgmentService;
+import com.casic.missiles.modular.system.service.*;
 import com.casic.missiles.modular.system.util.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -51,6 +49,9 @@
     @Autowired
     private ICmdBodyInfoService iCmdBodyInfoService;
 
+    @Autowired
+    private ICmdBodyTagService iCmdBodyTagService;
+
     @Override
     public List<HashMap<String, Object>> statisticsByTime() {
         List<Judgment> judgmentList = this.list();
@@ -81,15 +82,125 @@
         return hashMaps;
     }
 
+
+    public static boolean isInteger(String str) {
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(str).matches();
+    }
+
+
+    @Override
+    public Map<String, Object> addStatisticsByTime(Judgment judgment) {
+        Map<String, Object> hashMap = new HashMap<>();
+        List<Map<String, Object>> firstMapList = new ArrayList<>();
+        List<Map<String, Object>> secondMapList = new ArrayList<>();
+        List<Map<String, Object>> thirdMapList = new ArrayList<>();
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        List<CommonRequest> commonRequestList1 = judgment.getTitle1List();
+        List<CommonRequest> commonRequestList2 = judgment.getTitle2List();
+        List<CommonRequest> commonRequestList3 = judgment.getTitle3List();
+        for (int i = 0; i < commonRequestList1.size(); i++) {
+            String title1 = commonRequestList1.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title1)) {
+                firstTags.addAll(Arrays.asList(title1.split(",")));
+            }
+        }
+        for (int i = 0; i < commonRequestList2.size(); i++) {
+            String title2 = commonRequestList2.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title2))
+                secondTags.addAll(Arrays.asList(title2.split(",")));
+        }
+        for (int i = 0; i < commonRequestList3.size(); i++) {
+            String title3 = commonRequestList3.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title3))
+                thirdTags.addAll(Arrays.asList(title3.split(",")));
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6)),
+                judgment.getEndTime());
+
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6), DateUtil.parseDate(judgment.getEndTime()), DateField.DAY_OF_YEAR);
+        dateTimeList.forEach(dateTime -> {
+            Map<String, Object> firstMap = new HashMap<>();
+            Map<String, Object> secondMap = new HashMap<>();
+            Map<String, Object> thirdMap = new HashMap<>();
+            firstMap.put("name", DateUtil.formatDate(dateTime));
+            firstMap.put("value", 0);
+            secondMap.put("name", DateUtil.formatDate(dateTime));
+            secondMap.put("value", 0);
+            thirdMap.put("name", DateUtil.formatDate(dateTime));
+            thirdMap.put("value", 0);
+            tagResponseList.forEach(tagResponse -> {
+                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
+                    }
+                }
+            });
+            firstMapList.add(firstMap);
+            secondMapList.add(secondMap);
+            thirdMapList.add(thirdMap);
+        });
+        hashMap.put("zdzj", firstMapList);
+        hashMap.put("sjmg", secondMapList);
+        hashMap.put("cgxx", thirdMapList);
+        return hashMap;
+    }
+
     public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
         List<Map<String, Object>> firstMapList = new ArrayList<>();
         List<Map<String, Object>> secondMapList = new ArrayList<>();
         List<Map<String, Object>> thirdMapList = new ArrayList<>();
         List<Map<String, Object>> dpMapList = new ArrayList<>();
-        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+        Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        if (null != judgment) {
+            JSONArray jsonArray1 = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
+            JSONArray jsonArray2 = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
+            JSONArray jsonArray3 = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
+            for (int i = 0; i < jsonArray1.size(); i++) {
+                String title1 = ((JSONObject) jsonArray1.get(i)).getString("time");
+                if (ObjectUtil.isNotEmpty(title1)) {
+                    firstTags.addAll(Arrays.asList(title1.split(",")));
+                }else {
+                    firstTags.add(((JSONObject) jsonArray1.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray2.size(); i++) {
+                String title2 = ((JSONObject) jsonArray2.get(i)).getString("time");
+                if(ObjectUtil.isNotEmpty(title2)){
+                    secondTags.addAll(Arrays.asList(title2.split(",")));
+                }else {
+                    secondTags.add(((JSONObject) jsonArray2.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray3.size(); i++) {
+                String title3 = ((JSONObject) jsonArray3.get(i)).getString("name");
+                if(ObjectUtil.isNotEmpty(title3)){
+                    thirdTags.addAll(Arrays.asList(title3.split(",")));
+                }else {
+                    thirdTags.add(((JSONObject) jsonArray3.get(i)).getString("name"));
+                }
+            }
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6)),
+                judgmentRequest.getEndTime());
 
-        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6), DateUtil.parseDate(judgmentRequest.getEndTime()), DateField.DAY_OF_YEAR);
         dateTimeList.forEach(dateTime -> {
             Map<String, Object> firstMap = new HashMap<>();
             Map<String, Object> secondMap = new HashMap<>();
@@ -104,12 +215,15 @@
             thirdMap.put("value", 0);
             tagResponseList.forEach(tagResponse -> {
                 if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
                     }
                 }
             });
@@ -129,68 +243,6 @@
         return hashMap;
     }
 
-
-//    public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
-//
-//        Judgment judgment = this.getById(judgmentRequest.getSecondId());
-//        //涉党政军
-//        if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) {
-//            JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult());
-//            List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//            list.forEach(commonRequest -> {
-//                CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue());
-//                dpList.add(commonResponse);
-//            });
-//        }
-//
-//
-//        Map<String, Object> hashMap = new HashMap<>();
-//        List<Map<String, Object>> firstMapList = new ArrayList<>();
-//        List<Map<String, Object>> secondMapList = new ArrayList<>();
-//        List<Map<String, Object>> thirdMapList = new ArrayList<>();
-//        List<Map<String, Object>> dpMapList = new ArrayList<>();
-//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
-//
-//        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
-//        dateTimeList.forEach(dateTime -> {
-//            Map<String, Object> firstMap = new HashMap<>();
-//            Map<String, Object> secondMap = new HashMap<>();
-//            Map<String, Object> thirdMap = new HashMap<>();
-//            Map<String, Object> dpMap = new HashMap<>();
-//            dpMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("value", 0);
-//            secondMap.put("name", DateUtil.formatDate(dateTime));
-//            secondMap.put("value", 0);
-//            thirdMap.put("name", DateUtil.formatDate(dateTime));
-//            thirdMap.put("value", 0);
-//            tagResponseList.forEach(tagResponse -> {
-//                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-//                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-//                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-//                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-//                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
-//                    }
-//                }
-//            });
-//            dpMap.put("value", firstMap.get("value"));
-//            dpMap.put("value1", secondMap.get("value"));
-//            dpMap.put("value2", thirdMap.get("value"));
-//            firstMapList.add(firstMap);
-//            secondMapList.add(secondMap);
-//            thirdMapList.add(thirdMap);
-//            dpMapList.add(dpMap);
-//        });
-//        //修改封装数据结构
-//        hashMap.put("zdzj", firstMapList);
-//        hashMap.put("sjmg", secondMapList);
-//        hashMap.put("cgxx", thirdMapList);
-//        hashMap.put("dp", dpMapList);
-//        return hashMap;
-//    }
-
     //根据录入历史数据统计(暂留)
     public Map<String, Object> getDataByLocal1(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
@@ -333,11 +385,11 @@
 
     @Override
     public Map<String, Object> statisticsByDateTime(JudgmentRequest judgmentRequest) {
-        return iBusinessAccessService.getAccessStatus("2-sj")&&
-                (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ?
-                getDataByLocal(judgmentRequest):
+        return iBusinessAccessService.getAccessStatus("2-sj") &&
+                (ToolUtils.pageArr[1] == judgmentRequest.getPage()) &&
+                (!(judgmentRequest.getIsReal() != null && judgmentRequest.getIsReal())) ?
+                getDataByLocal(judgmentRequest) :
                 getDataByOther(judgmentRequest);
-
     }
 
     public List<CommonRequest> processUtil(List<CommonRequest> list1, List<CommonRequest> list2) {
@@ -356,50 +408,12 @@
         return list2;
     }
 
-//    public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
-//        QueryWrapper<Judgment> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime());
-//        queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime());
-//        List<Judgment> judgmentList = this.list(queryWrapper);
-//        Judgment judgmentResult = new Judgment();
-//        judgmentList.forEach(judgment -> {
-//            judgmentResult.setDescription(judgment.getDescription());
-//            judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal());
-//            if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list);
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list);
-//
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list);
-//            }
-//
-//            if (ObjectUtil.isNotEmpty(judgment.getDescription())) {
-//                JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription());
-//                judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class));
-//            }
-//        });
-//        //用于大屏回显
-//        judgmentResult.setStartTime(judgmentRequest.getBeginTime());
-//        judgmentResult.setEndTime(judgmentRequest.getEndTime());
-//        return judgmentResult;
-//    }
-
-
     public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
 
         Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
 
-        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())?
-                judgment.getJudgmentTotal(): iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
+        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1] == judgmentRequest.getPage()) ?
+                judgment.getJudgmentTotal() : iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
         if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
             judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class));
@@ -595,6 +609,7 @@
                 Map<String, Object> apiMap = new HashMap<>();
                 apiMap.put("value", it.getValue());
                 apiMap.put("name", it.getName());
+                apiMap.put("time", it.getTime());
                 return apiMap;
             }).collect(Collectors.toList());
         }
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 5416b7d..3293c93 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
@@ -95,6 +95,12 @@
                 JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getPlateResult());
                 obj.setPlateResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class));
             }
+            if (StringUtils.isNotEmpty(obj.getStartTime())) {
+                obj.setStartTime(DateUtil.formatDateTime(DateUtil.parseDateTime(obj.getStartTime())));
+            }
+            if (StringUtils.isNotEmpty(obj.getEndTime())) {
+                obj.setEndTime(DateUtil.formatDateTime(DateUtil.parseDateTime(obj.getEndTime())));
+            }
         });
         return realtimeWorkList;
     }
@@ -143,8 +149,16 @@
 
 
     public RealtimeWork getListByLocalResult(Long id) {
-
-        return this.getById(id);
+        RealtimeWork realtimeWork = this.getById(id);
+        if(null!=realtimeWork){
+            if(ObjectUtil.isNotEmpty(realtimeWork.getStartTime())){
+                realtimeWork.setStartTime(DateUtil.formatDateTime(DateUtil.parseDateTime(realtimeWork.getStartTime())));
+            }
+            if(ObjectUtil.isNotEmpty(realtimeWork.getEndTime())){
+                realtimeWork.setEndTime(DateUtil.formatDateTime(DateUtil.parseDateTime(realtimeWork.getEndTime())));
+            }
+        }
+        return realtimeWork;
     }
 
     public RealtimeWork getListByOtherResult(BusinessReportInfoRequest businessReportInfoRequest) {
@@ -171,14 +185,11 @@
 
                 if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) {
                     sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
+                } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) {
+                    feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
                 }
-//                else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) {
-//                    feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
-//                }
             }
         }
-        feedbackCount = iCmdBodyInfoService.getFeedCount(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
-
 
         return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount);
 
@@ -187,11 +198,11 @@
     @Override
     public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) {
 
-        businessReportInfoRequest.setEndTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime());
-        businessReportInfoRequest.setBeginTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime());
+//        businessReportInfoRequest.setEndTime(ObjectUtil.isNotEmpty(businessReportInfoRequest.getIsReal()) && businessReportInfoRequest.getIsReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime());
+//        businessReportInfoRequest.setBeginTime(ObjectUtil.isNotEmpty(businessReportInfoRequest.getIsReal()) && businessReportInfoRequest.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-lc") &&
                 (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
-                && (!businessReportInfoRequest.isReal()) ?
+                && (!businessReportInfoRequest.getIsReal()) ?
                 getListByLocalResult(businessReportInfoRequest.getThirdId()) :
                 getListByOtherResult(businessReportInfoRequest);
     }
@@ -361,14 +372,28 @@
             resultMap.put("name", dict.getName());
             resultMap.put("value", 0);
             list.forEach(cmdBodyCommonResponse -> {
-                if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) {
+                if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode() + "_") == 0) {
                     resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
                             StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
                             Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
+                    cmdBodyCommonResponse.setWebFlag(true);
                 }
             });
             resultMapList.add(resultMap);
         });
+        //没有找到平台类型的，直接存在其他平台里
+        HashMap<String, Object> resultMap = new HashMap<>();
+        resultMap.put("name", "其他平台");
+        resultMap.put("value", 0);
+        list.forEach(cmdBodyCommonResponse -> {
+            if (!cmdBodyCommonResponse.isWebFlag()) {
+                resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
+                        StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
+                        Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
+            }
+        });
+        resultMapList.add(resultMap);
+        resultMapList.removeIf(objMap->Long.valueOf(objMap.get("value").toString()).intValue()==0);
         return resultMapList;
     }
 
@@ -383,18 +408,17 @@
     //从第三方获取上报记录
     public Map<String, Object> statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) {
         Map<String, Object> resultMap = new HashMap<>();
-        //获取上报信息
-//        List<CmdBodyCommonResponse> sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
 
-        List<CmdBodyCommonResponse> sbList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
-        //获取下发信息
-//        List<CmdBodyCommonResponse> xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
-
-        List<CmdBodyCommonResponse> xfList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.xfArr[0]);
-
+        List<CmdBodyCommonResponse> totalList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
+        List<CmdBodyCommonResponse> sbList = totalList.stream().filter(obj-> Objects.equals(obj.getBodyId(), "1")).collect(Collectors.toList());
+        List<CmdBodyCommonResponse> xfList = totalList.stream().filter(obj-> Objects.equals(obj.getBodyId(), "7")).collect(Collectors.toList());
         List<Map<String, Object>> dpMapList = new ArrayList<>();
         List<Map<String, Object>> sbMapList = new ArrayList<>();
-        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -12), new Date(), DateField.HOUR_OF_DAY);
+//        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -11), new Date(), DateField.HOUR_OF_DAY);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.parseDateTime(businessReportInfoRequest.getBeginTime()),DateUtil.parseDateTime(businessReportInfoRequest.getEndTime()) , DateField.HOUR_OF_DAY);
+        if(dateTimeList!=null&&dateTimeList.size()>0){
+            dateTimeList.remove(dateTimeList.size()-1);
+        }
         dateTimeList.forEach(dateTime -> {
             Map<String, Object> sbMap = new HashMap<>();
             Map<String, Object> dpMap = new HashMap<>();
@@ -403,7 +427,8 @@
             sbMap.put("value", 0);
             sbList.forEach(sb -> {
                 if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()) : 0));
+                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "").intValue() + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()).intValue() : 0));
+                    sb.setWebFlag(true);
                 }
             });
             dpMap.put("value", sbMap.get("value"));
@@ -418,7 +443,7 @@
             xfMap.put("value", 0);
             xfList.forEach(xf -> {
                 if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()) : 0));
+                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "").intValue() + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()).intValue() : 0));
                 }
             });
             xfMapList.add(xfMap);
@@ -484,11 +509,11 @@
 
     @Override
     public Map<String, Object> statisticsByReport(BusinessReportInfoRequest request) {
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-sj") &&
-                (ToolUtils.pageArr[2] == request.getPage())&&
-                (!request.isReal()) ?
+                (ToolUtils.pageArr[2] == request.getPage()) &&
+                (!(request.getIsReal() != null && request.getIsReal())) ?
                 statisticsByLocalReport(request.getThirdId()) :
                 statisticsByOtherReport(request);
     }
@@ -521,11 +546,11 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-bq") &&
                 (ToolUtils.pageArr[2] == request.getPage()) &&
-                (!request.isReal()) ?
+                (!(request.getIsReal() != null && request.getIsReal())) ?
                 statisticsByLocalTag(request) :
                 statisticsByOtherTag(request);
     }
@@ -536,10 +561,10 @@
         if (ObjectUtil.isNotEmpty(orgCode)) {
             if (orgCode.indexOf("B0") > -1) {
                 orgCode = orgCode.replace("B0", "");
-            } else {
+            } else if (orgCode.indexOf("B") > -1) {
                 orgCode = orgCode.substring(1, orgCode.length());
                 if (orgCode.indexOf("10") == 0) {
-                    orgCode.replaceFirst("10", "20");
+                    orgCode = orgCode.replaceFirst("10", "20");
                 }
             }
         }
@@ -565,6 +590,8 @@
     public List<CommonResponse> statisticsByOtherArea(BusinessReportInfoRequest businessReportInfoRequest) {
         List<CommonResponse> resultList = new ArrayList<>();
         List<Area> areaList = iAreaService.list();
+        //特殊需求，去掉石河子
+        areaList.removeIf((Area area) -> "石河子".equals(area.getAreaName()));
         List<Area> areaList1 = new ArrayList<>();
 
         areaList.forEach(area -> {
@@ -579,15 +606,14 @@
             CommonResponse commonResponse = new CommonResponse(area.getAreaName(), "0", "0");
             responseSbList.forEach(res -> {
                 String submitCode = processUtil(res.getSubmitCode());
-                if (area.getId().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
-                    commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + (ObjectUtil.isNotEmpty(res.getLinks()) && StringUtils.isNumeric(res.getLinks()) ? Long.valueOf(res.getLinks()) : 0)) + "");
+                if (area.getId().toString().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
+                    commonResponse.setValue((Double.valueOf(commonResponse.getValue()).intValue() + (ObjectUtil.isNotEmpty(res.getLinks()) ? Double.valueOf(res.getLinks()).intValue() : 0)) + "");
                 }
-
             });
             responseXfList.forEach(res1 -> {
                 String instructCode = processUtil(res1.getInstructCode());
-                if (area.getId().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
-                    commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + (ObjectUtil.isNotEmpty(res1.getLinks()) && StringUtils.isNumeric(res1.getLinks()) ? Long.valueOf(res1.getLinks()) : 0)) + "");
+                if (area.getId().toString().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
+                    commonResponse.setValue1((Double.valueOf(commonResponse.getValue1()).intValue() + (ObjectUtil.isNotEmpty(res1.getLinks()) ? Double.valueOf(res1.getLinks()).intValue() : 0)) + "");
                 }
             });
             resultList.add(commonResponse);
@@ -610,12 +636,12 @@
     @Override
     public List<CommonResponse> statisticsByArea(BusinessReportInfoRequest request) {
 
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return request.isFlag() ? clickData(request) :
                 (iBusinessAccessService.getAccessStatus("3-qy") &&
                         (ToolUtils.pageArr[2] == request.getPage()) &&
-                        (!request.isReal())?
+                        (!(request.getIsReal() != null && request.getIsReal())) ?
                         statisticsByLocalArea(request.getThirdId()) :
                         statisticsByOtherArea(request));
     }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }
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 b7f6a61..3f75025 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
@@ -16,5 +16,9 @@
  * @since 2023-06-15
  */
 public interface ICmdBodyTagService extends IService<CmdBodyTag> {
+
     List<CommonRequest> statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest);
+
+    List<CommonRequest> selectListTen(BusinessReportInfoRequest businessReportInfoRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
index a5681cc..6f46ede 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
@@ -29,4 +29,6 @@
 
     List<Judgment> getList(JudgmentRequest judgmentRequest);
 
+    Map<String, Object>  addStatisticsByTime(Judgment judgment);
+
 }
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 5bbc644..25b0e02 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
@@ -2,12 +2,13 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.CmdBodyTagMapper;
 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;
@@ -34,8 +35,24 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
 
+    @Override
+    public List<CommonRequest> selectListTen(BusinessReportInfoRequest request) {
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTagTen(request.getBeginTime(), request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
+    }
+
+
 }
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 30dea56..c8fe2bf 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
@@ -16,15 +16,13 @@
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.model.Judgment;
-import com.casic.missiles.modular.system.service.IBusinessAccessService;
-import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
-import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
-import com.casic.missiles.modular.system.service.IJudgmentService;
+import com.casic.missiles.modular.system.service.*;
 import com.casic.missiles.modular.system.util.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -51,6 +49,9 @@
     @Autowired
     private ICmdBodyInfoService iCmdBodyInfoService;
 
+    @Autowired
+    private ICmdBodyTagService iCmdBodyTagService;
+
     @Override
     public List<HashMap<String, Object>> statisticsByTime() {
         List<Judgment> judgmentList = this.list();
@@ -81,15 +82,125 @@
         return hashMaps;
     }
 
+
+    public static boolean isInteger(String str) {
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(str).matches();
+    }
+
+
+    @Override
+    public Map<String, Object> addStatisticsByTime(Judgment judgment) {
+        Map<String, Object> hashMap = new HashMap<>();
+        List<Map<String, Object>> firstMapList = new ArrayList<>();
+        List<Map<String, Object>> secondMapList = new ArrayList<>();
+        List<Map<String, Object>> thirdMapList = new ArrayList<>();
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        List<CommonRequest> commonRequestList1 = judgment.getTitle1List();
+        List<CommonRequest> commonRequestList2 = judgment.getTitle2List();
+        List<CommonRequest> commonRequestList3 = judgment.getTitle3List();
+        for (int i = 0; i < commonRequestList1.size(); i++) {
+            String title1 = commonRequestList1.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title1)) {
+                firstTags.addAll(Arrays.asList(title1.split(",")));
+            }
+        }
+        for (int i = 0; i < commonRequestList2.size(); i++) {
+            String title2 = commonRequestList2.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title2))
+                secondTags.addAll(Arrays.asList(title2.split(",")));
+        }
+        for (int i = 0; i < commonRequestList3.size(); i++) {
+            String title3 = commonRequestList3.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title3))
+                thirdTags.addAll(Arrays.asList(title3.split(",")));
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6)),
+                judgment.getEndTime());
+
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6), DateUtil.parseDate(judgment.getEndTime()), DateField.DAY_OF_YEAR);
+        dateTimeList.forEach(dateTime -> {
+            Map<String, Object> firstMap = new HashMap<>();
+            Map<String, Object> secondMap = new HashMap<>();
+            Map<String, Object> thirdMap = new HashMap<>();
+            firstMap.put("name", DateUtil.formatDate(dateTime));
+            firstMap.put("value", 0);
+            secondMap.put("name", DateUtil.formatDate(dateTime));
+            secondMap.put("value", 0);
+            thirdMap.put("name", DateUtil.formatDate(dateTime));
+            thirdMap.put("value", 0);
+            tagResponseList.forEach(tagResponse -> {
+                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
+                    }
+                }
+            });
+            firstMapList.add(firstMap);
+            secondMapList.add(secondMap);
+            thirdMapList.add(thirdMap);
+        });
+        hashMap.put("zdzj", firstMapList);
+        hashMap.put("sjmg", secondMapList);
+        hashMap.put("cgxx", thirdMapList);
+        return hashMap;
+    }
+
     public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
         List<Map<String, Object>> firstMapList = new ArrayList<>();
         List<Map<String, Object>> secondMapList = new ArrayList<>();
         List<Map<String, Object>> thirdMapList = new ArrayList<>();
         List<Map<String, Object>> dpMapList = new ArrayList<>();
-        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+        Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        if (null != judgment) {
+            JSONArray jsonArray1 = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
+            JSONArray jsonArray2 = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
+            JSONArray jsonArray3 = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
+            for (int i = 0; i < jsonArray1.size(); i++) {
+                String title1 = ((JSONObject) jsonArray1.get(i)).getString("time");
+                if (ObjectUtil.isNotEmpty(title1)) {
+                    firstTags.addAll(Arrays.asList(title1.split(",")));
+                }else {
+                    firstTags.add(((JSONObject) jsonArray1.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray2.size(); i++) {
+                String title2 = ((JSONObject) jsonArray2.get(i)).getString("time");
+                if(ObjectUtil.isNotEmpty(title2)){
+                    secondTags.addAll(Arrays.asList(title2.split(",")));
+                }else {
+                    secondTags.add(((JSONObject) jsonArray2.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray3.size(); i++) {
+                String title3 = ((JSONObject) jsonArray3.get(i)).getString("name");
+                if(ObjectUtil.isNotEmpty(title3)){
+                    thirdTags.addAll(Arrays.asList(title3.split(",")));
+                }else {
+                    thirdTags.add(((JSONObject) jsonArray3.get(i)).getString("name"));
+                }
+            }
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6)),
+                judgmentRequest.getEndTime());
 
-        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6), DateUtil.parseDate(judgmentRequest.getEndTime()), DateField.DAY_OF_YEAR);
         dateTimeList.forEach(dateTime -> {
             Map<String, Object> firstMap = new HashMap<>();
             Map<String, Object> secondMap = new HashMap<>();
@@ -104,12 +215,15 @@
             thirdMap.put("value", 0);
             tagResponseList.forEach(tagResponse -> {
                 if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
                     }
                 }
             });
@@ -129,68 +243,6 @@
         return hashMap;
     }
 
-
-//    public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
-//
-//        Judgment judgment = this.getById(judgmentRequest.getSecondId());
-//        //涉党政军
-//        if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) {
-//            JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult());
-//            List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//            list.forEach(commonRequest -> {
-//                CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue());
-//                dpList.add(commonResponse);
-//            });
-//        }
-//
-//
-//        Map<String, Object> hashMap = new HashMap<>();
-//        List<Map<String, Object>> firstMapList = new ArrayList<>();
-//        List<Map<String, Object>> secondMapList = new ArrayList<>();
-//        List<Map<String, Object>> thirdMapList = new ArrayList<>();
-//        List<Map<String, Object>> dpMapList = new ArrayList<>();
-//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
-//
-//        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
-//        dateTimeList.forEach(dateTime -> {
-//            Map<String, Object> firstMap = new HashMap<>();
-//            Map<String, Object> secondMap = new HashMap<>();
-//            Map<String, Object> thirdMap = new HashMap<>();
-//            Map<String, Object> dpMap = new HashMap<>();
-//            dpMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("value", 0);
-//            secondMap.put("name", DateUtil.formatDate(dateTime));
-//            secondMap.put("value", 0);
-//            thirdMap.put("name", DateUtil.formatDate(dateTime));
-//            thirdMap.put("value", 0);
-//            tagResponseList.forEach(tagResponse -> {
-//                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-//                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-//                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-//                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-//                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
-//                    }
-//                }
-//            });
-//            dpMap.put("value", firstMap.get("value"));
-//            dpMap.put("value1", secondMap.get("value"));
-//            dpMap.put("value2", thirdMap.get("value"));
-//            firstMapList.add(firstMap);
-//            secondMapList.add(secondMap);
-//            thirdMapList.add(thirdMap);
-//            dpMapList.add(dpMap);
-//        });
-//        //修改封装数据结构
-//        hashMap.put("zdzj", firstMapList);
-//        hashMap.put("sjmg", secondMapList);
-//        hashMap.put("cgxx", thirdMapList);
-//        hashMap.put("dp", dpMapList);
-//        return hashMap;
-//    }
-
     //根据录入历史数据统计(暂留)
     public Map<String, Object> getDataByLocal1(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
@@ -333,11 +385,11 @@
 
     @Override
     public Map<String, Object> statisticsByDateTime(JudgmentRequest judgmentRequest) {
-        return iBusinessAccessService.getAccessStatus("2-sj")&&
-                (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ?
-                getDataByLocal(judgmentRequest):
+        return iBusinessAccessService.getAccessStatus("2-sj") &&
+                (ToolUtils.pageArr[1] == judgmentRequest.getPage()) &&
+                (!(judgmentRequest.getIsReal() != null && judgmentRequest.getIsReal())) ?
+                getDataByLocal(judgmentRequest) :
                 getDataByOther(judgmentRequest);
-
     }
 
     public List<CommonRequest> processUtil(List<CommonRequest> list1, List<CommonRequest> list2) {
@@ -356,50 +408,12 @@
         return list2;
     }
 
-//    public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
-//        QueryWrapper<Judgment> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime());
-//        queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime());
-//        List<Judgment> judgmentList = this.list(queryWrapper);
-//        Judgment judgmentResult = new Judgment();
-//        judgmentList.forEach(judgment -> {
-//            judgmentResult.setDescription(judgment.getDescription());
-//            judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal());
-//            if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list);
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list);
-//
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list);
-//            }
-//
-//            if (ObjectUtil.isNotEmpty(judgment.getDescription())) {
-//                JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription());
-//                judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class));
-//            }
-//        });
-//        //用于大屏回显
-//        judgmentResult.setStartTime(judgmentRequest.getBeginTime());
-//        judgmentResult.setEndTime(judgmentRequest.getEndTime());
-//        return judgmentResult;
-//    }
-
-
     public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
 
         Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
 
-        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())?
-                judgment.getJudgmentTotal(): iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
+        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1] == judgmentRequest.getPage()) ?
+                judgment.getJudgmentTotal() : iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
         if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
             judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class));
@@ -595,6 +609,7 @@
                 Map<String, Object> apiMap = new HashMap<>();
                 apiMap.put("value", it.getValue());
                 apiMap.put("name", it.getName());
+                apiMap.put("time", it.getTime());
                 return apiMap;
             }).collect(Collectors.toList());
         }
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 5416b7d..3293c93 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
@@ -95,6 +95,12 @@
                 JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getPlateResult());
                 obj.setPlateResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class));
             }
+            if (StringUtils.isNotEmpty(obj.getStartTime())) {
+                obj.setStartTime(DateUtil.formatDateTime(DateUtil.parseDateTime(obj.getStartTime())));
+            }
+            if (StringUtils.isNotEmpty(obj.getEndTime())) {
+                obj.setEndTime(DateUtil.formatDateTime(DateUtil.parseDateTime(obj.getEndTime())));
+            }
         });
         return realtimeWorkList;
     }
@@ -143,8 +149,16 @@
 
 
     public RealtimeWork getListByLocalResult(Long id) {
-
-        return this.getById(id);
+        RealtimeWork realtimeWork = this.getById(id);
+        if(null!=realtimeWork){
+            if(ObjectUtil.isNotEmpty(realtimeWork.getStartTime())){
+                realtimeWork.setStartTime(DateUtil.formatDateTime(DateUtil.parseDateTime(realtimeWork.getStartTime())));
+            }
+            if(ObjectUtil.isNotEmpty(realtimeWork.getEndTime())){
+                realtimeWork.setEndTime(DateUtil.formatDateTime(DateUtil.parseDateTime(realtimeWork.getEndTime())));
+            }
+        }
+        return realtimeWork;
     }
 
     public RealtimeWork getListByOtherResult(BusinessReportInfoRequest businessReportInfoRequest) {
@@ -171,14 +185,11 @@
 
                 if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) {
                     sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
+                } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) {
+                    feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
                 }
-//                else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) {
-//                    feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
-//                }
             }
         }
-        feedbackCount = iCmdBodyInfoService.getFeedCount(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
-
 
         return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount);
 
@@ -187,11 +198,11 @@
     @Override
     public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) {
 
-        businessReportInfoRequest.setEndTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime());
-        businessReportInfoRequest.setBeginTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime());
+//        businessReportInfoRequest.setEndTime(ObjectUtil.isNotEmpty(businessReportInfoRequest.getIsReal()) && businessReportInfoRequest.getIsReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime());
+//        businessReportInfoRequest.setBeginTime(ObjectUtil.isNotEmpty(businessReportInfoRequest.getIsReal()) && businessReportInfoRequest.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-lc") &&
                 (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
-                && (!businessReportInfoRequest.isReal()) ?
+                && (!businessReportInfoRequest.getIsReal()) ?
                 getListByLocalResult(businessReportInfoRequest.getThirdId()) :
                 getListByOtherResult(businessReportInfoRequest);
     }
@@ -361,14 +372,28 @@
             resultMap.put("name", dict.getName());
             resultMap.put("value", 0);
             list.forEach(cmdBodyCommonResponse -> {
-                if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) {
+                if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode() + "_") == 0) {
                     resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
                             StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
                             Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
+                    cmdBodyCommonResponse.setWebFlag(true);
                 }
             });
             resultMapList.add(resultMap);
         });
+        //没有找到平台类型的，直接存在其他平台里
+        HashMap<String, Object> resultMap = new HashMap<>();
+        resultMap.put("name", "其他平台");
+        resultMap.put("value", 0);
+        list.forEach(cmdBodyCommonResponse -> {
+            if (!cmdBodyCommonResponse.isWebFlag()) {
+                resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
+                        StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
+                        Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
+            }
+        });
+        resultMapList.add(resultMap);
+        resultMapList.removeIf(objMap->Long.valueOf(objMap.get("value").toString()).intValue()==0);
         return resultMapList;
     }
 
@@ -383,18 +408,17 @@
     //从第三方获取上报记录
     public Map<String, Object> statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) {
         Map<String, Object> resultMap = new HashMap<>();
-        //获取上报信息
-//        List<CmdBodyCommonResponse> sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
 
-        List<CmdBodyCommonResponse> sbList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
-        //获取下发信息
-//        List<CmdBodyCommonResponse> xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
-
-        List<CmdBodyCommonResponse> xfList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.xfArr[0]);
-
+        List<CmdBodyCommonResponse> totalList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
+        List<CmdBodyCommonResponse> sbList = totalList.stream().filter(obj-> Objects.equals(obj.getBodyId(), "1")).collect(Collectors.toList());
+        List<CmdBodyCommonResponse> xfList = totalList.stream().filter(obj-> Objects.equals(obj.getBodyId(), "7")).collect(Collectors.toList());
         List<Map<String, Object>> dpMapList = new ArrayList<>();
         List<Map<String, Object>> sbMapList = new ArrayList<>();
-        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -12), new Date(), DateField.HOUR_OF_DAY);
+//        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -11), new Date(), DateField.HOUR_OF_DAY);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.parseDateTime(businessReportInfoRequest.getBeginTime()),DateUtil.parseDateTime(businessReportInfoRequest.getEndTime()) , DateField.HOUR_OF_DAY);
+        if(dateTimeList!=null&&dateTimeList.size()>0){
+            dateTimeList.remove(dateTimeList.size()-1);
+        }
         dateTimeList.forEach(dateTime -> {
             Map<String, Object> sbMap = new HashMap<>();
             Map<String, Object> dpMap = new HashMap<>();
@@ -403,7 +427,8 @@
             sbMap.put("value", 0);
             sbList.forEach(sb -> {
                 if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()) : 0));
+                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "").intValue() + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()).intValue() : 0));
+                    sb.setWebFlag(true);
                 }
             });
             dpMap.put("value", sbMap.get("value"));
@@ -418,7 +443,7 @@
             xfMap.put("value", 0);
             xfList.forEach(xf -> {
                 if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()) : 0));
+                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "").intValue() + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()).intValue() : 0));
                 }
             });
             xfMapList.add(xfMap);
@@ -484,11 +509,11 @@
 
     @Override
     public Map<String, Object> statisticsByReport(BusinessReportInfoRequest request) {
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-sj") &&
-                (ToolUtils.pageArr[2] == request.getPage())&&
-                (!request.isReal()) ?
+                (ToolUtils.pageArr[2] == request.getPage()) &&
+                (!(request.getIsReal() != null && request.getIsReal())) ?
                 statisticsByLocalReport(request.getThirdId()) :
                 statisticsByOtherReport(request);
     }
@@ -521,11 +546,11 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-bq") &&
                 (ToolUtils.pageArr[2] == request.getPage()) &&
-                (!request.isReal()) ?
+                (!(request.getIsReal() != null && request.getIsReal())) ?
                 statisticsByLocalTag(request) :
                 statisticsByOtherTag(request);
     }
@@ -536,10 +561,10 @@
         if (ObjectUtil.isNotEmpty(orgCode)) {
             if (orgCode.indexOf("B0") > -1) {
                 orgCode = orgCode.replace("B0", "");
-            } else {
+            } else if (orgCode.indexOf("B") > -1) {
                 orgCode = orgCode.substring(1, orgCode.length());
                 if (orgCode.indexOf("10") == 0) {
-                    orgCode.replaceFirst("10", "20");
+                    orgCode = orgCode.replaceFirst("10", "20");
                 }
             }
         }
@@ -565,6 +590,8 @@
     public List<CommonResponse> statisticsByOtherArea(BusinessReportInfoRequest businessReportInfoRequest) {
         List<CommonResponse> resultList = new ArrayList<>();
         List<Area> areaList = iAreaService.list();
+        //特殊需求，去掉石河子
+        areaList.removeIf((Area area) -> "石河子".equals(area.getAreaName()));
         List<Area> areaList1 = new ArrayList<>();
 
         areaList.forEach(area -> {
@@ -579,15 +606,14 @@
             CommonResponse commonResponse = new CommonResponse(area.getAreaName(), "0", "0");
             responseSbList.forEach(res -> {
                 String submitCode = processUtil(res.getSubmitCode());
-                if (area.getId().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
-                    commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + (ObjectUtil.isNotEmpty(res.getLinks()) && StringUtils.isNumeric(res.getLinks()) ? Long.valueOf(res.getLinks()) : 0)) + "");
+                if (area.getId().toString().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
+                    commonResponse.setValue((Double.valueOf(commonResponse.getValue()).intValue() + (ObjectUtil.isNotEmpty(res.getLinks()) ? Double.valueOf(res.getLinks()).intValue() : 0)) + "");
                 }
-
             });
             responseXfList.forEach(res1 -> {
                 String instructCode = processUtil(res1.getInstructCode());
-                if (area.getId().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
-                    commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + (ObjectUtil.isNotEmpty(res1.getLinks()) && StringUtils.isNumeric(res1.getLinks()) ? Long.valueOf(res1.getLinks()) : 0)) + "");
+                if (area.getId().toString().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
+                    commonResponse.setValue1((Double.valueOf(commonResponse.getValue1()).intValue() + (ObjectUtil.isNotEmpty(res1.getLinks()) ? Double.valueOf(res1.getLinks()).intValue() : 0)) + "");
                 }
             });
             resultList.add(commonResponse);
@@ -610,12 +636,12 @@
     @Override
     public List<CommonResponse> statisticsByArea(BusinessReportInfoRequest request) {
 
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return request.isFlag() ? clickData(request) :
                 (iBusinessAccessService.getAccessStatus("3-qy") &&
                         (ToolUtils.pageArr[2] == request.getPage()) &&
-                        (!request.isReal())?
+                        (!(request.getIsReal() != null && request.getIsReal())) ?
                         statisticsByLocalArea(request.getThirdId()) :
                         statisticsByOtherArea(request));
     }
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 739eb99..ba8875e 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,7 +3,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
index cf8ed65..040b5c6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/CmdBodyTagController.java
@@ -49,6 +49,14 @@
         return  ResponseData.success(cmdBodyTagService.statisticsByTag(request));
     }
 
+    /**
+     * 获取分类标签下拉列表
+     */
+    @RequestMapping(value = "/selectListTen")
+    @ResponseBody
+    public Object selectListTen(BusinessReportInfoRequest request) {
+        return  ResponseData.success(cmdBodyTagService.selectListTen(request));
+    }
 
 
 //
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
index b8be391..003de5d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java
@@ -248,4 +248,15 @@
         return ResponseData.success(iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(),judgmentRequest.getEndTime()));
     }
 
+
+    /**
+     * 添加时间趋势分析接口
+     */
+    @RequestMapping(value = "/addStatisticsByTime")
+    @ResponseBody
+    public Object addStatisticsByTime(@RequestBody Judgment judgment) {
+        return ResponseData.success(judgmentService.addStatisticsByTime(judgment));
+    }
+
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index fc11153..6440a39 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.system.dto.IdDTO;
 import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
 import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.model.Area;
 import com.casic.missiles.modular.system.model.RealtimeWork;
 import com.casic.missiles.modular.system.service.IAreaService;
 import com.casic.missiles.modular.system.service.IRealtimeWorkService;
@@ -267,7 +268,9 @@
     @RequestMapping(value = "/getAreas")
     @ResponseBody
     public Object getAreas() {
-        return ResponseData.success(iAreaService.list());
+        List<Area> areaList = iAreaService.list();
+        areaList.removeIf((Area area)->"石河子".equals(area.getAreaName()));
+        return ResponseData.success(areaList);
     }
 
     /**
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 f58099e..84dcb3d 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,10 +1,10 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.dto.BusinessReportInfoRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -19,4 +19,8 @@
 public interface CmdBodyTagMapper extends BaseMapper<CmdBodyTag> {
     List<CommonRequest> statisticsByTag(@Param("begTime") String begTime,
                                         @Param("endTime") String endTime);
+
+    List<CommonRequest> statisticsByTagTen(@Param("begTime") String begTime,
+                                        @Param("endTime") String endTime);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyInfoMapper.xml
index 3b5f5dc..c51f254 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
@@ -61,7 +61,7 @@
 
     <select id="getJudgeCountByTime" resultType="java.lang.Integer">
 
-        SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
+       <!-- SELECT IFNULL(sum(cci.controls_link),0) from cmd_controls_info cci
         WHERE cci.body_id in (SELECT cb.`body_id`
         FROM cmd_body_info cb
         WHERE cb.`body_nature` = 0
@@ -70,46 +70,85 @@
         </if>
         <if test="endTime!='' and endTime!=null">
             AND cb.`hand_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>)
+        </if>)-->
+
+        SELECT IFNULL(SUM( CASE WHEN body_remark IS NULL THEN 1
+        WHEN body_remark=0 THEN 1
+        WHEN body_remark='' THEN 1
+        ELSE body_remark END),0) FROM cmd_body_info
+        WHERE  body_nature=0
+        <if test="begTime!='' and begTime!=null">
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+
 
     </select>
 
 
     <select id="statisticsByArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.submit_organ AS submitOrgan,
-        t0.submit_organcode AS submitCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`submit_organ`,cb.`submit_organcode`,cb.`body_id` FROM cmd_body_info cb
-        WHERE cb.`body_nature`=0
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS links
+        ,
+        submit_organ AS submitOrgan,
+        submit_organcode AS submitCode
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`submit_time` <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`submit_time` <![CDATA[  <=  ]]> #{endTime}
-        </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        GROUP BY
+        submit_organcode
+        ORDER BY
+        links DESC
 
     </select>
 
     <select id="statisticsByXfArea" resultType="com.casic.missiles.modular.system.dto.AreaReportResponse">
 
-        SELECT t0.instruct_organ AS instructOrgan,
-        t0.instruct_post AS instructCode,
-        ci.controls_link AS links
-        FROM (SELECT cb.`instruct_organ`,cb.`instruct_post`,cb.`body_id` FROM cmd_body_instruct cb
-        WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS links,
+        c.instruct_post AS instructCode,
+        c.instruct_organ AS instructOrgan
+        FROM
+        cmd_body_info body
+        INNER JOIN cmd_body_instruct c ON c.body_id = body.body_id
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cb.`instruct_time` <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.`instruct_time` <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
-        ) t0 LEFT JOIN cmd_controls_info ci ON
-        t0.body_id = ci.body_id
+        GROUP BY
+        c.instruct_post
+        ORDER BY
+        links DESC
 
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index b505883..7b6a06d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -23,56 +23,240 @@
 
 
     <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
-        SELECT cci.create_time AS roamTime,cb.tag_name AS tagName,cci.controls_link AS links
-        FROM cmd_controls_info cci
-        LEFT JOIN cmd_body_tag cb ON cb.tag_id= cci.tag_id
-        WHERE 1 = 1
+
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `links`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS tagId,
+        DATE_FORMAT(hand_time,'%Y-%m-%d') AS roamTime
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
         <if test="begTime!='' and begTime!=null">
-            AND cci.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cci.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-
+        GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
+        ORDER BY `links` DESC
 
     </select>
 
 
     <select id="getCountByStatus" resultType="com.casic.missiles.modular.system.dto.CommonResponse">
 
-        SELECT t.bodyState AS name, sum(t.links) AS value
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE cb.roam_operation in ('0.49','1', '4', '5', '7')
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        1 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE
+        roam_operation IN ( 0.49, 1 )
 
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
-        GROUP BY
-        t.bodyState
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        4 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 4
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        5 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 5
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        7 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation = 7
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>) UNION
+        SELECT
+        IFNULL(
+        sum(
+        CASE
+
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        ),
+        0
+        ) AS
+        value
+        ,
+        8.3 AS name
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN (
+        SELECT
+        body_id
+        FROM
+        cmd_body_roam
+        WHERE roam_operation >= 8.3
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        )
+
     </select>
 
 
     <select id="getCountByStatusAndTime" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        submit_time AS resultTime,
+        '1' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation IN ( 0.49, 1 )
 
-        SELECT t.links as links,t.roamTime as resultTime
-        FROM (
-        SELECT cb.`roam_operation` as bodyState, IFNULL(cc.`controls_link`,0) as links,cb.roam_time as roamTime FROM cmd_body_roam cb
-        LEFT JOIN cmd_controls_info cc ON cc.body_id= cb.body_id
-        WHERE 1=1
-        <if test="type != null  and  type != ''">
-            and cb.roam_operation = #{type}
-        </if>
         <if test="begTime!='' and begTime!=null">
-            AND cb.roam_time <![CDATA[  >=  ]]> #{begTime}
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cb.roam_time <![CDATA[  <=  ]]> #{endTime}
-        </if>) t
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+        UNION
+        SELECT
+        CASE
+        WHEN cc.body_remark IS NULL THEN
+        1
+        WHEN cc.body_remark = 0 THEN
+        1
+        WHEN cc.body_remark = '' THEN
+        1 ELSE cc.body_remark
+        END
+        AS links,
+        hand_time AS resultTime,
+        '7' AS bodyId
+        FROM
+        cmd_body_info cc
+        WHERE
+        body_nature = 0
+        AND body_id IN ( SELECT body_id FROM cmd_body_roam WHERE roam_operation =7
+
+        <if test="begTime!='' and begTime!=null">
+            AND roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>)
+
     </select>
 
 </mapper>
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 7c45998..9b8a5da 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
@@ -17,21 +17,46 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT t1.`tag_name` AS name, t0.tagCount AS value
-        FROM cmd_body_tag t1
-        LEFT JOIN
-        (SELECT a.`tag_id` AS tagId, IFNULL(SUM(a.`controls_link`),0) AS tagCount
-        FROM cmd_controls_info a WHERE 1=1
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND a.publish_time <![CDATA[  >=  ]]> #{begTime}
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND a.publish_time <![CDATA[  <=  ]]> #{endTime}
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
-        GROUP BY a.`tag_id`) t0
-        ON t0.tagId = t1.`tag_id`
-        WHERE t1.`hide`=1
-        ORDER BY t0.tagCount DESC
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+    </select>
+
+    <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
+
+        SELECT
+        SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
+        ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
+        FROM
+        cmd_body_info body
+        LEFT JOIN cmd_controls_info c ON c.body_id = body.body_id
+        LEFT JOIN cmd_body_tag tag ON FIND_IN_SET( tag.tag_id, c.tag_id )
+        WHERE body_nature = 0
+
+        <if test="begTime!='' and begTime!=null">
+            AND body.hand_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+        GROUP BY c.tag_id
+        ORDER BY value DESC
+        limit 10
+
     </select>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
index 0b92ef4..f88b7f0 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdControlsInfoMapper.xml
@@ -40,14 +40,29 @@
 
 
     <select id="getWebList" resultType="com.casic.missiles.modular.system.dto.CmdBodyCommonResponse">
-        SELECT cc.`body_id` AS bodyId, cc.`controls_web` AS controlsWeb,IFNULL(cc.controls_link,0) as links
-        FROM cmd_controls_info cc
-        WHERE 1=1
+
+        SELECT
+        CASE
+        WHEN
+        body_remark IS NULL THEN
+        1
+        WHEN body_remark = 0 THEN
+        1
+        WHEN body_remark = '' THEN
+        1 ELSE body_remark
+        END AS links,
+        cc.`controls_web` AS controlsWeb
+        FROM
+        cmd_body_info cb
+        LEFT JOIN cmd_controls_info cc ON cb.body_id = cc.body_id
+        WHERE
+        body_nature = 0
+
         <if test="begTime!='' and begTime!=null">
-            AND cc.create_time <![CDATA[  >=  ]]> #{begTime}
+            AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND cc.create_time <![CDATA[  <=  ]]> #{endTime}
+            AND hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
index 86905e0..9cbe7cc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/BusinessReportInfoRequest.java
@@ -21,7 +21,7 @@
     private int page;
 
     //用于是否是实时刷新 true实时刷新
-    private boolean isReal;
+    private Boolean isReal;
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
index 0cc0d72..a25b165 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/CmdBodyCommonResponse.java
@@ -17,4 +17,7 @@
     //关联条数
     private String links;
 
+    //是否关联平台
+    private boolean webFlag;
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
index 2b5c5cd..3728387 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/DictMapDTO.java
@@ -3,10 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public  class DictMapDTO {
+public class DictMapDTO {
 
     //统计类别
     public static Map<String, String> firstHashMap = new HashMap<String, String>();
+
     static {
         firstHashMap.put("sdzj", "2");
         firstHashMap.put("sjmgsj", "6");
@@ -15,21 +16,26 @@
 
     //涉党政军类
     public static Map<String, String> sdzjHashMap = new HashMap<String, String>();
+
     static {
         sdzjHashMap.put("涉党信息", "2-1");
         sdzjHashMap.put("涉政信息", "2-2");
         sdzjHashMap.put("涉军信息", "2-3");
         sdzjHashMap.put("其他相关", "2-4");
     }
+
     //涉疆敏感事件
     public static Map<String, String> sjmgMap = new HashMap<String, String>();
+
     static {
         sjmgMap.put("涉疆案件", "6-1");
         sjmgMap.put("涉疆事件", "6-2");
         sjmgMap.put("其他相关", "6-3");
     }
+
     //常规信息
     public static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+
     static {
         cgxxHashMap.put("安全生产", "7-1");
         cgxxHashMap.put("网络安全", "7-2");
@@ -47,19 +53,28 @@
     //0.63	五科 （社会二科 A20500）
     //0.64	六科 （境外科 A20300）4
     //1   上报
-    public static String[] sbArr={"0.49","1"};
+    public static String[] sbArr = {"0.49", "1.0"};
     //1.1	     联合传播行动队长研判
     //2	      初步研判
-    public static String[] cbypArr={"4"};
+    public static String[] cbypArr = {"4.0"};
     //5	     值班长研判
-    public static String[] zbzypArr={"5"};
+    public static String[] zbzypArr = {"5.0"};
     //  6	    主值班长审核
     //6.1	       待请示
     //6.2	       请示中
     //6.3	      请示完成
-    public static String[] zzbzypArr={"7"};
+    public static String[] zzbzypArr = {"7.0"};
     //7	      指令分发
-    public static String[] xfArr={"7"};
+    public static String[] xfArr = {"7.0"};
     //8.3	       反馈
-    public static String[] fkArr={"8.3"};
+    public static String[] fkArr = {"8.3"};
+
+
+    public static String[] classifyArr = {
+            "涉领导人类", "涉党政军类"
+            , "涉爆涉恐类", "民族宗教类"
+            , "治疆政策类", "涉疆案(事)件类"
+            , "公共安全类", "组织人事类"
+            , "社会民生类", "其他类"
+    };
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
index 71a828f..4b034cf 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -15,4 +15,7 @@
 
     private int page;
 
+    //用于是否是实时刷新 true实时刷新
+    private Boolean isReal;
+
 }
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 b7f6a61..3f75025 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
@@ -16,5 +16,9 @@
  * @since 2023-06-15
  */
 public interface ICmdBodyTagService extends IService<CmdBodyTag> {
+
     List<CommonRequest> statisticsByTag(BusinessReportInfoRequest businessReportInfoRequest);
+
+    List<CommonRequest> selectListTen(BusinessReportInfoRequest businessReportInfoRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
index a5681cc..6f46ede 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java
@@ -29,4 +29,6 @@
 
     List<Judgment> getList(JudgmentRequest judgmentRequest);
 
+    Map<String, Object>  addStatisticsByTime(Judgment judgment);
+
 }
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 5bbc644..25b0e02 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
@@ -2,12 +2,13 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.CmdBodyTagMapper;
 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;
@@ -34,8 +35,24 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
 
+    @Override
+    public List<CommonRequest> selectListTen(BusinessReportInfoRequest request) {
+        List<CommonRequest> commonRequestList = this.baseMapper.statisticsByTagTen(request.getBeginTime(), request.getEndTime());
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+        });
+        return commonRequestList;
+    }
+
+
 }
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 30dea56..c8fe2bf 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
@@ -16,15 +16,13 @@
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.model.Judgment;
-import com.casic.missiles.modular.system.service.IBusinessAccessService;
-import com.casic.missiles.modular.system.service.ICmdBodyInfoService;
-import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
-import com.casic.missiles.modular.system.service.IJudgmentService;
+import com.casic.missiles.modular.system.service.*;
 import com.casic.missiles.modular.system.util.ToolUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -51,6 +49,9 @@
     @Autowired
     private ICmdBodyInfoService iCmdBodyInfoService;
 
+    @Autowired
+    private ICmdBodyTagService iCmdBodyTagService;
+
     @Override
     public List<HashMap<String, Object>> statisticsByTime() {
         List<Judgment> judgmentList = this.list();
@@ -81,15 +82,125 @@
         return hashMaps;
     }
 
+
+    public static boolean isInteger(String str) {
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(str).matches();
+    }
+
+
+    @Override
+    public Map<String, Object> addStatisticsByTime(Judgment judgment) {
+        Map<String, Object> hashMap = new HashMap<>();
+        List<Map<String, Object>> firstMapList = new ArrayList<>();
+        List<Map<String, Object>> secondMapList = new ArrayList<>();
+        List<Map<String, Object>> thirdMapList = new ArrayList<>();
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        List<CommonRequest> commonRequestList1 = judgment.getTitle1List();
+        List<CommonRequest> commonRequestList2 = judgment.getTitle2List();
+        List<CommonRequest> commonRequestList3 = judgment.getTitle3List();
+        for (int i = 0; i < commonRequestList1.size(); i++) {
+            String title1 = commonRequestList1.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title1)) {
+                firstTags.addAll(Arrays.asList(title1.split(",")));
+            }
+        }
+        for (int i = 0; i < commonRequestList2.size(); i++) {
+            String title2 = commonRequestList2.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title2))
+                secondTags.addAll(Arrays.asList(title2.split(",")));
+        }
+        for (int i = 0; i < commonRequestList3.size(); i++) {
+            String title3 = commonRequestList3.get(i).getName();
+            if (ObjectUtil.isNotEmpty(title3))
+                thirdTags.addAll(Arrays.asList(title3.split(",")));
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6)),
+                judgment.getEndTime());
+
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgment.getEndTime()), -6), DateUtil.parseDate(judgment.getEndTime()), DateField.DAY_OF_YEAR);
+        dateTimeList.forEach(dateTime -> {
+            Map<String, Object> firstMap = new HashMap<>();
+            Map<String, Object> secondMap = new HashMap<>();
+            Map<String, Object> thirdMap = new HashMap<>();
+            firstMap.put("name", DateUtil.formatDate(dateTime));
+            firstMap.put("value", 0);
+            secondMap.put("name", DateUtil.formatDate(dateTime));
+            secondMap.put("value", 0);
+            thirdMap.put("name", DateUtil.formatDate(dateTime));
+            thirdMap.put("value", 0);
+            tagResponseList.forEach(tagResponse -> {
+                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
+                    }
+                }
+            });
+            firstMapList.add(firstMap);
+            secondMapList.add(secondMap);
+            thirdMapList.add(thirdMap);
+        });
+        hashMap.put("zdzj", firstMapList);
+        hashMap.put("sjmg", secondMapList);
+        hashMap.put("cgxx", thirdMapList);
+        return hashMap;
+    }
+
     public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
         List<Map<String, Object>> firstMapList = new ArrayList<>();
         List<Map<String, Object>> secondMapList = new ArrayList<>();
         List<Map<String, Object>> thirdMapList = new ArrayList<>();
         List<Map<String, Object>> dpMapList = new ArrayList<>();
-        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
+        Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
+        List<String> firstTags = new ArrayList<>();
+        List<String> secondTags = new ArrayList<>();
+        List<String> thirdTags = new ArrayList<>();
+        if (null != judgment) {
+            JSONArray jsonArray1 = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
+            JSONArray jsonArray2 = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
+            JSONArray jsonArray3 = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
+            for (int i = 0; i < jsonArray1.size(); i++) {
+                String title1 = ((JSONObject) jsonArray1.get(i)).getString("time");
+                if (ObjectUtil.isNotEmpty(title1)) {
+                    firstTags.addAll(Arrays.asList(title1.split(",")));
+                }else {
+                    firstTags.add(((JSONObject) jsonArray1.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray2.size(); i++) {
+                String title2 = ((JSONObject) jsonArray2.get(i)).getString("time");
+                if(ObjectUtil.isNotEmpty(title2)){
+                    secondTags.addAll(Arrays.asList(title2.split(",")));
+                }else {
+                    secondTags.add(((JSONObject) jsonArray2.get(i)).getString("name"));
+                }
+            }
+            for (int i = 0; i < jsonArray3.size(); i++) {
+                String title3 = ((JSONObject) jsonArray3.get(i)).getString("name");
+                if(ObjectUtil.isNotEmpty(title3)){
+                    thirdTags.addAll(Arrays.asList(title3.split(",")));
+                }else {
+                    thirdTags.add(((JSONObject) jsonArray3.get(i)).getString("name"));
+                }
+            }
+        }
+        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(
+                DateUtil.formatDateTime(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6)),
+                judgmentRequest.getEndTime());
 
-        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(DateUtil.parseDate(judgmentRequest.getEndTime()), -6), DateUtil.parseDate(judgmentRequest.getEndTime()), DateField.DAY_OF_YEAR);
         dateTimeList.forEach(dateTime -> {
             Map<String, Object> firstMap = new HashMap<>();
             Map<String, Object> secondMap = new HashMap<>();
@@ -104,12 +215,15 @@
             thirdMap.put("value", 0);
             tagResponseList.forEach(tagResponse -> {
                 if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
+                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
+                        String tagId = tagResponse.getTagId();
+                        if (firstTags.contains(tagId)) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (secondTags.contains(tagId)) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        } else if (thirdTags.contains(tagId)) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        }
                     }
                 }
             });
@@ -129,68 +243,6 @@
         return hashMap;
     }
 
-
-//    public Map<String, Object> getDataByOther(JudgmentRequest judgmentRequest) {
-//
-//        Judgment judgment = this.getById(judgmentRequest.getSecondId());
-//        //涉党政军
-//        if (ObjectUtil.isNotEmpty(judgment) && ObjectUtil.isNotEmpty(judgment.getSdzjResult())) {
-//            JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSdzjResult());
-//            List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//            list.forEach(commonRequest -> {
-//                CommonResponse commonResponse = new CommonResponse(commonRequest.getTime(), commonRequest.getValue());
-//                dpList.add(commonResponse);
-//            });
-//        }
-//
-//
-//        Map<String, Object> hashMap = new HashMap<>();
-//        List<Map<String, Object>> firstMapList = new ArrayList<>();
-//        List<Map<String, Object>> secondMapList = new ArrayList<>();
-//        List<Map<String, Object>> thirdMapList = new ArrayList<>();
-//        List<Map<String, Object>> dpMapList = new ArrayList<>();
-//        List<TagResponse> tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime());
-//
-//        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR);
-//        dateTimeList.forEach(dateTime -> {
-//            Map<String, Object> firstMap = new HashMap<>();
-//            Map<String, Object> secondMap = new HashMap<>();
-//            Map<String, Object> thirdMap = new HashMap<>();
-//            Map<String, Object> dpMap = new HashMap<>();
-//            dpMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("name", DateUtil.formatDate(dateTime));
-//            firstMap.put("value", 0);
-//            secondMap.put("name", DateUtil.formatDate(dateTime));
-//            secondMap.put("value", 0);
-//            thirdMap.put("name", DateUtil.formatDate(dateTime));
-//            thirdMap.put("value", 0);
-//            tagResponseList.forEach(tagResponse -> {
-//                if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
-//                    if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sdzj")) == 0) {
-//                        firstMap.put("value", Long.valueOf(firstMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("sjmgsj")) == 0) {
-//                        secondMap.put("value", Long.valueOf(secondMap.get("value") + "") + 1);
-//                    } else if (ObjectUtil.isNotEmpty(tagResponse.getTagId()) && tagResponse.getTagId().indexOf(DictMapDTO.firstHashMap.get("cgxx")) == 0) {
-//                        thirdMap.put("value", Long.valueOf(thirdMap.get("value") + "") + 1);
-//                    }
-//                }
-//            });
-//            dpMap.put("value", firstMap.get("value"));
-//            dpMap.put("value1", secondMap.get("value"));
-//            dpMap.put("value2", thirdMap.get("value"));
-//            firstMapList.add(firstMap);
-//            secondMapList.add(secondMap);
-//            thirdMapList.add(thirdMap);
-//            dpMapList.add(dpMap);
-//        });
-//        //修改封装数据结构
-//        hashMap.put("zdzj", firstMapList);
-//        hashMap.put("sjmg", secondMapList);
-//        hashMap.put("cgxx", thirdMapList);
-//        hashMap.put("dp", dpMapList);
-//        return hashMap;
-//    }
-
     //根据录入历史数据统计(暂留)
     public Map<String, Object> getDataByLocal1(JudgmentRequest judgmentRequest) {
         Map<String, Object> hashMap = new HashMap<>();
@@ -333,11 +385,11 @@
 
     @Override
     public Map<String, Object> statisticsByDateTime(JudgmentRequest judgmentRequest) {
-        return iBusinessAccessService.getAccessStatus("2-sj")&&
-                (ToolUtils.pageArr[1]==judgmentRequest.getPage()) ?
-                getDataByLocal(judgmentRequest):
+        return iBusinessAccessService.getAccessStatus("2-sj") &&
+                (ToolUtils.pageArr[1] == judgmentRequest.getPage()) &&
+                (!(judgmentRequest.getIsReal() != null && judgmentRequest.getIsReal())) ?
+                getDataByLocal(judgmentRequest) :
                 getDataByOther(judgmentRequest);
-
     }
 
     public List<CommonRequest> processUtil(List<CommonRequest> list1, List<CommonRequest> list2) {
@@ -356,50 +408,12 @@
         return list2;
     }
 
-//    public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
-//        QueryWrapper<Judgment> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime());
-//        queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime());
-//        List<Judgment> judgmentList = this.list(queryWrapper);
-//        Judgment judgmentResult = new Judgment();
-//        judgmentList.forEach(judgment -> {
-//            judgmentResult.setDescription(judgment.getDescription());
-//            judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal());
-//            if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list);
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list);
-//
-//            }
-//            if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) {
-//                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
-//                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
-//                judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list);
-//            }
-//
-//            if (ObjectUtil.isNotEmpty(judgment.getDescription())) {
-//                JSONObject jsonObject = (JSONObject) JSONObject.parse(judgment.getDescription());
-//                judgment.setDescDetail(JSONObject.parseObject(jsonObject.toJSONString(), CommonRequest.class));
-//            }
-//        });
-//        //用于大屏回显
-//        judgmentResult.setStartTime(judgmentRequest.getBeginTime());
-//        judgmentResult.setEndTime(judgmentRequest.getEndTime());
-//        return judgmentResult;
-//    }
-
-
     public Judgment getListByLocal(JudgmentRequest judgmentRequest) {
 
         Judgment judgment = this.baseMapper.selectById(judgmentRequest.getSecondId());
 
-        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1]==judgmentRequest.getPage())?
-                judgment.getJudgmentTotal(): iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
+        judgment.setJudgmentTotal(iBusinessAccessService.getAccessStatus("2-bt") && (ToolUtils.pageArr[1] == judgmentRequest.getPage()) ?
+                judgment.getJudgmentTotal() : iCmdBodyInfoService.getCmdBodyInfoByTime(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()));
         if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
             judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class));
@@ -595,6 +609,7 @@
                 Map<String, Object> apiMap = new HashMap<>();
                 apiMap.put("value", it.getValue());
                 apiMap.put("name", it.getName());
+                apiMap.put("time", it.getTime());
                 return apiMap;
             }).collect(Collectors.toList());
         }
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 5416b7d..3293c93 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
@@ -95,6 +95,12 @@
                 JSONArray jsonArray = (JSONArray) JSONArray.parse(obj.getPlateResult());
                 obj.setPlateResultList(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class));
             }
+            if (StringUtils.isNotEmpty(obj.getStartTime())) {
+                obj.setStartTime(DateUtil.formatDateTime(DateUtil.parseDateTime(obj.getStartTime())));
+            }
+            if (StringUtils.isNotEmpty(obj.getEndTime())) {
+                obj.setEndTime(DateUtil.formatDateTime(DateUtil.parseDateTime(obj.getEndTime())));
+            }
         });
         return realtimeWorkList;
     }
@@ -143,8 +149,16 @@
 
 
     public RealtimeWork getListByLocalResult(Long id) {
-
-        return this.getById(id);
+        RealtimeWork realtimeWork = this.getById(id);
+        if(null!=realtimeWork){
+            if(ObjectUtil.isNotEmpty(realtimeWork.getStartTime())){
+                realtimeWork.setStartTime(DateUtil.formatDateTime(DateUtil.parseDateTime(realtimeWork.getStartTime())));
+            }
+            if(ObjectUtil.isNotEmpty(realtimeWork.getEndTime())){
+                realtimeWork.setEndTime(DateUtil.formatDateTime(DateUtil.parseDateTime(realtimeWork.getEndTime())));
+            }
+        }
+        return realtimeWork;
     }
 
     public RealtimeWork getListByOtherResult(BusinessReportInfoRequest businessReportInfoRequest) {
@@ -171,14 +185,11 @@
 
                 if (Arrays.binarySearch(DictMapDTO.xfArr, commonResponse.getName()) > -1) {
                     sendCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
+                } else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) {
+                    feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
                 }
-//                else if (Arrays.binarySearch(DictMapDTO.fkArr, commonResponse.getName()) > -1) {
-//                    feedbackCount = ObjectUtil.isNotEmpty(commonResponse.getValue()) ? count : 0;
-//                }
             }
         }
-        feedbackCount = iCmdBodyInfoService.getFeedCount(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
-
 
         return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount);
 
@@ -187,11 +198,11 @@
     @Override
     public RealtimeWork getResult(BusinessReportInfoRequest businessReportInfoRequest) {
 
-        businessReportInfoRequest.setEndTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime());
-        businessReportInfoRequest.setBeginTime(businessReportInfoRequest.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime());
+//        businessReportInfoRequest.setEndTime(ObjectUtil.isNotEmpty(businessReportInfoRequest.getIsReal()) && businessReportInfoRequest.getIsReal() ? DateUtil.formatDateTime(new Date()) : businessReportInfoRequest.getEndTime());
+//        businessReportInfoRequest.setBeginTime(ObjectUtil.isNotEmpty(businessReportInfoRequest.getIsReal()) && businessReportInfoRequest.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : businessReportInfoRequest.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-lc") &&
                 (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
-                && (!businessReportInfoRequest.isReal()) ?
+                && (!businessReportInfoRequest.getIsReal()) ?
                 getListByLocalResult(businessReportInfoRequest.getThirdId()) :
                 getListByOtherResult(businessReportInfoRequest);
     }
@@ -361,14 +372,28 @@
             resultMap.put("name", dict.getName());
             resultMap.put("value", 0);
             list.forEach(cmdBodyCommonResponse -> {
-                if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode()) == 0) {
+                if (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getControlsWeb()) && cmdBodyCommonResponse.getControlsWeb().indexOf(dict.getCode() + "_") == 0) {
                     resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
                             StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
                             Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
+                    cmdBodyCommonResponse.setWebFlag(true);
                 }
             });
             resultMapList.add(resultMap);
         });
+        //没有找到平台类型的，直接存在其他平台里
+        HashMap<String, Object> resultMap = new HashMap<>();
+        resultMap.put("name", "其他平台");
+        resultMap.put("value", 0);
+        list.forEach(cmdBodyCommonResponse -> {
+            if (!cmdBodyCommonResponse.isWebFlag()) {
+                resultMap.put("value", Long.valueOf(resultMap.get("value") + "") + (ObjectUtil.isNotEmpty(cmdBodyCommonResponse.getLinks()) &&
+                        StringUtils.isNumeric(cmdBodyCommonResponse.getLinks()) ?
+                        Long.valueOf(cmdBodyCommonResponse.getLinks()) : 0));
+            }
+        });
+        resultMapList.add(resultMap);
+        resultMapList.removeIf(objMap->Long.valueOf(objMap.get("value").toString()).intValue()==0);
         return resultMapList;
     }
 
@@ -383,18 +408,17 @@
     //从第三方获取上报记录
     public Map<String, Object> statisticsByOtherReport(BusinessReportInfoRequest businessReportInfoRequest) {
         Map<String, Object> resultMap = new HashMap<>();
-        //获取上报信息
-//        List<CmdBodyCommonResponse> sbList = iCmdBodyInfoService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
 
-        List<CmdBodyCommonResponse> sbList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
-        //获取下发信息
-//        List<CmdBodyCommonResponse> xfList = iCmdBodyInstructService.getCountByTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime());
-
-        List<CmdBodyCommonResponse> xfList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.xfArr[0]);
-
+        List<CmdBodyCommonResponse> totalList = iCmdBodyRoamService.getCountByStatusAndTime(businessReportInfoRequest.getBeginTime(), businessReportInfoRequest.getEndTime(), DictMapDTO.sbArr[0]);
+        List<CmdBodyCommonResponse> sbList = totalList.stream().filter(obj-> Objects.equals(obj.getBodyId(), "1")).collect(Collectors.toList());
+        List<CmdBodyCommonResponse> xfList = totalList.stream().filter(obj-> Objects.equals(obj.getBodyId(), "7")).collect(Collectors.toList());
         List<Map<String, Object>> dpMapList = new ArrayList<>();
         List<Map<String, Object>> sbMapList = new ArrayList<>();
-        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -12), new Date(), DateField.HOUR_OF_DAY);
+//        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.offsetHour(new Date(), -11), new Date(), DateField.HOUR_OF_DAY);
+        List<DateTime> dateTimeList = DateUtil.rangeToList(DateUtil.parseDateTime(businessReportInfoRequest.getBeginTime()),DateUtil.parseDateTime(businessReportInfoRequest.getEndTime()) , DateField.HOUR_OF_DAY);
+        if(dateTimeList!=null&&dateTimeList.size()>0){
+            dateTimeList.remove(dateTimeList.size()-1);
+        }
         dateTimeList.forEach(dateTime -> {
             Map<String, Object> sbMap = new HashMap<>();
             Map<String, Object> dpMap = new HashMap<>();
@@ -403,7 +427,8 @@
             sbMap.put("value", 0);
             sbList.forEach(sb -> {
                 if (ObjectUtil.isNotEmpty(sb.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(sb.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "") + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()) : 0));
+                    sbMap.put("value", Long.valueOf(sbMap.get("value") + "").intValue() + (ObjectUtil.isNotEmpty(sb.getLinks()) && StringUtils.isNumeric(sb.getLinks()) ? Long.valueOf(sb.getLinks()).intValue() : 0));
+                    sb.setWebFlag(true);
                 }
             });
             dpMap.put("value", sbMap.get("value"));
@@ -418,7 +443,7 @@
             xfMap.put("value", 0);
             xfList.forEach(xf -> {
                 if (ObjectUtil.isNotEmpty(xf.getResultTime()) && DateUtil.compare(DateUtil.parseDateTime(xf.getResultTime()), dateTime, "yyyy-MM-dd HH") == 0) {
-                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "") + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()) : 0));
+                    xfMap.put("value", Long.valueOf(xfMap.get("value") + "").intValue() + (ObjectUtil.isNotEmpty(xf.getLinks()) && StringUtils.isNumeric(xf.getLinks()) ? Long.valueOf(xf.getLinks()).intValue() : 0));
                 }
             });
             xfMapList.add(xfMap);
@@ -484,11 +509,11 @@
 
     @Override
     public Map<String, Object> statisticsByReport(BusinessReportInfoRequest request) {
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-sj") &&
-                (ToolUtils.pageArr[2] == request.getPage())&&
-                (!request.isReal()) ?
+                (ToolUtils.pageArr[2] == request.getPage()) &&
+                (!(request.getIsReal() != null && request.getIsReal())) ?
                 statisticsByLocalReport(request.getThirdId()) :
                 statisticsByOtherReport(request);
     }
@@ -521,11 +546,11 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(BusinessReportInfoRequest request) {
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return iBusinessAccessService.getAccessStatus("3-bq") &&
                 (ToolUtils.pageArr[2] == request.getPage()) &&
-                (!request.isReal()) ?
+                (!(request.getIsReal() != null && request.getIsReal())) ?
                 statisticsByLocalTag(request) :
                 statisticsByOtherTag(request);
     }
@@ -536,10 +561,10 @@
         if (ObjectUtil.isNotEmpty(orgCode)) {
             if (orgCode.indexOf("B0") > -1) {
                 orgCode = orgCode.replace("B0", "");
-            } else {
+            } else if (orgCode.indexOf("B") > -1) {
                 orgCode = orgCode.substring(1, orgCode.length());
                 if (orgCode.indexOf("10") == 0) {
-                    orgCode.replaceFirst("10", "20");
+                    orgCode = orgCode.replaceFirst("10", "20");
                 }
             }
         }
@@ -565,6 +590,8 @@
     public List<CommonResponse> statisticsByOtherArea(BusinessReportInfoRequest businessReportInfoRequest) {
         List<CommonResponse> resultList = new ArrayList<>();
         List<Area> areaList = iAreaService.list();
+        //特殊需求，去掉石河子
+        areaList.removeIf((Area area) -> "石河子".equals(area.getAreaName()));
         List<Area> areaList1 = new ArrayList<>();
 
         areaList.forEach(area -> {
@@ -579,15 +606,14 @@
             CommonResponse commonResponse = new CommonResponse(area.getAreaName(), "0", "0");
             responseSbList.forEach(res -> {
                 String submitCode = processUtil(res.getSubmitCode());
-                if (area.getId().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
-                    commonResponse.setValue((Long.valueOf(commonResponse.getValue()) + (ObjectUtil.isNotEmpty(res.getLinks()) && StringUtils.isNumeric(res.getLinks()) ? Long.valueOf(res.getLinks()) : 0)) + "");
+                if (area.getId().toString().equals(submitCode) || isChild(area.getId(), areaList, submitCode)) {
+                    commonResponse.setValue((Double.valueOf(commonResponse.getValue()).intValue() + (ObjectUtil.isNotEmpty(res.getLinks()) ? Double.valueOf(res.getLinks()).intValue() : 0)) + "");
                 }
-
             });
             responseXfList.forEach(res1 -> {
                 String instructCode = processUtil(res1.getInstructCode());
-                if (area.getId().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
-                    commonResponse.setValue1((Long.valueOf(commonResponse.getValue1()) + (ObjectUtil.isNotEmpty(res1.getLinks()) && StringUtils.isNumeric(res1.getLinks()) ? Long.valueOf(res1.getLinks()) : 0)) + "");
+                if (area.getId().toString().equals(instructCode) || isChild(area.getId(), areaList, instructCode)) {
+                    commonResponse.setValue1((Double.valueOf(commonResponse.getValue1()).intValue() + (ObjectUtil.isNotEmpty(res1.getLinks()) ? Double.valueOf(res1.getLinks()).intValue() : 0)) + "");
                 }
             });
             resultList.add(commonResponse);
@@ -610,12 +636,12 @@
     @Override
     public List<CommonResponse> statisticsByArea(BusinessReportInfoRequest request) {
 
-        request.setEndTime(request.isReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
-        request.setBeginTime(request.isReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
+//        request.setEndTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(new Date()) : request.getEndTime());
+//        request.setBeginTime(ObjectUtil.isNotEmpty(request.getIsReal()) && request.getIsReal() ? DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -1)) : request.getBeginTime());
         return request.isFlag() ? clickData(request) :
                 (iBusinessAccessService.getAccessStatus("3-qy") &&
                         (ToolUtils.pageArr[2] == request.getPage()) &&
-                        (!request.isReal())?
+                        (!(request.getIsReal() != null && request.getIsReal())) ?
                         statisticsByLocalArea(request.getThirdId()) :
                         statisticsByOtherArea(request));
     }
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 739eb99..ba8875e 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,7 +3,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index adef3d8..bd63375 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:dm://127.0.0.1:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
     username: CASIC_XINJIANG
     password: Casic203!
     dynamic:
@@ -12,7 +12,7 @@
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         master:
-          url: jdbc:dm://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+          url: jdbc:dm://127.0.0.1:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
           driver-class-name: dm.jdbc.driver.DmDriver
           username: CASIC_XINJIANG
           password: Casic203!