Parcourir la source

fix:根据楼层和组织获取房间温湿度

lwb il y a 3 mois
Parent
commit
b649d10458

+ 2 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/controller/TargetRoomController.java

@@ -144,8 +144,8 @@ public class TargetRoomController {
     }
     @Operation(summary = "获取房间列表")
     @GetMapping("/coldchain/targetroom/roomMonitor")
-    public CommonResult<List<RoomMonitor>> roomMonitor(String floor) {
-        return CommonResult.data(targetRoomService.getListByFloor(floor));
+    public CommonResult<List<RoomMonitor>> roomMonitor(String floor,String createOrg) {
+        return CommonResult.data(targetRoomService.getListByFloor(floor,createOrg));
     }
 
 }

+ 1 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/mapper/TargetRoomMapper.java

@@ -25,5 +25,5 @@ import java.util.List;
  * @date  2024/12/31 00:05
  **/
 public interface TargetRoomMapper extends BaseMapper<TargetRoom> {
-    List<RoomMonitor> getRoomMonitor(String floor);
+    List<RoomMonitor> getRoomMonitor(String floor,String createOrg);
 }

+ 1 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/mapper/mapping/TargetRoomMapper.xml

@@ -24,6 +24,7 @@
           AND t.DELETE_FLAG = 'NOT_DELETE'
           AND r.DELETE_FLAG = 'NOT_DELETE'
           AND room.floor = #{floor}
+          AND CREATE_ORG = #{createOrg}
         GROUP BY roomName
     </select>
 </mapper>

+ 1 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/TargetRoomService.java

@@ -94,6 +94,6 @@ public interface TargetRoomService extends IService<TargetRoom> {
     /**
      * 根据楼层获取房间列表
      */
-    List<RoomMonitor> getListByFloor(String floor);
+    List<RoomMonitor> getListByFloor(String floor,String createOrg);
 
 }

+ 2 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/impl/TargetRoomServiceImpl.java

@@ -162,8 +162,8 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
     }
 
     @Override
-    public List<RoomMonitor> getListByFloor(String floor) {
-        List<RoomMonitor> list = targetRoomMapper.getRoomMonitor(floor);
+    public List<RoomMonitor> getListByFloor(String floor, String createOrg) {
+        List<RoomMonitor> list = targetRoomMapper.getRoomMonitor(floor,createOrg);
         list.forEach(roomMonitor -> {
             SensorData sensorData = monitorDeviceService.queryLatestDataByDeviceIdAndRoads(roomMonitor.getSensorCode(),roomMonitor.getSensorRoute());
             if(sensorData==null){