feat(screen): 新增自核查展示

dev-config/src/main/java/com/tykj/dev/config/domin/MapCheckVO.java

@@ -6,6 +6,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 大屏自核查地图展示VO
  *
@@ -24,6 +26,8 @@ public class MapCheckVO {
     @ApiModelProperty(value = "区域名称")
     private String areaName;
 
+    @ApiModelProperty(value = "预警信息")
+    private List<CheckUnitInfoList> data;
 
 
 }

dev-screen/src/main/java/com/tykj/dev/device/screen/subject/service/CheckMapTask.java

@@ -10,7 +10,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author ozoz
@@ -21,6 +24,7 @@ import java.util.List;
 public class CheckMapTask {
 
     private final static String ZJ_ID = "8017d86d-cf3c-1fe3-90ea-f8a8333a2254";
+    Map<Integer, List<CheckUnitInfo>> collect = new HashMap<>();
 
     @Autowired
     private UnitsDao unitsDao;
@@ -32,19 +36,28 @@ public class CheckMapTask {
     @Autowired
     private SelfCheckBillService selfCheckBillService;
 
-    public void init() {
+
+    public void initArea() {
         // 查到了所有市的信息
         List<RegionData> shis = regionDataDao.findAllByParentId(ZJ_ID);
         shis.forEach(o -> o.setRegionDatas(regionDataDao.findAllByParentId(o.getRegionId())));
 
-        List<CheckUnitInfo> checkUnitInfos = checkScreenService.statMapData();
-        List<CheckUnitInfo> selfExamination = selfCheckBillService.selectNoFinSh2Weeks();
 
 
 
+    }
+
+    public Map<Integer, List<CheckUnitInfo>> init() {
+
+        List<CheckUnitInfo> checkUnitInfos = checkScreenService.statMapData();
+        List<CheckUnitInfo> selfExamination = selfCheckBillService.selectNoFinSh2Weeks();
+
 
+        checkUnitInfos.addAll(selfExamination);
 
+        Map<Integer, List<CheckUnitInfo>> collect = checkUnitInfos.stream().collect(Collectors.groupingBy(CheckUnitInfo::getUnitId));
 
+        return collect;
 
     }
 

dev-union/src/main/resources/application.properties

 # port
-server.port=8088
+server.port=8087
 spring.application.name=equipment
 spring.profiles.active=@activatedProperties@
 logging.file=/opt/eqlog/equip.log