From c593a0087a0bbc71c03b06d721ab7fe92b2fd419 Mon Sep 17 00:00:00 2001 From: jiminglei <836545853@qq.com> Date: Fri, 2 Jun 2023 11:21:09 +0800 Subject: [PATCH 1/4] 11 --- psdc-ui/src/views/system/cl/index.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue index 20cd66f..7bf4f2b 100644 --- a/psdc-ui/src/views/system/cl/index.vue +++ b/psdc-ui/src/views/system/cl/index.vue @@ -70,9 +70,9 @@ {{item.deviceName}} - - - + + + @@ -192,6 +192,12 @@ onMounted(()=>{ for(var i in crr){ arr=arr.concat(crr[i].children) } + + for(let j in arr){ + arr[j].Temp=!arr[j].Temp + arr[j].inTemp=!arr[j].inTemp + arr[j].outTemp=!arr[j].outTemp + } console.log('sblb',arr) data.sblb=arr var brr = [] From 9b1bfa33967a32f250de91658f1e46303f3f8c04 Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Fri, 2 Jun 2023 11:25:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=B0=83=E6=8E=A7=E6=97=A5=E5=BF=97=E6=93=8D=E4=BD=9C=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-ui/src/views/control/manual/index.vue | 29 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue index cd5e9cf..e22edae 100644 --- a/psdc-ui/src/views/control/manual/index.vue +++ b/psdc-ui/src/views/control/manual/index.vue @@ -42,10 +42,10 @@ - + - + 控制成功'; +// } +// if(row.controlResult == '控制失败'){ +// return '控制失败'; +// } +// } + //翻页时不刷新序号 function indexMethod1(index){ return index+(currentPage.value-1)*pageSize.value+1 @@ -203,7 +222,7 @@ function selectCeLue(item){ } //最终要传参的格式 - console.log(JSON.stringify(dataArr, null, 4)); + // console.log(JSON.stringify(dataArr, null, 4)); SenceControlArr.value = JSON.stringify(dataArr, null, 4) } //执行 @@ -211,7 +230,9 @@ function confirmClick() { ElMessageBox.confirm(`确定执行 ${radio.value} ?`).then(() => { drawerIshow.value = false; getSenceControl(SenceControlArr.value).then((res)=>{ - console.log(res) + if(res.code == 200){ + ElMessage.success('策略导入成功') + } }) }) } From 00e8f6837e2cf99bf69f31ea078fa9bf91953bbf Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Fri, 2 Jun 2023 11:30:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=B0=83=E6=8E=A7=E6=97=A5=E5=BF=97=E6=93=8D=E4=BD=9C=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-ui/src/views/control/manual/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue index e22edae..9215988 100644 --- a/psdc-ui/src/views/control/manual/index.vue +++ b/psdc-ui/src/views/control/manual/index.vue @@ -232,6 +232,7 @@ function confirmClick() { getSenceControl(SenceControlArr.value).then((res)=>{ if(res.code == 200){ ElMessage.success('策略导入成功') + getControlLogListFun() } }) }) @@ -284,6 +285,7 @@ function getSetTemperatureFun(item){ }).then((res)=>{ if(res.code == 200){ ElMessage.success('设置温度成功！') + getControlLogListFun() } }) From a11322ca6f572daddf98ea8858e9421281c58508 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 11:43:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?2023-06-02=2011:37:46=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/psdc/service/IPsdcModelService.java | 4 ++ .../service/impl/PsdcModelServiceImpl.java | 6 +++ .../monitor/TotalElectricMeterController.java | 46 ++++++++++--------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java index 8c2e14d..106c196 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java @@ -2,6 +2,8 @@ package com.psdc.service; import com.psdc.entity.vo.ModelVo; +import java.util.List; + /** * @Author：Stone * @Project：psdc @@ -13,4 +15,6 @@ public interface IPsdcModelService { ModelVo queryControlModel(String modelName, String sceneKey); + List selDevIsControlByModelName(String modelName); + } diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java index 8654206..03bc9ff 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java @@ -6,6 +6,7 @@ import com.psdc.service.IPsdcModelService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * @Author：戴仕崑 @@ -24,4 +25,9 @@ public class PsdcModelServiceImpl implements IPsdcModelService { public ModelVo queryControlModel(String modelName, String sceneKey) { return modelMapper.queryControlModel(modelName, sceneKey); } + + @Override + public List selDevIsControlByModelName(String modelName) { + return modelMapper.selDevIsControlByModelName(modelName); + } } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java index 34269ef..78b2092 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java +++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java @@ -59,28 +59,32 @@ public class TotalElectricMeterController { Map map2 = new HashMap<>(); map2.put("deviceId", dev.getDeviceId()); map2.put("deviceName", dev.getDeviceName()); - map2.put("deviceId", dev.getDeviceId()); - boolean b1 = false; - boolean b2 = false; - boolean b3 = false; - ModelVo modelVo1 = psdcModelService.queryControlModel(dd.getDeviceModel(), "intemp"); - if (null != modelVo1){ - b1 = true; - } - ModelVo modelVo2 = psdcModelService.queryControlModel(dd.getDeviceModel(), "outtemp"); - if (null != modelVo2){ - b2 = true; - } - ModelVo modelVo3 = psdcModelService.queryControlModel(dd.getDeviceModel(), "temp"); - if (null != modelVo3){ - b3 = true; +// map2.put("deviceId", dev.getDeviceId()); +// boolean b1 = false; +// boolean b2 = false; +// boolean b3 = false; +// ModelVo modelVo1 = psdcModelService.queryControlModel(dd.getDeviceModel(), "intemp"); +// if (null != modelVo1){ +// b1 = true; +// } +// ModelVo modelVo2 = psdcModelService.queryControlModel(dd.getDeviceModel(), "outtemp"); +// if (null != modelVo2){ +// b2 = true; +// } +// ModelVo modelVo3 = psdcModelService.queryControlModel(dd.getDeviceModel(), "temp"); +// if (null != modelVo3){ +// b3 = true; +// } +// map2.put("intemp", null); +// map2.put("outtemp", null); +// map2.put("temp", null); +// map2.put("inTemp", b1); +// map2.put("outTemp", b2); +// map2.put("Temp", b3); + List modelVoList = psdcModelService.selDevIsControlByModelName(dd.getDeviceModel()); + for (ModelVo scr : modelVoList){ + map2.put(scr.getRelationField(), null); } - map2.put("intemp", null); - map2.put("outtemp", null); - map2.put("temp", null); - map2.put("inTemp", b1); - map2.put("outTemp", b2); - map2.put("Temp", b3); maps2.add(map2); } } else {