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

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

@@ -13,7 +13,7 @@
     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 !='已作废'
+    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id,stamp_status,status from  hygf_household_contract
     ) 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/FinancingInfoServiceImpl.java

@@ -30,11 +30,13 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRectificationOrder;
 import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingInfoService;
+import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -71,6 +74,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     @Autowired
     private CommonServiceImpl commonService;
 
+    @Resource(type = RedisLockUtil.class)
+    private RedisLockUtil redisLockUtil;
+
     @UserLimits
     public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName) {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
@@ -115,6 +121,13 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     }
 
     public FinancingInfoDto saveModel(FinancingInfoDto model) {
+        String lockName = String.format("LockName:powerStationExamine");
+        try{
+            Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
+            if (BooleanUtils.isNotTrue(isLocked)) {
+                throw new com.yeejoin.amos.component.robot.BadRequest("其他用户正在操作，请刷新后再试！");
+            }
+
             List<String> ids;
             if (model.getPeasantHouseholdIds().contains(",")) {
                 ids = Arrays.asList(model.getPeasantHouseholdIds().split(","));
@@ -179,12 +192,12 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                     map.put("instanceId",financingInfos1.getInstanceId());
                     this.execueFlow(map);
                 }
-
                 //发起待办
 //            commonService.buildTaskModel(buildDZTRZTaskModel(model, workflowResultDto, date));
             });
-
-
+        }finally {
+            redisLockUtil.releaseLock(lockName);
+        }
         return model;
     }
 

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

@@ -126,7 +126,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 		if (!workorderPeasant.isEmpty()) {
 			String names = workorderPeasant.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
-			throw new Exception("电站" + names + ",已被工单关联");
+			throw new Exception("电站" + names + ",已被工单关联,请重新选择电站");
 		}
 
 		// 保存派工单
@@ -270,7 +270,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional
-	public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
+	public synchronized PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
 		// 如果不是提交进行单独保存
 		if (powerStationConstructionData.isCommitFlow()) {
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
@@ -334,8 +334,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		// 新增施工信息
 		// 防止重复添加
 		LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper<>();
-//		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
-//				powerStationConstructionData.getWorkOrderPowerStationId());
+		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
+				powerStationConstructionData.getWorkOrderPowerStationId());
 		psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
 		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
 		// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);