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

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

@@ -1,6 +1,7 @@
 package com.psdc.mapper;
 
 import com.psdc.entity.PsdcScene;
+import com.psdc.entity.res.PsdcSceneRes;
 import com.psdc.entity.vo.SceneVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -113,6 +114,6 @@ public interface PsdcSceneMapper{
                                                @Param(value = "sceneCode") Long sceneCode,
                                                @Param(value = "sceneName") String sceneName);
 
-     List <SceneVo> queryScenes(@Param(value = "userId") Long userId,
+     List <PsdcSceneRes> queryScenes(@Param(value = "userId") Long userId,
-                                @Param(value = "sceneCode") Long sceneCode);
+                                     @Param(value = "sceneCode") Long sceneCode);
  }

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

@@ -190,12 +190,12 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
     public List<PsdcSceneRes> findSceneByUserAndSceneName(Long sceneCode) {
         Long userId = SecurityUtils.getUserId();
         String sceneName = "";
-        List<PsdcSceneRes> sceneRes = new ArrayList<>();
+        List<PsdcSceneRes> sceneRes = psdcSceneMapper.queryScenes(userId, sceneCode);
-        List<SceneVo> sceneVos = psdcSceneMapper.queryScenes(userId, sceneCode);
+//        List<SceneVo> sceneVos = psdcSceneMapper.queryScenes(userId, sceneCode);
-        for (SceneVo sv : sceneVos) {
+//        for (SceneVo sv : sceneVos) {
-            PsdcSceneRes res = new PsdcSceneRes(sv.getSceneId(), sv.getSceneName(), sv.getSceneCode(), sv.getUserId(), sv.getCreateTime(), sv.getSceneRemark());
+//            PsdcSceneRes res = new PsdcSceneRes(sv.getSceneId(), sv.getSceneName(), sv.getSceneCode(), sv.getUserId(), sv.getCreateTime(), sv.getSceneRemark());
-            sceneRes.add(res);
+//            sceneRes.add(res);
-        }
+//        }
         for (PsdcSceneRes psr : sceneRes) {
             Long code = psr.getSceneCode();
             List<SceneVo> listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName);
@@ -256,7 +256,6 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
             }
             psr.setDeviceVos(ary);
         }
-
         return sceneRes;
     }
 

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

@@ -31,6 +31,15 @@
         <result property="updateTime" column="update_time" />
     </resultMap>
 
+    <resultMap type="com.psdc.entity.res.PsdcSceneRes" id="SceneResMap">
+        <result property="sceneId" column="scene_id" />
+        <result property="sceneName" column="scene_name" />
+        <result property="sceneCode" column="scene_code"/>
+        <result property="userId" column="user_id"/>
+        <result property="sceneRemark" column="scene_remark" />
+        <result property="createTime" column="create_time" />
+    </resultMap>
+
     <!-- 通过ID查询单条数据 -->
     <select id="querySceneNameById" resultType="java.lang.String">
         Select scene_name From psdc_scene Where scene_code = #{sceneCode} GROUP BY scene_name
@@ -191,7 +200,7 @@
         </where>
     </select>
 
-    <select id="queryScenes" resultMap="SceneVoMap">
+    <select id="queryScenes" resultMap="SceneResMap">
         Select ps.scene_id,ps.scene_name,ps.scene_code,ps.user_id,pd.device_name,ps.device_id,pd.device_sn,ps.scene_context,ps.scene_key,ps.scene_value,
         ps.scene_remark,ps.create_by,ps.create_time,ps.update_by,ps.update_time
         From psdc_scene ps

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

@@ -109,7 +109,7 @@ public class PsdcDeviceController extends BaseController {
     public TableDataInfo controlLogList(@RequestBody JSONObject jsonObject) {
     //  PageMethod.startPage(jsonObject.getInteger("pageNum"),jsonObject.getInteger("pageSize"));
     //  PsdcDevice deviceVo = JSON.parseObject(String.valueOf(jsonObject), PsdcDevice.class);
-        startPage();
+    //  startPage();
         PsdcDevice deviceVo = myPage(jsonObject, PsdcDevice.class);
         List<PsdcDeviceInfoRes> list = psdcDeviceService.queryAllByLimit(deviceVo);
         return getDataTable(list);

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

@@ -56,7 +56,7 @@ public class PsdcSceneController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:cl:list')")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public TableDataInfo list(@RequestBody JSONObject jsonObject) {
-        startPage();
+        // startPage();
         PsdcSceneRequest sceneVo = myPage(jsonObject, PsdcSceneRequest.class);
         List<PsdcSceneRes> list = psdcSceneService.findSceneByUserAndSceneName(sceneVo.getSceneCode());
         return getDataTable(list);