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

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

@@ -10,8 +10,8 @@ hygf_household_contract.`status`='双方已签署'
 and hygf_peasant_household.developer_id=#{developerId}
 and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
 and hygf_peasant_household.survey_or_not=3 and  hygf_peasant_household.sequence_nbr not in
-(select hygf_document_station.station_id  from hygf_preparation_money LEFT JOIN hygf_document_station
-on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.delivery_state !='已作废'
+(select hygf_document_station.station_id  from hygf_preparation_money RIGHT JOIN hygf_document_station
+on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.order_status ='待发货'
     <if test="ids!=null and ids !=''">
         and hygf_document_station.preparation_money_id !=#{ids}
     </if>

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

@@ -73,7 +73,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
             and hygf_peasant_household.owners_name like concat ('%',#{ownersName},'%')
         </if>
         <if test=" preparationMoneyState == 1 ">
-            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not and preparation_money_state != ''
+            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
         </if>
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java

@@ -15,6 +15,7 @@ import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
 import com.qiyuesuo.sdk.v2.response.SdkResponse;
 import com.qiyuesuo.sdk.v2.utils.Algorithm;
 import com.qiyuesuo.sdk.v2.utils.Base64Utils;
+import com.qiyuesuo.sdk.v2.utils.CollectionUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
@@ -109,8 +110,10 @@ public class QiyuesuoController extends BaseController {
 			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		QueryWrapper<SealDictionary> queryWrapper = new QueryWrapper();
 		queryWrapper.eq("amos_company_seq", sequenceNbr);
-		SealDictionary sealDictionary = sealDictionaryMapper.selectOne(queryWrapper);
-		request.setUser(new User(sealDictionary.getSealedPhone(), "MOBILE"));
+		List<SealDictionary> sealDictionaryList = sealDictionaryMapper.selectList(queryWrapper);
+		if(CollectionUtils.isNotEmpty(sealDictionaryList)){
+			request.setUser(new User(sealDictionaryList.get(0).getSealedPhone(), "MOBILE"));
+		}
 		SdkResponse<MiniappTicketResult> result = qiyuesuoService.getContractSdkResponse(request);
 		return ResponseHelper.buildResponse(result.getResult());
 	}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -54,11 +54,12 @@ public class WorkOrderController extends BaseController {
      * 新增施工派工工单
      *
      * @return
+     * @throws Exception 
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增施工派工工单", notes = "新增施工派工工单")
-	public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) {
+	public ResponseModel<WorkOrder> save(@RequestBody WorkOrder model) throws Exception {
         UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 	    model = workOrderServiceImpl.saveWorkOrder(model,userUnitInformationDto);
 	    return ResponseHelper.buildResponse(model);

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

@@ -598,6 +598,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
                 //提交时 赋值发货时间及订单状态
                 model.setDeliveryTime(new Date());
+                model.setDeliveryState(DeliveryStateeEnum.已发货.getName());
+                model.setArrivalState(ArrivalStateeEnum.待收货.getName());
                 model.setOrderStatus(DeliveryStateeEnum.待确认.getName());
             } else {
                 up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.暂存发货.getCode());
@@ -611,6 +613,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<DocumentStation> listDocumentStation = new ArrayList<>();
                 for (DocumentStation documentStation : ids) {
                     documentStation.setPreparationMoneyId(model.getSequenceNbr());
+                    documentStation.setSequenceNbr(null);
                     listDocumentStation.add(documentStation);
                 }
                 documentStationService.saveBatch(listDocumentStation);
@@ -696,6 +699,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<DocumentStation> listDocumentStation = new ArrayList<>();
                 for (DocumentStation documentStation : ids) {
                     documentStation.setPreparationMoneyId(model.getSequenceNbr());
+                    documentStation.setSequenceNbr(null);
                     listDocumentStation.add(documentStation);
                 }
                 documentStationService.saveBatch(listDocumentStation);
@@ -905,7 +909,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         preparationMoneyMapper.updateById(model);
 
         //执行工作流并保存记录
-        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("comment","").toString());
+        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("approvalStatus","").toString());
     }
 
 
@@ -1003,7 +1007,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         }else {
             preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName());
         }
-        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("comment","").toString());
+        preparationMoneyMapper.updateById(preparationMoney);
+        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("approveInfo","").toString());
     }
 
     public PreparationMoney  submitOrder(PreparationMoney model, String instanceId, String isSubmit){
@@ -1015,8 +1020,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             model.setOrderStatus(DeliveryStateeEnum.待确认.getCode());
             preparationMoneyMapper.updateById(model);
             LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getName());
-            up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.待收货.getName());
+            up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName());
+            up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName());
+            peasantHouseholdMapper.update(null,up);
             this.wofkflowExcute(instanceId,isSubmit,"");
         }
 

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 施工派工工单服务实现类
@@ -110,7 +111,24 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional
-	public WorkOrder saveWorkOrder(WorkOrder model, UserUnitInformationDto userUnitInformationDto) {
+	public WorkOrder saveWorkOrder(WorkOrder model, UserUnitInformationDto userUnitInformationDto) throws Exception {
+		
+		// 校验电站已被选
+		List<PeasantHousehold> peasantHouseholdId = model.getPeasantHouseholdId();
+		List<PeasantHousehold> workorderPeasant = new ArrayList<>();
+		for (PeasantHousehold peasantHouse : peasantHouseholdId) {
+			int count = workOrderPowerStationServiceImpl.count(new LambdaQueryWrapper<WorkOrderPowerStation>()
+					.eq(WorkOrderPowerStation::getPeasantHouseholdId, peasantHouse.getSequenceNbr()));
+			if (count > 0) {
+				PeasantHousehold peasantHouseOne = peasantHouseholdMapper.selectById(peasantHouse.getSequenceNbr());
+				workorderPeasant.add(peasantHouseOne);
+			}
+		}
+		if (!workorderPeasant.isEmpty()) {
+			String names = workorderPeasant.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
+			throw new Exception("电站" + names + ",已被工单关联");
+		}
+
 		// 保存派工单
 		RegionalCompanies regionalCompanies = regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId());
 		String code = NumberUtil.getCode(CodeEnum.派工单.getCode(), regionalCompanies.getCompanyCode(),
@@ -126,9 +144,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		model.setAmosDealerOrgCode(userUnitInformationDto.getAmosDealerOrgCode());
 
 		workOrderMapper.insert(model);
-		// 保存派工单 电站信息
-		List<PeasantHousehold> peasantHouseholdId = model.getPeasantHouseholdId();
 
+		// 保存派工单 电站信息
 		List<ConstructionRecords> constructionRecordlist = new ArrayList<>();
 		List<WorkOrderPowerStation> li = new ArrayList<>();
 		for (PeasantHousehold peasantHousehold : peasantHouseholdId) {
@@ -254,8 +271,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 	@Transactional
 	public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
-		//如果不是提交进行单独保存
-		if(powerStationConstructionData.isCommitFlow()){
+		// 如果不是提交进行单独保存
+		if (powerStationConstructionData.isCommitFlow()) {
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
 			// 修改施工电站状态
 			LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
@@ -295,28 +312,34 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderMapper.update(null, upq);
 
 		}
-        // 新增施工信息
-        // 防止重复添加
-        LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
-        psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
-                powerStationConstructionData.getWorkOrderPowerStationId());
-        psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
-        powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
-        // powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
+		
+		// 增加操作日志
+		if (powerStationConstructionData.getSequenceNbr() != null) {
+			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
+					new Date(), "", powerStationConstructionData.getWorkOrderId(),
+					powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
+			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
+			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
 
-        // 增加操作日志
-        if (powerStationConstructionData.getSequenceNbr() != null) {
-            ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
-                    new Date(), "", powerStationConstructionData.getWorkOrderId(),
-                    powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
-            constructionRecordsServiceImpl.save(da);
+		} else {
+			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
+					new Date(), "", powerStationConstructionData.getWorkOrderId(),
+					powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
+			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
+			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
+		}
+		
+		// 新增施工信息
+		// 防止重复添加
+		LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper<>();
+//		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
+//				powerStationConstructionData.getWorkOrderPowerStationId());
+		psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
+		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
+		// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
 
-        } else {
-            ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
-                    new Date(), "", powerStationConstructionData.getWorkOrderId(),
-                    powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
-            constructionRecordsServiceImpl.save(da);
-        }
 
 
 //        }else{
@@ -843,7 +866,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		// 防止重复提交
 		LambdaQueryWrapper<PowerStationEngineeringInfo> pse = new LambdaQueryWrapper<>();
 		pse.eq(PowerStationEngineeringInfo::getWorkOrderId, powerStationEngineeringInfo.getWorkOrderId());
-		//pse.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,powerStationEngineeringInfo.getWorkOrderPowerStationId());
+		// pse.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,powerStationEngineeringInfo.getWorkOrderPowerStationId());
 		// powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
 		powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo, pse);
 		// 增加操作日志

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev1.properties

@@ -34,11 +34,11 @@ spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+eureka.instance.hostname=47.92.234.253
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=10.20.1.210
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -74,10 +74,10 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.220:1883
+emqx.broker=tcp://47.92.234.253:1883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
+mqtt.scene.host=mqtt://47.92.234.253:18083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000

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

@@ -89,4 +89,9 @@ spring.elasticsearch.rest.password=Yeejoin@2020
 spring.elasticsearch.rest.read-timeout=30000
 
 #elasticsearch.username= elastic
-#elasticsearch.password= 123456
+#elasticsearch.password= 123456
\ No newline at end of file
+
+amos.system.user.user-name=cz
+amos.system.user.password=a1234567
+amos.system.user.product=AMOS_STUDIO_WEB
+amos.system.user.app-key=AMOS_STUDIO
\ No newline at end of file