Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java

@@ -88,4 +88,10 @@ public class PowerStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "契约锁合同id")
     private String contractLockId;
+    
+    @ApiModelProperty(value = "盖章状态")
+    private String stampStatus;
+    
+    @ApiModelProperty(value = "合同状态")
+    private String status;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -10,8 +10,10 @@
     hygf_peasant_household.regional_companies_name,
     hygf_peasant_household.developer_code,
     hygf_peasant_household.developer_user_id,
-    hygf_peasant_household.project_address_detail
-    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id from  hygf_household_contract where   hygf_household_contract.status !='已作废'
+    hygf_peasant_household.project_address_detail,
+    b.stamp_status,
+    b.status
+    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id,stamp_status,status from  hygf_household_contract where   hygf_household_contract.status !='已作废'
     ) b    on b.peasant_household_id=hygf_power_station.peasant_household_id
     LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_power_station.peasant_household_id
     where hygf_power_station.is_delete=0

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

@@ -864,7 +864,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 	@Transactional(isolation = Isolation.REPEATABLE_READ)
     public ConstructionRecords  addConstructionRecords(ConstructionRecords constructionRecords){
-		synchronized (constructionRecords.getPeasantHouseholdId()) {
+		synchronized (constructionRecords) {
 			  LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
 		        qu.eq(WorkOrderPowerStation::getSequenceNbr,constructionRecords.getWorkOrderPowerStationId());
 		        WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu);
@@ -911,7 +911,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		                 upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.已完工.getCode());
 		                 workOrderMapper.update(null,upq);
 		             }
-
 		         }else{
 		             //修改电站状态
 		             workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());

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

@@ -1128,7 +1128,8 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "运维数据 ")
     @GetMapping("/operationData")
-    public ResponseModel<IPage<Map<String, Object>>> operationData(@RequestParam(value = "areaCode", required = false) String areaCode) {
+    public ResponseModel<IPage<Map<String, Object>>> operationData(@RequestParam(value = "areaCode", required = false) String areaCode,
+                                                                   @RequestParam(value = "stationId", required = false) String stationId) {
 
 
 //        List<StationCacheInfoDto> list = commonServiceImpl.getListStationCacheInfoDto();
@@ -1152,13 +1153,14 @@ public class MonitorFanIdxController extends BaseController {
 //        result.setRecords(mapList);
 //        result.setCurrent(1);
 //        result.setTotal(mapList.size());
-        return ResponseHelper.buildResponse(monitorService.operationData(areaCode));
+        return ResponseHelper.buildResponse(monitorService.operationData(areaCode,stationId));
     }
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "全国新能源接入情况 ")
     @GetMapping("/getAccessSituation")
-    public ResponseModel<Map<String, Object>> getAccessSituation(@RequestParam(value = "areaCode", required = false) String areaCode) {
-        return ResponseHelper.buildResponse(monitorService.getAccessSituation(areaCode));
+    public ResponseModel<Map<String, Object>> getAccessSituation(@RequestParam(value = "areaCode", required = false) String areaCode,
+                                                                 @RequestParam(value = "stationId", required = false) String stationId) {
+        return ResponseHelper.buildResponse(monitorService.getAccessSituation(areaCode,stationId));
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/MonitorService.java

@@ -15,10 +15,11 @@ import java.util.Map;
 public interface MonitorService {
     /**
      * @param areaCode 区域编码
+     * @param stationId 场站id
      * @return 全国运维数据
      * @Description 根据区域编码动态运维数据
      */
-    IPage<Map<String, Object>> operationData(String areaCode);
+    IPage<Map<String, Object>> operationData(String areaCode,String stationId);
 
     /**
      * @return Map<String, Object>
@@ -122,7 +123,8 @@ public interface MonitorService {
     /**
      * 获取接入情况
      * @param areaCode
+     * @param stationId
      * @return
      */
-    Map<String, Object> getAccessSituation(String areaCode);
+    Map<String, Object> getAccessSituation(String areaCode,String stationId);
 }

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

@@ -31,6 +31,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
 import java.io.IOException;
@@ -60,11 +61,14 @@ public class MonitorServiceImpl implements MonitorService {
     private Resource overviewGF;
 
     @Override
-    public IPage<Map<String, Object>> operationData(String areaCode) {
+    public IPage<Map<String, Object>> operationData(String areaCode,String stationId) {
         List<StationCacheInfoDto> list = getListStationCacheInfoDto();
         if (null != areaCode) {
             list = list.stream().filter(e -> e.getAreaCode().toUpperCase(Locale.ROOT).equals(areaCode.toUpperCase(Locale.ROOT))).collect(Collectors.toList());
         }
+        if (!StringUtils.isEmpty(stationId)) {
+            list = list.stream().filter(e -> e.getStationId().toUpperCase(Locale.ROOT).equals(stationId.toUpperCase(Locale.ROOT))).collect(Collectors.toList());
+        }
         List<Map<String, Object>> mapList = new ArrayList<>();
         Map<String, List<StationCacheInfoDto>> listMap = list.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getStationType, Collectors.toList()));
         for (StationType value : StationType.values()) {
@@ -944,8 +948,8 @@ public class MonitorServiceImpl implements MonitorService {
     }
 
     @Override
-    public Map<String, Object> getAccessSituation(String areaCode) {
-        IPage<Map<String, Object>> page = operationData(areaCode);
+    public Map<String, Object> getAccessSituation(String areaCode, String stationId) {
+        IPage<Map<String, Object>> page = operationData(areaCode,stationId);
         List<Map<String, Object>> records = page.getRecords();
         Map<String, Object> map = new HashMap<>();
         if (!CollectionUtils.isEmpty(records)) {