Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

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

@@ -613,20 +613,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
         }else {
             surveyInfoAllDto.setSurveyDetails(BeanDtoUtils.convert(surveyDetails, SurveyDetailsDto.class));
         }
-        QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
-        informationQueryWrapper.eq("survey_information_id", surveyInformationId);
-        Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
-        if(information == null){
-            surveyInfoAllDto.setInformation(new InformationDto());
-        }else {
-            surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
-        }
+
+//        商务信息
         QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
         commercialQueryWrapper.eq("survey_information_id", surveyInformationId);
         Commercial commercial = commercialService.getBaseMapper().selectOne(commercialQueryWrapper);
         if(commercial==null){
             commercial=new   Commercial();
         }
+
         commercial.setApplicant(peasantHousehold.getOwnersName());
         commercial.setIdCard(peasantHousehold.getIdCard());
         commercial.setTelephone(peasantHousehold.getTelephone());
@@ -634,6 +629,20 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
         commercial.setProjectAddressName(peasantHousehold.getProjectAddressName());
         commercial.setProjectAddressDetail(peasantHousehold.getProjectAddressDetail());
         commercial.setLegalContactTelephone(peasantHousehold.getTelephone());
+
+//        资料归档
+        QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
+        informationQueryWrapper.eq("survey_information_id", surveyInformationId);
+        Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
+        if(information == null){
+            surveyInfoAllDto.setInformation(new InformationDto());
+        }else {
+            // 将商务信息的房产证明文件数据赋值给资料归档的房产证明文件
+            information.setCardFile(commercial.getIdCardCredit());
+            surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
+        }
+
+
         if(information == null){
             CommercialDto commercialDto = BeanDtoUtils.convert(commercial, CommercialDto.class);
             commercialDto.setType("zrr");

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

@@ -41,7 +41,7 @@ public class AppletMonitorController {
     StationBasicMapper stationBasicMapper;
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "风机布置图-总概览")
+    @ApiOperation(value = "座舱")
     @GetMapping("/CockpitData")
     public ResponseModel<Map<String, Object>> getData(@RequestParam(value = "code") String code,
                                                              @RequestParam(value = "level") String level) {

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

@@ -82,9 +82,22 @@ public class AppletMonitorServiceImpl {
        List<ESEquipmentsDTO> equipmentsDTOS =  monitorFanIndicator.getFanStatusList(String.valueOf(stationBasic.getSequenceNbr()));
        Map<String, Long> countMap = equipmentsDTOS.stream()
                .collect(Collectors.groupingBy(ESEquipmentsDTO::getAddress, Collectors.counting()));
-       data.put("closeNum", countMap.containsKey("停机状态") ? String.valueOf(countMap.get("停机状态")) : "0");
-       data.put("operationNum",Integer.parseInt(num) -  Integer.parseInt(data.get("closeNum").toString()));
 
+       HashMap<String, Object> colorMap = new HashMap<>();
+       colorMap.put("正常运行",0);
+       colorMap.put("报警运行",0);
+       colorMap.put("停机状态",0);
+       colorMap.put("故障状态",0);
+       colorMap.put("限功率",0);
+       colorMap.put("待机状态",0);
+       colorMap.put("维护状态",0);
+       colorMap.put("通讯中断",0);
+
+       countMap.keySet().forEach(e->{
+           colorMap.put(e,countMap.get(e));
+
+       });
+       data.put("statusMap",colorMap);
        Map<String, Object> stationMark = idxFeign.getStationMarkList(stationBasic.getProjectOrgCode(),"1","4");
       // Map<String, Object> result = stationMark.getResult();
        List<String> list = Arrays.asList("P1", "S1", "H2", "V1");