修改bug

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

@@ -297,7 +297,7 @@ public class HouseholdContractController extends BaseController {
         }
     }catch (Exception e){
         e.printStackTrace();
-        throw new BadRequest("系统异常");
+        throw new BadRequest(e.getMessage());
     }
         return householdContractServiceImpl.updateById(householdContrac);
 

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

@@ -540,10 +540,10 @@ public class BasicGridAcceptanceServiceImpl
 					acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
 					acceptanceCheckService.saveOrUpdate(acceptanceCheck);
 
-				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") &&  (  Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-bw-engineering")) ) ) {
+				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") &&  (  Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-engineering")) ) ) {
 					up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
-				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("bw-engineering") ) {
+				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus().contains("bw-engineering") ) {
 					up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
 					LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>();
 					query2.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
@@ -586,10 +586,10 @@ public class BasicGridAcceptanceServiceImpl
 					acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
 					acceptanceCheckService.saveOrUpdate(acceptanceCheck);
 
-				}else if( null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0") && (  Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-bw-design")) )) {
+				}else if( null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0") && (  Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-design")) )) {
 					up.set(BasicGridRecord::getBasicGridNode,"bw-design");
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
-				}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("bw-bw-design") ) {
+				}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("bw-design") ) {
 					up.set(BasicGridRecord::getBasicGridNode,"bw-design");
 				LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>();
 				query1.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());

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

@@ -65,14 +65,14 @@ emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://10.20.1.210:2883
 emqx.user-name=admin
-emqx.password=public
+emqx.password=Yeejoin@2020
 mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
 emqx.client-user-name=admin
-emqx.client-password=public
+emqx.client-password=Yeejoin@2020
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:18186

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

@@ -70,7 +70,7 @@ emqx.client-user-name=
 emqx.client-password=
 emqx.broker=tcp://10.20.1.210:2883
 emqx.user-name=admin
-emqx.password=public
+emqx.password=Yeejoin@2020
 mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt