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-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java

@@ -49,7 +49,7 @@ public class SurveyInformationDto  extends BaseDto {
     @ApiModelProperty(value = "制单人")
     private String creator;
 
-    @JsonFormat(pattern="yyyy-MM-dd HH:ss:mm")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "制单时间")
     private Date creatorTime;
 

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

@@ -449,7 +449,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
             surveyInfoAllDto.getSurveyInformation().setIsPermanent("1");
         }
         surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());
-        surveyInfoAllDto.getSurveyInformation().setCreatorTime(new Date());
         QueryWrapper<SurveyDetails> surveyDetailsQueryWrapper = new QueryWrapper<>();
         surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
         SurveyDetails surveyDetails = surveyDetailsService.getBaseMapper().selectOne(surveyDetailsQueryWrapper);
@@ -605,7 +604,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
             surveyInfoAllDto.getSurveyInformation().setIsPermanent("1");
         }
         surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());
-        surveyInfoAllDto.getSurveyInformation().setCreatorTime(new Date());
         QueryWrapper<SurveyDetails> surveyDetailsQueryWrapper = new QueryWrapper<>();
         surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
         SurveyDetails surveyDetails = surveyDetailsService.getBaseMapper().selectOne(surveyDetailsQueryWrapper);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointVarCentralValue.java

@@ -201,4 +201,10 @@ public class IdxBizFanPointVarCentralValue{
      */
     @TableField("ANALYSIS_POINT_NAME")
     private String analysisPointName;
+
+    /**
+     *
+     */
+    @TableField("ORG_CODE")
+    private String orgCode;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java

@@ -203,4 +203,7 @@ public class IdxBizPvPointVarCentralValue{
      */
     @TableField("PROCESS_POINT1_ID")
     private String processPoint1Id;
+
+    @TableField("ORG_CODE")
+    private String orgCode;
 }

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

@@ -1009,6 +1009,7 @@ public class CommonServiceImpl {
                     idxBizFanPointVarCentralValue
                             .setSubSystem(IdxBizFanPointProcessVariableClassification.getSubSystem());
                     idxBizFanPointVarCentralValue.setNumber(IdxBizFanPointProcessVariableClassification.getNumber());
+                    idxBizFanPointVarCentralValue.setOrgCode(IdxBizFanPointProcessVariableClassification.getOrgCode());
                     idxBizFanPointVarCentralValue
                             .setEquipmentName(IdxBizFanPointProcessVariableClassification.getEquipmentName());
                     idxBizFanPointVarCentralValueMapper.insert(idxBizFanPointVarCentralValue);
@@ -1212,6 +1213,7 @@ public class CommonServiceImpl {
                     idxBizPvPointVarCentralValue.setArae(idxBizPvPointProcessVariableClassification.getArae());
                     idxBizPvPointVarCentralValue.setStation(idxBizPvPointProcessVariableClassification.getStation());
                     idxBizPvPointVarCentralValue.setSubarray(idxBizPvPointProcessVariableClassification.getSubarray());
+                    idxBizPvPointVarCentralValue.setOrgCode(idxBizPvPointProcessVariableClassification.getOrgCode());
                     idxBizPvPointVarCentralValue
                             .setManufacturer(idxBizPvPointProcessVariableClassification.getManufacturer());
                     idxBizPvPointVarCentralValue

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

@@ -33,7 +33,7 @@ public interface IdxFeign {
     FeignClientResult<List<Map<String, Object>>> getStationMark(@RequestParam(value = "code") String code);
 
 
-    @RequestMapping(value = "/publicAnalysis/appletSroce", method = RequestMethod.GET, consumes = "application/json")
+        @RequestMapping(value = "/publicAnalysis/appletSroce", method = RequestMethod.GET, consumes = "application/json")
     Map<String, Object> getStationMarkList(@RequestParam(value = "code") String code,
                                                                     @RequestParam(value = "pageNumber") String pageNumber,
                                                                     @RequestParam(value = "pageSize") String pageSize);
@@ -42,9 +42,15 @@ public interface IdxFeign {
     @RequestMapping(value = "/jxIopAnalysis/stationRanking", method = RequestMethod.GET, consumes = "application/json")
     FeignClientResult<Map<String, Object>> stationRanking(@RequestParam("pageNumber") Long pageNumber,
                                             @RequestParam("pageSize") Long pageSize,
+                                            @RequestParam(required = false, value = "sortType") String sortType,
                                             @RequestParam(required = false, value = "stationType") String type,
                                             @RequestParam(required = false, value = "parentCode") String parentCode);
 
+    @RequestMapping(value = "/jxIopAnalysis/assessIndexMap", method = RequestMethod.GET, consumes = "application/json")
+    Map<String, Object> assessIndexMap(@RequestParam(required = false, value = "sortType") String sortType,
+                                       @RequestParam(required = false, value = "stationType") String stationType,
+                                       @RequestParam(required = false, value = "parentCode") String parentCode);
+
 
 
 }

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

@@ -73,7 +73,7 @@ public class EarningsForecastController {
                 maps.add(MapBuilder.<String,Object>create().put("text",e.getStationName()).put("value",e.getSequenceNbr()).build());
             });
         }else {
-            stationBasicMapper.getStationsByAreaCode(araeCode).stream().filter(a->!a.getStationType().equals(stationType)).forEach(e->{
+            stationBasicMapper.getStationsByAreaCode(araeCode).stream().filter(a->a.getStationType().contains(stationType)).forEach(e->{
                 maps.add(MapBuilder.<String,Object>create().put("text",e.getStationName()).put("value",e.getSequenceNbr()).build());
             });
         }

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

@@ -196,14 +196,14 @@ public class AppletMonitorServiceImpl {
         stations.removeAll(fdz);
         List<Map<String,Object>> list = new ArrayList<>();
         Map<String, Object> data = new HashMap<>();
-        data.put("type","风电");
+        data.put("type","光伏");
         data.put("installedCapacity",String.format("%.2f",fdz.stream().mapToDouble(StationBasicDto::getInstalledCapacity).sum()));
         data.put("num",stations.size());
         data.put("activePower",String.format("%.2f", result2.get(0).getValueF()));
         list.add(data);
 
         Map<String, Object> data2 = new HashMap<>();
-        data2.put("type","光伏");
+        data2.put("type","风电");
         data2.put("installedCapacity",String.format("%.2f",stations.stream().mapToDouble(StationBasicDto::getInstalledCapacity).sum()));
         data2.put("num",fdz.size());
         data2.put("activePower",String.format("%.2f", commonService.getSumByEquipmentIndxName(result1, "南瑞光差保护_313P") * CommonConstans.kwToMv));
@@ -216,18 +216,14 @@ public class AppletMonitorServiceImpl {
         result.put("load",load);
 
         String areaCompanyCode = companyMapper.getAreaCompanyCode(code);
-        Map<String, Object> stationMark = idxFeign.getStationMarkList(areaCompanyCode,"1","4");
-        List<String> params = Arrays.asList("P1", "S1", "H2", "V1");
-        //   P1 工况管控分数 S1 设备管控分数 H2 其他分数  V1 人员管控分数
-        params.forEach(e->{
-            result.put(e,stationMark.get(e));
-        });
-        result.put("value",stationMark.get("value"));
 
+        Map<String, Object> stationMark = idxFeign.assessIndexMap("asc",null,areaCompanyCode);
+        //   P1 工况管控分数 S1 设备管控分数 H2 其他分数  V1 人员管控分数
+        result.putAll(stationMark);
 
         //获取区域场站排名
-        FeignClientResult<Map<String, Object>> map = idxFeign.stationRanking(1L, Long.MAX_VALUE, "FDZ", areaCompanyCode);
-        FeignClientResult<Map<String, Object>> map1 = idxFeign.stationRanking(1L, Long.MAX_VALUE, "JZSGFDZ", areaCompanyCode);;
+        FeignClientResult<Map<String, Object>> map = idxFeign.stationRanking(1L, Long.MAX_VALUE,"DESC", "FDZ", areaCompanyCode);
+        FeignClientResult<Map<String, Object>> map1 = idxFeign.stationRanking(1L, Long.MAX_VALUE, "DESC","JZSGFDZ", areaCompanyCode);;
         Map<String, Object> result3 = map.getResult();
         Map<String, Object> result4 = map1.getResult();
         result.put("rankingFD", result3.get("records"));