From 548dc2328bcec1719fa759e07b72065a77f97e71 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 10:38:09 +0800 Subject: [PATCH] =?UTF-8?q?2023-06-02=2010: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 --- .../java/com/psdc/mapper/PsdcModelMapper.java | 3 +++ .../com/psdc/service/IPsdcModelService.java | 16 +++++++++++ .../service/impl/PsdcModelServiceImpl.java | 27 +++++++++++++++++++ .../service/impl/PsdcSceneServiceImpl.java | 4 --- .../mapper/business/PsdcModelMapper.xml | 5 ++++ .../monitor/TotalElectricMeterController.java | 26 +++++++++++++++--- 6 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java create mode 100644 psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcModelMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcModelMapper.java index 5442d47..2904c9f 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcModelMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcModelMapper.java @@ -20,4 +20,7 @@ public interface PsdcModelMapper { List selDevIsControlByModelName(@Param("modelName") String modelName); + ModelVo queryControlModel(@Param("modelName") String modelName, + @Param("modelKey") String modelKey); + } diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java new file mode 100644 index 0000000..8c2e14d --- /dev/null +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcModelService.java @@ -0,0 +1,16 @@ +package com.psdc.service; + +import com.psdc.entity.vo.ModelVo; + +/** + * @Author：Stone + * @Project：psdc + * @Filename：IPsdcModelService + * @Date：2023/6/2 10:27 + * @Version 1.0 + */ +public interface IPsdcModelService { + + ModelVo queryControlModel(String modelName, String sceneKey); + +} 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 new file mode 100644 index 0000000..8654206 --- /dev/null +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcModelServiceImpl.java @@ -0,0 +1,27 @@ +package com.psdc.service.impl; + +import com.psdc.entity.vo.ModelVo; +import com.psdc.mapper.PsdcModelMapper; +import com.psdc.service.IPsdcModelService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * @Author：戴仕崑 + * @Project：psdc + * @Filename：PsdcModelServiceImpl + * @Date：2023/6/2 10:27 + * @Version 1.0 + */ +@Service +public class PsdcModelServiceImpl implements IPsdcModelService { + + @Resource + PsdcModelMapper modelMapper; + + @Override + public ModelVo queryControlModel(String modelName, String sceneKey) { + return modelMapper.queryControlModel(modelName, sceneKey); + } +} diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java index 9df5103..3f731f4 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java @@ -199,9 +199,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { DeviceVo deviceVo = new DeviceVo(); for (int i = 0; i < listByCode.size(); i++) { SceneVo sv = listByCode.get(i); - // System.out.println("序号 = " + i + "， 元素" + sv + "\n"); if (deviceId == sv.getDeviceId()) { - // System.out.println("上行: " + i + "\n"); deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceSn(sv.getDeviceSn()); @@ -221,7 +219,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { } } else { - // System.out.println("下发: " + i + "\n"); ary.add(deviceVo); deviceId = sv.getDeviceId(); deviceVo = new DeviceVo(); @@ -252,7 +249,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { } } } - // System.out.println("终端元素 = " + ary + "\n"); } psr.setDeviceVos(ary); } diff --git a/psdc-business/src/main/resources/mapper/business/PsdcModelMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcModelMapper.xml index 4b93a9c..b964c84 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcModelMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcModelMapper.xml @@ -16,4 +16,9 @@ From psdc_model Where model_name = #{modelName} And io_type = "serve" + + \ No newline at end of file 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 5305e96..c79e734 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 @@ -3,8 +3,10 @@ package com.psdc.controller.monitor; import com.psdc.core.domain.AjaxResult; import com.psdc.entity.PsdcDevice; import com.psdc.entity.res.PsdcDevicePowerRes; +import com.psdc.entity.vo.ModelVo; import com.psdc.service.IPsdcDeviceService; import com.psdc.service.IPsdcElectricHtdataService; +import com.psdc.service.IPsdcModelService; import com.psdc.service.IPsdcThermometerHtdataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -38,6 +40,9 @@ public class TotalElectricMeterController { @Autowired IPsdcDeviceService psdcDeviceService; + @Autowired + IPsdcModelService psdcModelService; + @PreAuthorize("@ss.hasPermi('emonitor:db')") @RequestMapping(value = "/selMydevices", method = RequestMethod.GET) public AjaxResult selMydevices() { @@ -55,9 +60,24 @@ public class TotalElectricMeterController { map2.put("deviceId", dev.getDeviceId()); map2.put("deviceName", dev.getDeviceName()); map2.put("deviceId", dev.getDeviceId()); - map2.put("intemp", null); - map2.put("outtemp", null); - map2.put("temp", null); + 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", b1); + map2.put("outtemp", b2); + map2.put("temp", b3); maps2.add(map2); } } else {