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

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

@@ -24,7 +24,9 @@ import java.util.*;
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAcceptanceDto, BasicGridAcceptance, BasicGridAcceptanceMapper> implements IBasicGridAcceptanceService {
+public class BasicGridAcceptanceServiceImpl
+		extends BaseService<BasicGridAcceptanceDto, BasicGridAcceptance, BasicGridAcceptanceMapper>
+		implements IBasicGridAcceptanceService {
 
 	@Autowired
 	BasicGridAcceptanceMapper basicGridAcceptanceMapper;
@@ -43,14 +45,15 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 	@Autowired
 	WorkOrderMapper workOrderMapper;
 
-
 	@Autowired
 	PeasantHouseholdMapper peasantHouseholdMapper;
 
-    private final  String OK ="0";
-    private final  String PASS ="5";
+	private final String OK = "0";
+	private final String PASS = "5";
 
-    public Page<BasicGridAcceptanceDto> selectPage(Long  regionCompanyId  ,Long amosDealerId ,int current, int size, String projectAddress, String powerStationCode, String ownersName, String gridStatus, String gridConnectionTime, String formType) throws Exception {
+	public Page<BasicGridAcceptanceDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
+			String projectAddress, String powerStationCode, String ownersName, String gridStatus,
+			String gridConnectionTime, String formType) throws Exception {
 		PageHelper.startPage(current, size);
 		Map<String, Object> map = new HashMap<>();
 		Date date = null;
@@ -76,51 +79,51 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 	}
 
 	public HygfOnGrid saveEntity(HygfOnGrid grid) {
-        if(grid.getSequenceNbr()!=null){
+		if (grid.getSequenceNbr() != null) {
 			onGridMapper.updateById(grid);
-        }else{
+		} else {
 			onGridMapper.insert(grid);
 		}
 
 		return grid;
 	}
-    @Transactional
-    public HygfOnGrid saveAndCommit(HygfOnGrid grid,String userId) {
 
+	@Transactional
+	public HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
 
-        BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
+		BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper
+				.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>()
+						.eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
 		basicGridAcceptance.setGridStatus(GridStatusEnum.DSH.getCode());
 
-       if(grid.getType()!=null&&"1".equals(grid.getType())){
-           //执行工作流
-           StandardDto standardDto=new StandardDto();
+		if (grid.getType() != null && "1".equals(grid.getType())) {
+			// 执行工作流
+			StandardDto standardDto = new StandardDto();
 			standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
-           workflow.standard(basicGridAcceptance,standardDto,userId);
+			workflow.standard(basicGridAcceptance, standardDto, userId);
 
-       }else{
+		} else {
 			// 调用工作流执行第一个节点
 			ProcessDto processDto = new ProcessDto();
 			processDto.setProcessDefinitionKey("hygf_bwys");
 			processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
 			StartProcessDto startProcessDto = new StartProcessDto();
-           List<ProcessDto> process=new ArrayList<>();
+			List<ProcessDto> process = new ArrayList<>();
 			process.add(processDto);
 			startProcessDto.setProcess(process);
-           workflow.startProcess(basicGridAcceptance, startProcessDto,userId);
+			workflow.startProcess(basicGridAcceptance, startProcessDto, userId);
 
-           //线上验收
-           LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
+			// 线上验收
+			LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
 			up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网中.getCode());
-           long idsk= basicGridAcceptance.getPeasantHouseholdId();
-           up.eq(PeasantHousehold::getSequenceNbr,idsk);
-           peasantHouseholdMapper.update(null,up);
-
-
+			long idsk = basicGridAcceptance.getPeasantHouseholdId();
+			up.eq(PeasantHousehold::getSequenceNbr, idsk);
+			peasantHouseholdMapper.update(null, up);
 
 		}
-        if(grid.getSequenceNbr()!=null){
+		if (grid.getSequenceNbr() != null) {
 			onGridMapper.updateById(grid);
-        }else{
+		} else {
 			onGridMapper.insert(grid);
 		}
 		basicGridAcceptanceMapper.updateById(basicGridAcceptance);
@@ -141,7 +144,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		for (HygfOnGrid x : grids) {
 			x.setIsDelete(true);
 			int num = onGridMapper.updateById(x);
-            BasicGridAcceptance acceptance = basicGridAcceptanceMapper.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getWorkOrderPowerStationId, x.getWorkOrderPowerStationId()));
+			BasicGridAcceptance acceptance = basicGridAcceptanceMapper
+					.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>()
+							.eq(BasicGridAcceptance::getWorkOrderPowerStationId, x.getWorkOrderPowerStationId()));
 			acceptance.setIsDelete(true);
 			int count = basicGridAcceptanceMapper.updateById(acceptance);
 			if (0 == num || 0 == count) {
@@ -152,50 +157,50 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		return bool;
 	}
 
-
 	@Transactional
-    public void execute(AcceptanceCheckItem dto,String userId) {
-        //查询并网审批信息
+	public void execute(AcceptanceCheckItem dto, String userId) {
+		// 查询并网审批信息
 		BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
 		String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
 		if (OK.equals(dto.getApprovalStatus())) {
 			if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
 				basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
 				basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待提交验收.getCode());
-                //并网时间
+				// 并网时间
 				LambdaUpdateWrapper<HygfOnGrid> upq = new LambdaUpdateWrapper();
 				upq.eq(HygfOnGrid::getSequenceNbr, dto.getFonGridId());
 				upq.set(HygfOnGrid::getGridConnectionTime, new Date());
 				onGridMapper.update(null, upq);
-                //并网完成
-                LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-                up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.并网完成.getCode());
-                long idsk= basicGridAcceptanc.getPeasantHouseholdId();
-                up.eq(PeasantHousehold::getSequenceNbr,idsk);
-                peasantHouseholdMapper.update(null,up);
+				// 并网完成
+				LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
+				up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
+				long idsk = basicGridAcceptanc.getPeasantHouseholdId();
+				up.eq(PeasantHousehold::getSequenceNbr, idsk);
+				peasantHouseholdMapper.update(null, up);
 
 			} else {
 
-                basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
+				basicGridAcceptanc
+						.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 			}
 
-
 		} else {
 			if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
 				basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
+				basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 			}
 			// 投融/法务/工程/线下验收审核不通过
-            else if (
-                    BasicGridAcceptancEnum.管理端投融审核.getCode().equals(nextNodeKey) ||
-                            BasicGridAcceptancEnum.管理端法务审核.getCode().equals(nextNodeKey) ||
-                            BasicGridAcceptancEnum.管理端工程审核.getCode().equals(nextNodeKey) ||
-                            BasicGridAcceptancEnum.管理端工程线下验.getCode().equals(nextNodeKey)
-            ) {
+			else if (BasicGridAcceptancEnum.管理端投融审核.getCode().equals(nextNodeKey)
+					|| BasicGridAcceptancEnum.管理端法务审核.getCode().equals(nextNodeKey)
+					|| BasicGridAcceptancEnum.管理端工程审核.getCode().equals(nextNodeKey)
+					|| BasicGridAcceptancEnum.管理端工程线下验.getCode().equals(nextNodeKey)) {
 				AcceptanceRectificationOrder rectificationOrder = new AcceptanceRectificationOrder();
 				try {
 					WorkOrder workOrder = workOrderMapper.selectById(basicGridAcceptanc.getWorkOrderId());
-                    RegionalCompanies regionalCompanies = regionalCompaniesMapper.selectRegionName(workOrder.getRegionCompanyId());
-                    String code = NumberUtil.getCode(CodeEnum.整改单.getCode(), regionalCompanies.getCompanyCode(), regionalCompanies.getRegionalAddress());
+					RegionalCompanies regionalCompanies = regionalCompaniesMapper
+							.selectRegionName(workOrder.getRegionCompanyId());
+					String code = NumberUtil.getCode(CodeEnum.整改单.getCode(), regionalCompanies.getCompanyCode(),
+							regionalCompanies.getRegionalAddress());
 					rectificationOrder.setRectificationOrderCode(code);
 					rectificationOrder.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
 					rectificationOrder.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
@@ -206,9 +211,11 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 					throw new RuntimeException(e);
 				}
 				acceptanceRectificationOrderMapper.insert(rectificationOrder);
-                basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
+				basicGridAcceptanc
+						.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 			} else {
-                basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
+				basicGridAcceptanc
+						.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 			}
 		}
 
@@ -218,7 +225,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			dto.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
 			acceptanceCheckItemMapper.insert(dto);
 		}
-        //执行工作流
+		// 执行工作流
 		StandardDto standardDto = new StandardDto();
 		standardDto.setComment(dto.getComment());
 		standardDto.setResult(dto.getApprovalStatus());
@@ -232,34 +239,29 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc, standardDto, userId);
 
 		if (workBasicGridAcceptance.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
-            //线下验收
-            LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.线下验收.getCode());
-            long idsk= basicGridAcceptanc.getPeasantHouseholdId();
-            up.eq(PeasantHousehold::getSequenceNbr,idsk);
-            peasantHouseholdMapper.update(null,up);
+			// 线下验收
+			LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
+			up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线下验收.getCode());
+			long idsk = basicGridAcceptanc.getPeasantHouseholdId();
+			up.eq(PeasantHousehold::getSequenceNbr, idsk);
+			peasantHouseholdMapper.update(null, up);
 		}
 
-        //验收完成
-        System.out.println("验收完成==============================="+workBasicGridAcceptance.getNextTaskId());
-        System.out.println("验收完成888888==============================="+workBasicGridAcceptance.getAcceptanceStatus());
+		// 验收完成
+		System.out.println("验收完成===============================" + workBasicGridAcceptance.getNextTaskId());
+		System.out.println("验收完成888888===============================" + workBasicGridAcceptance.getAcceptanceStatus());
 
-        if(workBasicGridAcceptance.getAcceptanceStatus().equals("10")){
-
-            //更新状态
-            LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.验收完成.getCode());
-            long idsk= basicGridAcceptanc.getPeasantHouseholdId();
-            up.eq(PeasantHousehold::getSequenceNbr,idsk);
-            peasantHouseholdMapper.update(null,up);
+		if ("10".equals(workBasicGridAcceptance.getAcceptanceStatus())) {
+			// 更新状态
+			LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
+			up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收完成.getCode());
+			long idsk = basicGridAcceptanc.getPeasantHouseholdId();
+			up.eq(PeasantHousehold::getSequenceNbr, idsk);
+			peasantHouseholdMapper.update(null, up);
 
 		}
 
 		basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
 	}
 
-
-
-
-
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -172,16 +172,16 @@ hygf.user.group.empty=1775056568031645697
 
 
 
-#qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
-#qiyuesuo.accessKey = a1lcd3WRRV
-#qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
-#qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
+qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
+qiyuesuo.accessKey = a1lcd3WRRV
+qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
+qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
 
 
-qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
-qiyuesuo.accessKey = QcmHQu55pl
-qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
-qiyuesuo.secretKey=B6OYbHyfXikAghB2
+#qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
+#qiyuesuo.accessKey = QcmHQu55pl
+#qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
+#qiyuesuo.secretKey=B6OYbHyfXikAghB2
 
 
 

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