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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
index 3997a4c..b67319c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.model.BusinessRumor;
 import com.casic.missiles.modular.system.dao.BusinessRumorMapper;
 import com.casic.missiles.modular.system.service.IBusinessRumorService;
@@ -15,6 +16,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessRumorServiceImpl extends ServiceImpl<BusinessRumorMapper, BusinessRumor> implements IBusinessRumorService {
 
 }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
index 3997a4c..b67319c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.model.BusinessRumor;
 import com.casic.missiles.modular.system.dao.BusinessRumorMapper;
 import com.casic.missiles.modular.system.service.IBusinessRumorService;
@@ -15,6 +16,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessRumorServiceImpl extends ServiceImpl<BusinessRumorMapper, BusinessRumor> implements IBusinessRumorService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
index e38fd77..2f1d66e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessSpreadMapper;
 import com.casic.missiles.modular.system.model.BusinessSpread;
@@ -16,6 +17,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessSpreadServiceImpl extends ServiceImpl<BusinessSpreadMapper, BusinessSpread> implements IBusinessSpreadService {
 
 }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
index 3997a4c..b67319c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.model.BusinessRumor;
 import com.casic.missiles.modular.system.dao.BusinessRumorMapper;
 import com.casic.missiles.modular.system.service.IBusinessRumorService;
@@ -15,6 +16,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessRumorServiceImpl extends ServiceImpl<BusinessRumorMapper, BusinessRumor> implements IBusinessRumorService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
index e38fd77..2f1d66e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessSpreadMapper;
 import com.casic.missiles.modular.system.model.BusinessSpread;
@@ -16,6 +17,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessSpreadServiceImpl extends ServiceImpl<BusinessSpreadMapper, BusinessSpread> implements IBusinessSpreadService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
index 6b7f8fe..47977ba 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.BusinessVoteRecord;
@@ -23,6 +24,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessVoteRecordServiceImpl extends ServiceImpl<BusinessVoteRecordMapper, BusinessVoteRecord> implements IBusinessVoteRecordService {
 
 

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
index 3997a4c..b67319c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.model.BusinessRumor;
 import com.casic.missiles.modular.system.dao.BusinessRumorMapper;
 import com.casic.missiles.modular.system.service.IBusinessRumorService;
@@ -15,6 +16,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessRumorServiceImpl extends ServiceImpl<BusinessRumorMapper, BusinessRumor> implements IBusinessRumorService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
index e38fd77..2f1d66e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessSpreadMapper;
 import com.casic.missiles.modular.system.model.BusinessSpread;
@@ -16,6 +17,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessSpreadServiceImpl extends ServiceImpl<BusinessSpreadMapper, BusinessSpread> implements IBusinessSpreadService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
index 6b7f8fe..47977ba 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.BusinessVoteRecord;
@@ -23,6 +24,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessVoteRecordServiceImpl extends ServiceImpl<BusinessVoteRecordMapper, BusinessVoteRecord> implements IBusinessVoteRecordService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 00bc8dc..2b73b75 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -1,12 +1,23 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.casic.missiles.modular.system.dao.CmdBodyRoamMapper;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.modular.system.model.Judgment;
 import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.service.IJudgmentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务实现类
@@ -19,4 +30,61 @@
 @DS("subdepot")
 public class CmdBodyRoamServiceImpl extends ServiceImpl<CmdBodyRoamMapper, CmdBodyRoam> implements ICmdBodyRoamService {
 
+
+    @Autowired
+    private AbstractDictService dictService;
+
+    @Autowired
+    private IJudgmentService judgmentService;
+    //涉党政军类
+    private 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");
+    }
+    //涉疆敏感事件
+    private static Map<String, String> sjmgMap = new HashMap<String, String>();
+    static {
+        sjmgMap.put("涉疆案件", "6-1");
+        sjmgMap.put("涉疆事件", "6-2");
+        sjmgMap.put("其他相关", "6-3");
+    }
+    //常规信息
+    private static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+    static {
+        cgxxHashMap.put("安全生产", "7-1");
+        cgxxHashMap.put("网络安全", "7-2");
+        cgxxHashMap.put("信息安全", "7-3");
+        cgxxHashMap.put("灾害类", "7-4");
+        cgxxHashMap.put("交通安全", "7-5");
+        cgxxHashMap.put("食品安全", "7-6");
+        cgxxHashMap.put("其他相关", "7-7");
+    }
+
+    @Override
+    public List<CmdBodyRoam> getRoamListByTime(String begTime, String endTime) {
+
+        QueryWrapper<CmdBodyRoam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("roam_time",begTime);
+        queryWrapper.le("roam_time",endTime);
+        //取初步研判状态及以后的信息
+        queryWrapper.ge("prev_operation",2);
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public List<Map<String, Object>> getMapList(String begTime, String endTime) {
+        List<Dict> dictList= dictService.findInDictByCode("carType");
+        List<TagResponse>  responseList = this.baseMapper.getMapList(begTime,endTime);
+
+        List<Judgment>  judgmentList =  judgmentService.list();
+        Map<String, Object> sdzjMap= new HashMap<>();
+        responseList.forEach(tagResponse -> {
+//            sdzjHashMap.
+
+        });
+        return null;
+    }
 }

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
index 3997a4c..b67319c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.model.BusinessRumor;
 import com.casic.missiles.modular.system.dao.BusinessRumorMapper;
 import com.casic.missiles.modular.system.service.IBusinessRumorService;
@@ -15,6 +16,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessRumorServiceImpl extends ServiceImpl<BusinessRumorMapper, BusinessRumor> implements IBusinessRumorService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
index e38fd77..2f1d66e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessSpreadMapper;
 import com.casic.missiles.modular.system.model.BusinessSpread;
@@ -16,6 +17,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessSpreadServiceImpl extends ServiceImpl<BusinessSpreadMapper, BusinessSpread> implements IBusinessSpreadService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
index 6b7f8fe..47977ba 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.BusinessVoteRecord;
@@ -23,6 +24,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessVoteRecordServiceImpl extends ServiceImpl<BusinessVoteRecordMapper, BusinessVoteRecord> implements IBusinessVoteRecordService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 00bc8dc..2b73b75 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -1,12 +1,23 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.casic.missiles.modular.system.dao.CmdBodyRoamMapper;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.modular.system.model.Judgment;
 import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.service.IJudgmentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务实现类
@@ -19,4 +30,61 @@
 @DS("subdepot")
 public class CmdBodyRoamServiceImpl extends ServiceImpl<CmdBodyRoamMapper, CmdBodyRoam> implements ICmdBodyRoamService {
 
+
+    @Autowired
+    private AbstractDictService dictService;
+
+    @Autowired
+    private IJudgmentService judgmentService;
+    //涉党政军类
+    private 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");
+    }
+    //涉疆敏感事件
+    private static Map<String, String> sjmgMap = new HashMap<String, String>();
+    static {
+        sjmgMap.put("涉疆案件", "6-1");
+        sjmgMap.put("涉疆事件", "6-2");
+        sjmgMap.put("其他相关", "6-3");
+    }
+    //常规信息
+    private static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+    static {
+        cgxxHashMap.put("安全生产", "7-1");
+        cgxxHashMap.put("网络安全", "7-2");
+        cgxxHashMap.put("信息安全", "7-3");
+        cgxxHashMap.put("灾害类", "7-4");
+        cgxxHashMap.put("交通安全", "7-5");
+        cgxxHashMap.put("食品安全", "7-6");
+        cgxxHashMap.put("其他相关", "7-7");
+    }
+
+    @Override
+    public List<CmdBodyRoam> getRoamListByTime(String begTime, String endTime) {
+
+        QueryWrapper<CmdBodyRoam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("roam_time",begTime);
+        queryWrapper.le("roam_time",endTime);
+        //取初步研判状态及以后的信息
+        queryWrapper.ge("prev_operation",2);
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public List<Map<String, Object>> getMapList(String begTime, String endTime) {
+        List<Dict> dictList= dictService.findInDictByCode("carType");
+        List<TagResponse>  responseList = this.baseMapper.getMapList(begTime,endTime);
+
+        List<Judgment>  judgmentList =  judgmentService.list();
+        Map<String, Object> sdzjMap= new HashMap<>();
+        responseList.forEach(tagResponse -> {
+//            sdzjHashMap.
+
+        });
+        return null;
+    }
 }
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 7261c84..179baf4 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
@@ -5,9 +5,15 @@
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.modular.system.dao.JudgmentMapper;
+import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.model.Judgment;
@@ -26,6 +32,7 @@
  * @since 2023-03-15
  */
 @Service
+@DS("master")
 public class JudgmentServiceImpl extends ServiceImpl<JudgmentMapper, Judgment> implements IJudgmentService {
 
     @Autowired
@@ -49,7 +56,7 @@
                 judgmentList.forEach(judgment -> {
                     if(dict.getName().equals(judgment.getFirstTitle())&& ObjectUtil.isNotEmpty(judgment.getCreateTime())){
                         if(DateUtil.isSameDay(DateUtil.parseDate(judgment.getCreateTime()), dateTime)){
-                            tagMap.put(dict.getName(),tagMap.get(dict.getName())+judgment.getTitleCount());
+//                            tagMap.put(dict.getName(),tagMap.get(dict.getName())+judgment.getTitleCount());
                         }
                     }
                 });
@@ -62,6 +69,32 @@
     }
 
     @Override
+    public List<Judgment> getListByTime(JudgmentRequest judgmentRequest) {
+        QueryWrapper<Judgment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()),"endTime",judgmentRequest.getBeginTime());
+        queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()),"endTime",judgmentRequest.getEndTime());
+        List<Judgment> judgmentList = this.list(queryWrapper);
+        judgmentList.forEach(judgment -> {
+            if(ObjectUtil.isNotEmpty(judgment.getFirstTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle1List(list);
+            }
+            if(ObjectUtil.isNotEmpty(judgment.getSecondTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle2List(list);
+            }
+            if(ObjectUtil.isNotEmpty(judgment.getThirdTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle3List(list);
+            }
+        });
+        return judgmentList;
+    }
+
+    @Override
     public Map<String, Object>statisticsByTag() {
 
         List<Judgment> judgmentList = this.list();
@@ -76,7 +109,7 @@
                 //统计二级标签数量
                 judgmentList.forEach(judgment -> {
                     if(secondTagDict.getName().equals(judgment.getSecondTitle())){
-                        hashMap.put(secondTagDict.getName(),hashMap.get(secondTagDict.getName())+judgment.getTitleCount());
+//                        hashMap.put(secondTagDict.getName(),hashMap.get(secondTagDict.getName())+judgment.getTitleCount());
                     }
                 });
             });

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
index 3997a4c..b67319c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.model.BusinessRumor;
 import com.casic.missiles.modular.system.dao.BusinessRumorMapper;
 import com.casic.missiles.modular.system.service.IBusinessRumorService;
@@ -15,6 +16,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessRumorServiceImpl extends ServiceImpl<BusinessRumorMapper, BusinessRumor> implements IBusinessRumorService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
index e38fd77..2f1d66e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessSpreadMapper;
 import com.casic.missiles.modular.system.model.BusinessSpread;
@@ -16,6 +17,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessSpreadServiceImpl extends ServiceImpl<BusinessSpreadMapper, BusinessSpread> implements IBusinessSpreadService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
index 6b7f8fe..47977ba 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.BusinessVoteRecord;
@@ -23,6 +24,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessVoteRecordServiceImpl extends ServiceImpl<BusinessVoteRecordMapper, BusinessVoteRecord> implements IBusinessVoteRecordService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 00bc8dc..2b73b75 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -1,12 +1,23 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.casic.missiles.modular.system.dao.CmdBodyRoamMapper;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.modular.system.model.Judgment;
 import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.service.IJudgmentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务实现类
@@ -19,4 +30,61 @@
 @DS("subdepot")
 public class CmdBodyRoamServiceImpl extends ServiceImpl<CmdBodyRoamMapper, CmdBodyRoam> implements ICmdBodyRoamService {
 
+
+    @Autowired
+    private AbstractDictService dictService;
+
+    @Autowired
+    private IJudgmentService judgmentService;
+    //涉党政军类
+    private 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");
+    }
+    //涉疆敏感事件
+    private static Map<String, String> sjmgMap = new HashMap<String, String>();
+    static {
+        sjmgMap.put("涉疆案件", "6-1");
+        sjmgMap.put("涉疆事件", "6-2");
+        sjmgMap.put("其他相关", "6-3");
+    }
+    //常规信息
+    private static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+    static {
+        cgxxHashMap.put("安全生产", "7-1");
+        cgxxHashMap.put("网络安全", "7-2");
+        cgxxHashMap.put("信息安全", "7-3");
+        cgxxHashMap.put("灾害类", "7-4");
+        cgxxHashMap.put("交通安全", "7-5");
+        cgxxHashMap.put("食品安全", "7-6");
+        cgxxHashMap.put("其他相关", "7-7");
+    }
+
+    @Override
+    public List<CmdBodyRoam> getRoamListByTime(String begTime, String endTime) {
+
+        QueryWrapper<CmdBodyRoam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("roam_time",begTime);
+        queryWrapper.le("roam_time",endTime);
+        //取初步研判状态及以后的信息
+        queryWrapper.ge("prev_operation",2);
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public List<Map<String, Object>> getMapList(String begTime, String endTime) {
+        List<Dict> dictList= dictService.findInDictByCode("carType");
+        List<TagResponse>  responseList = this.baseMapper.getMapList(begTime,endTime);
+
+        List<Judgment>  judgmentList =  judgmentService.list();
+        Map<String, Object> sdzjMap= new HashMap<>();
+        responseList.forEach(tagResponse -> {
+//            sdzjHashMap.
+
+        });
+        return null;
+    }
 }
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 7261c84..179baf4 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
@@ -5,9 +5,15 @@
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.modular.system.dao.JudgmentMapper;
+import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.model.Judgment;
@@ -26,6 +32,7 @@
  * @since 2023-03-15
  */
 @Service
+@DS("master")
 public class JudgmentServiceImpl extends ServiceImpl<JudgmentMapper, Judgment> implements IJudgmentService {
 
     @Autowired
@@ -49,7 +56,7 @@
                 judgmentList.forEach(judgment -> {
                     if(dict.getName().equals(judgment.getFirstTitle())&& ObjectUtil.isNotEmpty(judgment.getCreateTime())){
                         if(DateUtil.isSameDay(DateUtil.parseDate(judgment.getCreateTime()), dateTime)){
-                            tagMap.put(dict.getName(),tagMap.get(dict.getName())+judgment.getTitleCount());
+//                            tagMap.put(dict.getName(),tagMap.get(dict.getName())+judgment.getTitleCount());
                         }
                     }
                 });
@@ -62,6 +69,32 @@
     }
 
     @Override
+    public List<Judgment> getListByTime(JudgmentRequest judgmentRequest) {
+        QueryWrapper<Judgment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()),"endTime",judgmentRequest.getBeginTime());
+        queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()),"endTime",judgmentRequest.getEndTime());
+        List<Judgment> judgmentList = this.list(queryWrapper);
+        judgmentList.forEach(judgment -> {
+            if(ObjectUtil.isNotEmpty(judgment.getFirstTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle1List(list);
+            }
+            if(ObjectUtil.isNotEmpty(judgment.getSecondTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle2List(list);
+            }
+            if(ObjectUtil.isNotEmpty(judgment.getThirdTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle3List(list);
+            }
+        });
+        return judgmentList;
+    }
+
+    @Override
     public Map<String, Object>statisticsByTag() {
 
         List<Judgment> judgmentList = this.list();
@@ -76,7 +109,7 @@
                 //统计二级标签数量
                 judgmentList.forEach(judgment -> {
                     if(secondTagDict.getName().equals(judgment.getSecondTitle())){
-                        hashMap.put(secondTagDict.getName(),hashMap.get(secondTagDict.getName())+judgment.getTitleCount());
+//                        hashMap.put(secondTagDict.getName(),hashMap.get(secondTagDict.getName())+judgment.getTitleCount());
                     }
                 });
             });
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 db06eff..1bfbff9 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
@@ -3,6 +3,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -34,6 +35,7 @@
  * @since 2023-03-15
  */
 @Service
+@DS("master")
 public class RealtimeWorkServiceImpl extends ServiceImpl<RealtimeWorkMapper, RealtimeWork> implements IRealtimeWorkService {
 
     @Resource

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 1dbe2a0..929a82e 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
@@ -1,15 +1,23 @@
 package com.casic.missiles.modular.system.controller;
 
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
+import com.casic.missiles.modular.system.exception.BusinessException;
 import com.casic.missiles.modular.system.model.Judgment;
+import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.casic.missiles.modular.system.service.IJudgmentService;
-import com.casic.missiles.modular.system.ssl.LinkTestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,6 +39,8 @@
 
     @Resource
     private IJudgmentService judgmentService;
+    @Autowired
+    private ICmdBodyRoamService cmdBodyRoamService;
 
 
     /**
@@ -38,8 +48,12 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String condition) {
-        return ResponseData.success(judgmentService.list(null));
+    public Object list(@RequestBody JudgmentRequest judgmentRequest, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        List<Judgment> judgmentList = judgmentService.getListByTime(judgmentRequest);
+        return ResponseData.success(judgmentList);
     }
 
     /**
@@ -60,8 +74,17 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(@RequestBody Judgment judgment) {
-        judgmentService.save(judgment);
-        return ResponseData.success();
+
+        if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){
+            judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){
+            judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true));
+        }
+        if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){
+            judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true));
+        }
+        return ResponseData.success(judgmentService.save(judgment));
     }
 
     /**
@@ -134,7 +157,7 @@
     @ResponseBody
     public Object testUrl(String url) throws Exception {
 
-        LinkTestUtil.testUrl(url);
+        cmdBodyRoamService.getMapList("","");
         return true;
 
     }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index cea6720..fa21c57 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -56,7 +56,33 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(@RequestBody HashMap<String, Object> map) {
-        return ResponseData.success(summaryService.getSummaryList(map));
+
+
+        List<Summary> summaryList = (List<Summary>) summaryService.getSummaryList(map);
+        summaryList.forEach(summary -> {
+            if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setCommonRequestList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getSpreadResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getSpreadResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setSpreadResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getForeignResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getForeignResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setForeignResultList(list);
+            }
+            if (ObjectUtil.isNotEmpty(summary.getDiscoveryResult())) {
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getDiscoveryResult());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                summary.setDiscoveryResultList(list);
+            }
+        });
+
+        return ResponseData.success(summaryList);
     }
 
     /**
@@ -128,11 +154,8 @@
      */
     @RequestMapping(value = "/detail")
     @ResponseBody
-    public Object detail(@RequestBody IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        Summary summary = summaryService.getById(idDTO.getId());
+    public Object detail(Long id) {
+        Summary summary = summaryService.getById(id);
         if (ObjectUtil.isNotEmpty(summary.getPlateResult())) {
             JSONArray jsonArray = (JSONArray) JSONArray.parse(summary.getPlateResult());
             List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
index 63f7949..7d8c481 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/CmdBodyRoamMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.modular.system.dao;
 
-import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.dto.TagResponse;
+import com.casic.missiles.modular.system.model.CmdBodyRoam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,6 @@
  */
 public interface CmdBodyRoamMapper extends BaseMapper<CmdBodyRoam> {
 
+    List<TagResponse> getMapList(@Param("begTime") String begTime, @Param("endTime") String endTime);
+
 }
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 20d8b56..9fe0e36 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
@@ -4,20 +4,42 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.CmdBodyRoam">
-        <id column="roam_id" property="roamId" />
-        <result column="body_id" property="bodyId" />
-        <result column="roam_operation" property="roamOperation" />
-        <result column="prev_operation" property="prevOperation" />
-        <result column="roam_time" property="roamTime" />
-        <result column="roam_desc" property="roamDesc" />
-        <result column="opinion_one" property="opinionOne" />
-        <result column="opinion_two" property="opinionTwo" />
-        <result column="roam_ident" property="roamIdent" />
+        <id column="roam_id" property="roamId"/>
+        <result column="body_id" property="bodyId"/>
+        <result column="roam_operation" property="roamOperation"/>
+        <result column="prev_operation" property="prevOperation"/>
+        <result column="roam_time" property="roamTime"/>
+        <result column="roam_desc" property="roamDesc"/>
+        <result column="opinion_one" property="opinionOne"/>
+        <result column="opinion_two" property="opinionTwo"/>
+        <result column="roam_ident" property="roamIdent"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        roam_id AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
+        roam_id
+        AS roamId, body_id AS bodyId, roam_operation AS roamOperation, prev_operation AS prevOperation, roam_time AS roamTime, roam_desc AS roamDesc, opinion_one AS opinionOne, opinion_two AS opinionTwo, roam_ident AS roamIdent
     </sql>
 
+
+    <select id="getMapList" resultType="com.casic.missiles.modular.system.dto.TagResponse">
+        SELECT cci.`body_id` AS bodyId,
+        cci.`controls_classify` AS classify,
+        cci.`tag_id` AS tagId
+        FROM cmd_controls_info cci
+        WHERE cci.body_id IN
+        (SELECT cbr.`body_id`
+        FROM cmd_body_roam cbr
+        WHERE 1 = 1
+        <if test="begTime!='' and begTime!=null">
+            AND cbr.roam_time <![CDATA[  >=  ]]> #{begTime}
+        </if>
+        <if test="endTime!='' and endTime!=null">
+            AND cbr.roam_time <![CDATA[  <=  ]]> #{endTime}
+        </if>
+            )
+        AND (cci.`controls_classify` LIKE '2%' OR cci.`controls_classify` LIKE '6%' OR
+        cci.`controls_classify` LIKE '7%')
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
index 9ea4c84..75b58df 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/JudgmentMapper.xml
@@ -8,7 +8,7 @@
         <result column="JUDGMENT_TOTAL" property="judgmentTotal" />
         <result column="FIRST_TITLE" property="firstTitle" />
         <result column="SECOND_TITLE" property="secondTitle" />
-        <result column="TITLE_COUNT" property="titleCount" />
+        <result column="THIRD_TITLE" property="thirdTitle" />
         <result column="START_TIME" property="startTime" />
         <result column="END_TIME" property="endTime" />
         <result column="CREATE_TIME" property="createTime" />
@@ -17,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, TITLE_COUNT AS titleCount, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
+        ID AS id, JUDGMENT_TOTAL AS judgmentTotal, FIRST_TITLE AS firstTitle, SECOND_TITLE AS secondTitle, THIRD_TITLE AS thirdTitle, START_TIME AS startTime, END_TIME AS endTime, CREATE_TIME AS createTime, DESCRIPTION AS description
     </sql>
 
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
index c2c7690..bffddd8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml
@@ -25,7 +25,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime,
-        DESCRIPTION AS description,PLATE_RESULT AS plateResult
+        DESCRIPTION AS description,PLATE_RESULT AS plateResult,DISCOVERY_RESULT AS discoveryResult,FOREIGN_RESULT AS foreignResult,SPREAD_RESULT AS spreadResult
     </sql>
 
     <select id="getSummaryList" resultType="com.casic.missiles.modular.system.model.Summary" parameterType="hashmap">
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
new file mode 100644
index 0000000..0119d89
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/JudgmentRequest.java
@@ -0,0 +1,12 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class JudgmentRequest {
+
+    private String beginTime;
+
+    private String endTime;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
new file mode 100644
index 0000000..820ab1f
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+@Data
+public class TagResponse {
+
+    private String bodyId;
+
+    private String classify;
+
+    private String tagId;
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
index 057f783..b681027 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.modular.system.dto.CommonRequest;
 import lombok.Data;
 
 import java.io.Serializable;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -41,22 +43,22 @@
     @TableField("FIRST_TITLE")
     private String firstTitle;
     /**
-     * 二级标签
+     * 标签2
      */
     @TableField("SECOND_TITLE")
     private String secondTitle;
     /**
-     * 标签对应数量
+     * 标签3
      */
-    @TableField("TITLE_COUNT")
-    private Integer titleCount;
+    @TableField("THIRD_TITLE")
+    private String thirdTitle;
     /**
      * 开始时间
      */
     @TableField("START_TIME")
     private String startTime;
     /**
-     * 结束时间
+     * 结束时间,用于统计时间
      */
     @TableField("END_TIME")
     private String endTime;
@@ -71,6 +73,17 @@
     @TableField("DESCRIPTION")
     private String description;
 
+
+    //涉党政军标签
+    @TableField(exist = false)
+    private List<CommonRequest> title1List;
+    //涉疆敏感事件标签
+    @TableField(exist = false)
+    private List<CommonRequest> title2List;
+    //常规信息标签
+    @TableField(exist = false)
+    private List<CommonRequest> title3List;
+
     @Override
     public String toString() {
         return "Judgment{" +
@@ -78,7 +91,6 @@
         ", judgmentTotal=" + judgmentTotal +
         ", firstTitle=" + firstTitle +
         ", secondTitle=" + secondTitle +
-        ", titleCount=" + titleCount +
         ", startTime=" + startTime +
         ", endTime=" + endTime +
         ", createTime=" + createTime +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
index b04ec44..323cee8 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java
@@ -3,6 +3,9 @@
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务类
@@ -13,4 +16,10 @@
  */
 public interface ICmdBodyRoamService extends IService<CmdBodyRoam> {
 
+    //根据时间获取研判总数
+    List<CmdBodyRoam>  getRoamListByTime(String begTime,String endTime);
+
+    //获取涉党、涉疆、常规信息统计信息
+    List<Map<String,Object>> getMapList(String begTime,String endTime);
+
 }
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 5c83be7..44604b6 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
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.model.Judgment;
 
 import java.util.HashMap;
@@ -22,4 +23,6 @@
 
     Map<String, Object> statisticsByTag();
 
+    List<Judgment> getListByTime(JudgmentRequest judgmentRequest);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
index 963ea70..d89a7f1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessConnectTestrecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.modular.system.config.PoolConfig;
@@ -46,6 +47,7 @@
  * @since 2023-05-17
  */
 @Service
+@DS("master")
 public class BusinessConnectTestrecordServiceImpl extends ServiceImpl<BusinessConnectTestrecordMapper, BusinessConnectTestrecord> implements IBusinessConnectTestrecordService {
 
     @Autowired
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
index 48bc01f..c113940 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessHandleRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessHandleRecordMapper;
 import com.casic.missiles.modular.system.model.BusinessHandleRecord;
@@ -17,6 +18,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessHandleRecordServiceImpl extends ServiceImpl<BusinessHandleRecordMapper, BusinessHandleRecord> implements IBusinessHandleRecordService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
index 3b6d45c..b45288c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessReportInfoServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+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.core.application.service.AbstractDictService;
@@ -30,6 +31,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessReportInfoServiceImpl extends ServiceImpl<BusinessReportInfoMapper, BusinessReportInfo> implements IBusinessReportInfoService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
index 3997a4c..b67319c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessRumorServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.casic.missiles.modular.system.model.BusinessRumor;
 import com.casic.missiles.modular.system.dao.BusinessRumorMapper;
 import com.casic.missiles.modular.system.service.IBusinessRumorService;
@@ -15,6 +16,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessRumorServiceImpl extends ServiceImpl<BusinessRumorMapper, BusinessRumor> implements IBusinessRumorService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
index e38fd77..2f1d66e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessSpreadServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.system.dao.BusinessSpreadMapper;
 import com.casic.missiles.modular.system.model.BusinessSpread;
@@ -16,6 +17,7 @@
  * @since 2023-04-14
  */
 @Service
+@DS("master")
 public class BusinessSpreadServiceImpl extends ServiceImpl<BusinessSpreadMapper, BusinessSpread> implements IBusinessSpreadService {
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
index 6b7f8fe..47977ba 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessVoteRecordServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.BusinessVoteRecord;
@@ -23,6 +24,7 @@
  * @since 2023-06-12
  */
 @Service
+@DS("master")
 public class BusinessVoteRecordServiceImpl extends ServiceImpl<BusinessVoteRecordMapper, BusinessVoteRecord> implements IBusinessVoteRecordService {
 
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
index 00bc8dc..2b73b75 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java
@@ -1,12 +1,23 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.casic.missiles.core.application.service.AbstractDictService;
+import com.casic.missiles.modular.system.dto.TagResponse;
 import com.casic.missiles.modular.system.model.CmdBodyRoam;
 import com.casic.missiles.modular.system.dao.CmdBodyRoamMapper;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.modular.system.model.Judgment;
 import com.casic.missiles.modular.system.service.ICmdBodyRoamService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.service.IJudgmentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 信息流转记录表 服务实现类
@@ -19,4 +30,61 @@
 @DS("subdepot")
 public class CmdBodyRoamServiceImpl extends ServiceImpl<CmdBodyRoamMapper, CmdBodyRoam> implements ICmdBodyRoamService {
 
+
+    @Autowired
+    private AbstractDictService dictService;
+
+    @Autowired
+    private IJudgmentService judgmentService;
+    //涉党政军类
+    private 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");
+    }
+    //涉疆敏感事件
+    private static Map<String, String> sjmgMap = new HashMap<String, String>();
+    static {
+        sjmgMap.put("涉疆案件", "6-1");
+        sjmgMap.put("涉疆事件", "6-2");
+        sjmgMap.put("其他相关", "6-3");
+    }
+    //常规信息
+    private static Map<String, String> cgxxHashMap = new HashMap<String, String>();
+    static {
+        cgxxHashMap.put("安全生产", "7-1");
+        cgxxHashMap.put("网络安全", "7-2");
+        cgxxHashMap.put("信息安全", "7-3");
+        cgxxHashMap.put("灾害类", "7-4");
+        cgxxHashMap.put("交通安全", "7-5");
+        cgxxHashMap.put("食品安全", "7-6");
+        cgxxHashMap.put("其他相关", "7-7");
+    }
+
+    @Override
+    public List<CmdBodyRoam> getRoamListByTime(String begTime, String endTime) {
+
+        QueryWrapper<CmdBodyRoam> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("roam_time",begTime);
+        queryWrapper.le("roam_time",endTime);
+        //取初步研判状态及以后的信息
+        queryWrapper.ge("prev_operation",2);
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public List<Map<String, Object>> getMapList(String begTime, String endTime) {
+        List<Dict> dictList= dictService.findInDictByCode("carType");
+        List<TagResponse>  responseList = this.baseMapper.getMapList(begTime,endTime);
+
+        List<Judgment>  judgmentList =  judgmentService.list();
+        Map<String, Object> sdzjMap= new HashMap<>();
+        responseList.forEach(tagResponse -> {
+//            sdzjHashMap.
+
+        });
+        return null;
+    }
 }
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 7261c84..179baf4 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
@@ -5,9 +5,15 @@
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.modular.system.dao.JudgmentMapper;
+import com.casic.missiles.modular.system.dto.CommonRequest;
+import com.casic.missiles.modular.system.dto.JudgmentRequest;
 import com.casic.missiles.modular.system.enums.DictEnum;
 import com.casic.missiles.modular.system.model.Dict;
 import com.casic.missiles.modular.system.model.Judgment;
@@ -26,6 +32,7 @@
  * @since 2023-03-15
  */
 @Service
+@DS("master")
 public class JudgmentServiceImpl extends ServiceImpl<JudgmentMapper, Judgment> implements IJudgmentService {
 
     @Autowired
@@ -49,7 +56,7 @@
                 judgmentList.forEach(judgment -> {
                     if(dict.getName().equals(judgment.getFirstTitle())&& ObjectUtil.isNotEmpty(judgment.getCreateTime())){
                         if(DateUtil.isSameDay(DateUtil.parseDate(judgment.getCreateTime()), dateTime)){
-                            tagMap.put(dict.getName(),tagMap.get(dict.getName())+judgment.getTitleCount());
+//                            tagMap.put(dict.getName(),tagMap.get(dict.getName())+judgment.getTitleCount());
                         }
                     }
                 });
@@ -62,6 +69,32 @@
     }
 
     @Override
+    public List<Judgment> getListByTime(JudgmentRequest judgmentRequest) {
+        QueryWrapper<Judgment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()),"endTime",judgmentRequest.getBeginTime());
+        queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()),"endTime",judgmentRequest.getEndTime());
+        List<Judgment> judgmentList = this.list(queryWrapper);
+        judgmentList.forEach(judgment -> {
+            if(ObjectUtil.isNotEmpty(judgment.getFirstTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle1List(list);
+            }
+            if(ObjectUtil.isNotEmpty(judgment.getSecondTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle2List(list);
+            }
+            if(ObjectUtil.isNotEmpty(judgment.getThirdTitle())){
+                JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle());
+                List<CommonRequest> list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class);
+                judgment.setTitle3List(list);
+            }
+        });
+        return judgmentList;
+    }
+
+    @Override
     public Map<String, Object>statisticsByTag() {
 
         List<Judgment> judgmentList = this.list();
@@ -76,7 +109,7 @@
                 //统计二级标签数量
                 judgmentList.forEach(judgment -> {
                     if(secondTagDict.getName().equals(judgment.getSecondTitle())){
-                        hashMap.put(secondTagDict.getName(),hashMap.get(secondTagDict.getName())+judgment.getTitleCount());
+//                        hashMap.put(secondTagDict.getName(),hashMap.get(secondTagDict.getName())+judgment.getTitleCount());
                     }
                 });
             });
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 db06eff..1bfbff9 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
@@ -3,6 +3,7 @@
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -34,6 +35,7 @@
  * @since 2023-03-15
  */
 @Service
+@DS("master")
 public class RealtimeWorkServiceImpl extends ServiceImpl<RealtimeWorkMapper, RealtimeWork> implements IRealtimeWorkService {
 
     @Resource
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java
index bc41b82..0c029dd 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java
@@ -22,6 +22,7 @@
  * @since 2023-03-15
  */
 @Service
+@DS("master")
 public class SummaryServiceImpl extends ServiceImpl<SummaryMapper, Summary> implements ISummaryService {
 
     @Resource