2023-05-29 17:24:19 优化完善策略管理新增接口!

psdc-business/src/main/java/com/psdc/service/IPsdcSceneService.java

@@ -18,7 +18,7 @@ public interface IPsdcSceneService {
      * @param scenes
      * @return
      */
-    Boolean insert(PsdcSceneRequest scenes);
+    Boolean insert(PsdcSceneRes scenes);
 
     Boolean insertByCode(PsdcSceneRequest scenes);
 

psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java

@@ -1,6 +1,5 @@
 package com.psdc.service.impl;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.psdc.entity.PsdcControlLog;
 import com.psdc.entity.PsdcDevice;
 import com.psdc.entity.PsdcScene;

psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java

@@ -38,30 +38,31 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
      * @return Boolean
      */
     @Override
-    public Boolean insert(PsdcSceneRequest scenes) {
+    public Boolean insert(PsdcSceneRes scenes) {
         Date date = new Date();
         long timestamp = getSecondTimestampTwo(date);
-        long userId = SecurityUtils.getUserId();
         List<SceneVo> scenesList = new ArrayList<>();
-        if (null != scenes.getIntemp() && !"".equals(scenes.getIntemp())) {
-            SceneVo sceneVo;
-            sceneVo = new SceneVo(scenes.getSceneName(), scenes.getDeviceId(), "进水温度", "intemp", scenes.getIntemp());
-            scenesList.add(sceneVo);
-        }
-        if (null != scenes.getOuttemp() && !"".equals(scenes.getOuttemp())) {
-            SceneVo sceneVo = new SceneVo(scenes.getSceneName(), scenes.getDeviceId(), "出水温度", "outtemp", scenes.getOuttemp());
-            scenesList.add(sceneVo);
-        }
-        if (null != scenes.getTemp() && !"".equals(scenes.getTemp())) {
-            SceneVo sceneVo = new SceneVo(scenes.getSceneName(), scenes.getDeviceId(), "温度", "temp", scenes.getTemp());
-            scenesList.add(sceneVo);
+        for (DeviceVo dev : scenes.getDeviceVos()) {
+            if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
+                SceneVo sceneVo;
+                sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "进水温度", "intemp", dev.getIntemp());
+                scenesList.add(sceneVo);
+            }
+            if (null != dev.getOuttemp() && !"".equals(dev.getOuttemp())) {
+                SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "出水温度", "outtemp", dev.getOuttemp());
+                scenesList.add(sceneVo);
+            }
+            if (null != dev.getTemp() && !"".equals(dev.getTemp())) {
+                SceneVo sceneVo = new SceneVo(scenes.getSceneName(), dev.getDeviceId(), "温度", "temp", dev.getTemp());
+                scenesList.add(sceneVo);
+            }
         }
 
 
         try {
             for (SceneVo sc : scenesList) {
                 sc.setSceneCode(timestamp);
-                sc.setUserId(userId);
+                sc.setUserId(scenes.getUserId());
             }
             psdcSceneMapper.InsertSceneData(scenesList);
             return true;
@@ -233,7 +234,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
                     deviceVo.setDeviceId(sv.getDeviceId());
                     deviceVo.setDeviceName(sv.getDeviceName());
                     deviceVo.setDeviceSn(sv.getDeviceSn());
-                    if (i == listByCode.size() - 1){ // 判断是否为最后1个元素
+                    if (i == listByCode.size() - 1) { // 判断是否为最后1个元素
                         switch (sv.getSceneKey()) {
                             case "intemp":
                                 deviceVo.setIntemp(sv.getSceneValue());

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

@@ -14,6 +14,6 @@
         Select
             model_id,model_name,relation_field,io_desc,io_type
         From psdc_model
-        Where model_name = #{modelName}
+        Where model_name = #{modelName} And io_type = "serve"
     </select>
 </mapper>

psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java

@@ -68,13 +68,8 @@ public class PsdcSceneController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:cl:list')")
     @Log(title = "策略管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody PsdcSceneRequest scenes) {
-        Long code = scenes.getSceneCode();
-        if (null != code && !"".equals(code)){
-            return toAjax(psdcSceneService.insertByCode(scenes));
-        } else {
-            return toAjax(psdcSceneService.insert(scenes));
-        }
+    public AjaxResult add(@Validated @RequestBody PsdcSceneRes scenes) {
+        return toAjax(psdcSceneService.insert(scenes));
     }