From e59cd7fffdab0755ff174540fc68076c78bc6d2c Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Mon, 13 Feb 2023 13:12:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 249856 -> 249856 bytes .../wms/sch/manage/AutoQueryDeviceStatus.java | 28 ++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 88b2e50dedc5cb55dd3a03c09cad3f324f741156..f40b984fc0cb3814eed5d61e19946013e2618859 100644 GIT binary patch delta 15861 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 h#=inM&ia|_!2*Mo~^7A|RlG?XY*nAgtKIjs>Ni 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 ~MGL`VPxdisa? z`(ZiN=^{LRe0{>Q!+pYh{385A2cQ0_)ti8!VUeR1c3}Y@jw2tp47Ck~=8-xd*a0=C zNffyQc14?(s-WpT$o!&(L6e&ulYr-tUoTB=am=>0`f&jnH3=?z_+sCKe5-p_y^Fv{ zvvuSvb#WUFna6b*-}r~vT#ZK2xd>VmS;j&_Vmh1qP(0FlfwP*Ab=qc|7&>Fv{LINP zUUvuo-*qy$JW~2@e4|Wp@C&V;;&AZxWQPZZW#iQ$Q`CkKwf$~>ih6$t)Z4^qFFv>N zeQ5Ks@2|A+t+yHP^`Q9jpDhC)+64Y;gTHqL*4x~(d7AdXrjfeqX)>HF@#zH)wIsV+ zf*#U#mHU9*1%+?;7Ygq#lP};Gow^>l(8kr?Bh&`Jm^7e6P;tNA5a*n0Xx>8jY9H^} zK-X?RAKE}L^524;`}wE_8ZZ7W=yiafFT@?>J=UhW2{#Y&&TCV<3pWq&p~5oka5)_N za`oC&OAh3>!JM=F*3IBhey?jpQo@H@xaxibPbK^=1`7C9ubAe?GM0z#JhVRX>e`Qr zWO-y;s0sc0X8*&#O#8HM`rXH}yp`@s^raGh;K`gpgMS;ZPEBSdg!cfrt1D1iv(;KzfEOt!rf|-<9L_TZS8Zl=DtRk>3CJM#Aa}UTvIS!8axR zsF)9hZRNa+aaSd;AY6KXVZV_-&biDJ5|8j++{+lD09%6JiaWx4b6qA0uc;VscRY&X z!NTyP{7m8_TtCXYWAoQhekBT*9^*SvpF+hkQTe{u8l8^wKk&rW__~Vs{qk^LX-+gIptRe=5_0R4Dsor4!5xq4-KLA6s;Gh_@rE|LQ#2|*K%aP;8VxDh9_X&tno$j*BDj Mx5liq{E|lh2N5O!g#Z8m diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java index d441c92a7..09972e7e5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java @@ -1,6 +1,7 @@ package org.nl.wms.sch.manage; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -13,19 +14,36 @@ import org.springframework.stereotype.Component; @Slf4j @Component @RequiredArgsConstructor -public class AutoQueryDeviceStatus{ +public class AutoQueryDeviceStatus { private final WmsToAcsService wmsToAcsService; + public void run() { //通过ACS接口获取温度 - JSONArray device_rows = WQL.getWO("PDA_02").addParam("flag","15").process().getResultJSONArray(0); + JSONArray device_rows = WQL.getWO("PDA_02").addParam("flag", "15").process().getResultJSONArray(0); JSONObject jo = wmsToAcsService.getPointStatus(device_rows); - WQLObject ivtTab=WQLObject.getWQLObject("st_ivt_hotpointivt"); + WQLObject ivtTab = WQLObject.getWQLObject("st_ivt_hotpointivt"); JSONArray de_rows = jo.getJSONArray("data"); for (int i = 0; i < de_rows.size(); i++) { JSONObject row = de_rows.getJSONObject(i); String device_code = row.getString("device_code"); - JSONObject point_jo = ivtTab.query("point_code = '"+device_code+"'").uniqueResult(0); - point_jo.put("temperature",row.getString("temperature")); + JSONObject point_jo = ivtTab.query("point_code = '" + device_code + "'").uniqueResult(0); + point_jo.put("temperature", row.getString("temperature")); + //获取倒计时,分,秒 + String countdown_house = row.getString("countdown_house"); + String countdown_min = row.getString("countdown_min"); + String countdown_sec = row.getString("countdown_sec"); + + if (StrUtil.isEmpty(countdown_house)) { + countdown_house = "0"; + } + if (StrUtil.isEmpty(countdown_min)) { + countdown_min = "0"; + } + if (StrUtil.isEmpty(countdown_sec)) { + countdown_sec = "0"; + } + String last_time = countdown_house + "小时" + countdown_min + "分钟"; + point_jo.put("last_time", last_time); ivtTab.update(point_jo); } }