diff --git a/src/main/java/com/hxjt/dataupload/utils/tszy/MbcdzyUtil.java b/src/main/java/com/hxjt/dataupload/utils/tszy/MbcdzyUtil.java index a2fe996..67ccf15 100644 --- a/src/main/java/com/hxjt/dataupload/utils/tszy/MbcdzyUtil.java +++ b/src/main/java/com/hxjt/dataupload/utils/tszy/MbcdzyUtil.java @@ -6,25 +6,25 @@ import com.hxjt.dataupload.model.entity.tszy.upload.Mbcdzy; public class MbcdzyUtil { public static void handle(Mbcdzy mbcdzy, Aqcs aqcs) { - if(aqcs.getAncuoneirong().startsWith("在管道、设备上作业时,应降低系")){ + if(aqcs.getAncuoneirong().startsWith("在管道、设备上作业时,降低系统压力")){ mbcdzy.setZuoyedianweichangyah(aqcs.getShifousheji().equals("Y")?"是":"否"); mbcdzy.setQuerenren(aqcs.getQuerenren()); }else if(aqcs.getAncuoneirong().startsWith("在有毒介质的管道")){ mbcdzy.setChuandaigetifanghuzh(aqcs.getShifousheji().equals("Y")?"是":"否"); mbcdzy.setQuerenren1(aqcs.getQuerenren()); - }else if(aqcs.getAncuoneirong().startsWith("在火灾爆炸危险场所,作业人员穿防静电")){ + }else if(aqcs.getAncuoneirong().startsWith("火灾爆炸危险场所,作业人员穿防静电工作服、工作鞋")){ mbcdzy.setShiyongfangbaodengju(aqcs.getShifousheji().equals("Y")?"是":"否"); mbcdzy.setQuerenren2(aqcs.getQuerenren()); - }else if(aqcs.getAncuoneirong().startsWith("在火灾爆炸危险场所,距作业地点3")){ + }else if(aqcs.getAncuoneirong().startsWith("火灾爆炸危险场所的气体管道,距作业地点30")){ mbcdzy.setA30mneiwudonghuozuoye(aqcs.getShifousheji().equals("Y")?"是":"否"); mbcdzy.setQuerenren3(aqcs.getQuerenren()); }else if(aqcs.getAncuoneirong().startsWith("在强腐蚀性介质的管")){ mbcdzy.setCaiyongfangzhisuanji(aqcs.getShifousheji().equals("Y")?"是":"否"); mbcdzy.setQuerenren4(aqcs.getQuerenren()); - }else if(aqcs.getAncuoneirong().startsWith("介质温度较高可能造成烫")){ + }else if(aqcs.getAncuoneirong().startsWith("介质温度较高")){ mbcdzy.setCaiqufangtangcuoshi(aqcs.getShifousheji().equals("Y")?"是":"否"); mbcdzy.setQuerenren5(aqcs.getQuerenren()); - }else if(aqcs.getAncuoneirong().startsWith("介质温度较低可能")){ + }else if(aqcs.getAncuoneirong().startsWith("介质温度较低")){ mbcdzy.setCaiqufangdongcuoshi(aqcs.getShifousheji().equals("Y")?"是":"否"); mbcdzy.setQuerenren6(aqcs.getQuerenren()); }else if(aqcs.getAncuoneirong().startsWith("同一管道上未同时进行两")){ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index eb285f3..b68371b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -85,7 +85,7 @@ xxl: job: admin: #调度中心部署地址,多个配置逗号分隔 "http://address01,http://address02" - addresses: http://192.168.1.249:8080/xxl-job-admin + addresses: http://172.20.2.57:8080/xxl-job-admin #执行器token,非空时启用 xxl-job, access token accessToken: data_upload executor: @@ -105,7 +105,7 @@ xxl: mqtt: username: 10@ningyanghuagongchany20250508114250 password: ce07f3c284084b42b674017b72fe73f2 - hostUrl: tcp://192.168.1.249:1883 + hostUrl: tcp://172.20.2.57:1883 clientId: 10@ningyanghuagongchany20250508114250 sensorDataTopic: /iot/10@ningyanghuagongchany20250422172632/thirdParty/sensorData timeout: 100