Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/feign/IdxFeign.java

+package com.yeejoin.amos.boot.module.jxiop.api.feign;
+
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+@FeignClient(name = "${amos.idx.name:AMOS-IDX}", path = "idx", configuration = {FeignConfiguration.class})
+public interface IdxFeign {
+
+    /**
+     * 根据风险来源查询人员红黄绿吗信息
+     */
+    @GetMapping("/jxIopAnalysis/healthIndexData")
+    FeignClientResult<Map<String, Object>> healthIndexData(@RequestParam(required = false, value = "parentCode") String parentCode,
+                                                           @RequestParam(required = false, value = "stationType") String stationType);
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/feign/McbWarningFeign.java

@@ -20,4 +20,10 @@ public interface McbWarningFeign {
     FeignClientResult<Map<String, Object>> getQrCodeCount(@RequestParam(required = false, value = "parentCode") String parentCode,
                                                           @RequestParam(value = "warningObjectType") String warningObjectType);
 
+    /**
+     * 根据风险来源查询人员红黄绿吗信息
+     */
+    @GetMapping("/task/getWarningInfoCountByObjectId")
+    FeignClientResult<Integer> getWarningInfoCountByObjectId(@RequestParam(value = "code") String code);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -174,7 +174,8 @@
             update
             `station_basic`
             set
-            `qrcode_color` = #{item.qrcodeColor}
+            `qrcode_color` = #{item.qrcodeColor},
+            rec_date = now()
             where
             project_org_code = #{item.code}
         </foreach>

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonQrCodeController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jxiop.api.Enum.QrcodeColorEnum;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.feign.IdxFeign;
 import com.yeejoin.amos.boot.module.jxiop.api.feign.McbWarningFeign;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationQrCodeStatisticsMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.PersonBasicServiceImpl;
@@ -46,6 +50,14 @@ public class PersonQrCodeController extends BaseController {
 
     @Autowired
     private SjglZsjZsbtzMapper sjglZsjZsbtzMapper;
+
+    @Autowired
+    private IdxFeign idxFeign;
+
+    @Autowired
+    private StationBasicMapper stationBasicMapper;
+
+
     /**
      * 评估大屏 - 人员赋码环形图查询
      *
@@ -209,4 +221,90 @@ public class PersonQrCodeController extends BaseController {
         return Math.abs(multiply.doubleValue());
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/getStationDetailInfo")
+    @ApiOperation(httpMethod = "GET", value = "评估大屏 - 场站信息查询", notes = "评估大屏 - 场站信息查询")
+    public ResponseModel<Map<String, Object>> getStationDetailInfo(@RequestParam(required = true, value = "parentCode") String parentCode) {
+        FeignClientResult<Map<String, Object>> sevenEntity = null;
+        try {
+            sevenEntity = idxFeign.healthIndexData(parentCode, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        FeignClientResult<Integer> sevenEntityMcb = null;
+        try {
+            sevenEntityMcb = mcbWarningFeign.getWarningInfoCountByObjectId(parentCode);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String score = "100";
+        String gradeColor = "green";
+        Integer warningCount = 0;
+        if (sevenEntity != null && 200 == sevenEntity.getStatus()) {
+            Map<String, Object> result = sevenEntity.getResult();
+            score = result.get("score").toString();
+            gradeColor = result.get("gradeColor").toString();
+        }
+        if (sevenEntityMcb != null && 200 == sevenEntityMcb.getStatus()) {
+            warningCount = sevenEntityMcb.getResult();
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("score", score);
+        map.put("gradeColor", gradeColor);
+        map.put("warningCount", warningCount);
+        LambdaQueryWrapper<StationBasic> stationBasicLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        stationBasicLambdaQueryWrapper.eq(StationBasic::getProjectOrgCode, parentCode);
+        stationBasicLambdaQueryWrapper.last("limit 1");
+        StationBasic stationBasic = stationBasicMapper.selectOne(stationBasicLambdaQueryWrapper);
+        map.put("stationMasterName", stationBasic.getStationMasterName());
+        map.put("mobilePhone", stationBasic.getMobilePhone());
+        map.put("recDate", stationBasic.getRecDate());
+        return ResponseHelper.buildResponse(map);
+    }
+
+//
+//    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+//    @GetMapping(value = "/getStationDetailInfo")
+//    @ApiOperation(httpMethod = "GET", value = "评估大屏 - 场站信息查询", notes = "评估大屏 - 场站信息查询")
+//    public ResponseModel<Map<String, Object>> getStationEquipInfo(@RequestParam(required = true, value = "parentCode") String parentCode,
+//                                                                  @RequestParam(required = false, value = "column") String column) {
+//        FeignClientResult<Map<String, Object>> sevenEntity = null;
+//        try {
+//            sevenEntity = idxFeign.healthIndexData(parentCode, null);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        FeignClientResult<Integer> sevenEntityMcb = null;
+//        try {
+//            sevenEntityMcb = mcbWarningFeign.getWarningInfoCountByObjectId(parentCode);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        String score = "100";
+//        String gradeColor = "green";
+//        Integer warningCount = 0;
+//        if (sevenEntity != null && 200 == sevenEntity.getStatus()) {
+//            Map<String, Object> result = sevenEntity.getResult();
+//            score = result.get("score").toString();
+//            gradeColor = result.get("gradeColor").toString();
+//        }
+//        if (sevenEntityMcb != null && 200 == sevenEntityMcb.getStatus()) {
+//            warningCount = sevenEntityMcb.getResult();
+//        }
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("score", score);
+//        map.put("gradeColor", gradeColor);
+//        map.put("warningCount", warningCount);
+//        LambdaQueryWrapper<StationBasic> stationBasicLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        stationBasicLambdaQueryWrapper.eq(StationBasic::getProjectOrgCode, parentCode);
+//        stationBasicLambdaQueryWrapper.last("limit 1");
+//        StationBasic stationBasic = stationBasicMapper.selectOne(stationBasicLambdaQueryWrapper);
+//        map.put("stationMasterName", stationBasic.getStationMasterName());
+//        map.put("mobilePhone", stationBasic.getMobilePhone());
+//        map.put("recDate", stationBasic.getRecDate());
+//        return ResponseHelper.buildResponse(map);
+//    }
+
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -74,7 +74,7 @@
         LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE
         <where>
             <if test="parentCode != null and parentCode != ''">
-                b.COMPANY_CODE  like concat(#{parentCode},'%')
+                b.ORG_CODE  like concat(#{parentCode},'%')
             </if>
         </where>
         GROUP BY
@@ -90,7 +90,7 @@
         LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE
         <where>
             <if test="parentCode != null and parentCode != ''">
-                b.COMPANY_CODE  like concat(#{parentCode},'%')
+                b.ORG_CODE  like concat(#{parentCode},'%')
             </if>
         </where>
         GROUP BY

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -695,7 +695,7 @@ public class MonitorFanIdxController extends BaseController {
 //        if (null != stationType){
 //            gatewayId = stationBasic.getBoosterGatewayId();
 //        }
-        return ResponseHelper.buildResponse(monitorFanIndicator.getStatisticsInfo(stationId,equipmentIndexName));
+        return ResponseHelper.buildResponse(monitorFanIndicator.getStatisticsInfo(equipmentIndexName,stationId));
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/initdata/StationCacheDataInit.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -26,14 +27,19 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Component
-@RequiredArgsConstructor
 public class StationCacheDataInit implements CommandLineRunner {
-    private final StationBasicMapper stationBasicMapper;
-    private final RegionMapper regionMapper;
-    private final MapRegionMapper mapRegionMapper;
-    private final SjglZsjZsbtzMapper sjglZsjZsbtzMapper;
-    private final CommonServiceImpl commonServiceImpl;
-    private final RedisTemplate redisTemplate;
+    @Autowired
+    private  StationBasicMapper stationBasicMapper;
+    @Autowired
+    private  RegionMapper regionMapper;
+    @Autowired
+    private  MapRegionMapper mapRegionMapper;
+    @Autowired
+    private  SjglZsjZsbtzMapper sjglZsjZsbtzMapper;
+    @Autowired
+    private  CommonServiceImpl commonServiceImpl;
+    @Autowired
+    private  RedisTemplate redisTemplate;
     Logger logger = LoggerFactory.getLogger(StationCacheDataInit.class);
 
     public void run(String... args) throws Exception {

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -341,7 +341,8 @@ public class CommonServiceImpl {
     }
 
     public StationCacheInfoDto getStationCacheInfoDtoByStationId(String stationId) {
-        return getListStationCacheInfoDto().stream().filter(stationCacheInfoDto -> stationCacheInfoDto.getStationId().equals(stationId)).collect(Collectors.toList()).get(0);
+        StationCacheInfoDto stationCacheInfoDto = this.getListStationCacheInfoDto().stream().filter(stationCacheInfoDto1 -> stationCacheInfoDto1.getStationId().equals(stationId)).collect(Collectors.toList()).get(0);
+        return stationCacheInfoDto;
     }
 
     public String getFanDevicePrefix(String stationid) {