Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc

psdc-business/src/main/java/com/psdc/mapper/PsdcModelMapper.java

@@ -20,4 +20,7 @@ public interface PsdcModelMapper {
 
     List<ModelVo> selDevIsControlByModelName(@Param("modelName") String modelName);
 
+    ModelVo queryControlModel(@Param("modelName") String modelName,
+                              @Param("modelKey") String modelKey);
+
 }

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);
+
+}

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);
+    }
+}

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);
         }

psdc-business/src/main/resources/mapper/business/PsdcModelMapper.xml

@@ -16,4 +16,9 @@
         From psdc_model
         Where model_name = #{modelName} And io_type = "serve"
     </select>
+
+    <select id="queryControlModel" resultMap="PsdcModelMap">
+        SELECT model_id,model_name,relation_field,io_desc,io_type FROM psdc_model
+        WHERE model_name = #{modelName} And relation_field = #{modelKey} And io_type = "serve"
+    </select>
 </mapper>

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()  {
@@ -57,9 +62,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 {