feat(设备监控与设施监控增加平台筛选条件): 设备监控与设施监控增加平台筛选条件

设备监控与设施监控增加平台筛选条件

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/bi/dto/MonitorTargetBiDTO.java

@@ -55,6 +55,10 @@ public class MonitorTargetBiDTO  {
      * 冰箱锁编号
      */
     private String lockNo;
+    /**
+     * 平台
+     */
+    private String platform;
 
 
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/bi/service/BiService.java

@@ -97,6 +97,9 @@ public class BiService {
         if (StrUtil.isNotBlank(monitorTargetPageParam.getRoomId())) {
             queryWrapper.lambda().eq(MonitorTarget::getRoomId, monitorTargetPageParam.getRoomId());
         }
+        if (StrUtil.isNotBlank(monitorTargetPageParam.getPlatform())) {
+            queryWrapper.lambda().eq(MonitorTarget::getPlatform, monitorTargetPageParam.getPlatform());
+        }
         if (ObjectUtil.isAllNotEmpty(monitorTargetPageParam.getSortField(), monitorTargetPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(monitorTargetPageParam.getSortOrder());
             queryWrapper.orderBy(true, monitorTargetPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), StrUtil.toUnderlineCase(monitorTargetPageParam.getSortField()));
@@ -165,7 +168,7 @@ public class BiService {
 
         // 获取原始分页数据
 
-        records = monitorTargetService.getEvnTarget(loginUser.getOrgId(), monitorTargetPageParam.getName(), monitorTargetPageParam.getRoomId());
+        records = monitorTargetService.getEvnTarget(loginUser.getOrgId(), monitorTargetPageParam.getName(), monitorTargetPageParam.getRoomId(),monitorTargetPageParam.getPlatform());
 
 
         List<MonitorTargetBiDTO> monitorTargetBiDTOS = BeanUtil.copyToList(records, MonitorTargetBiDTO.class);

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/MonitorTargetMapper.java

@@ -40,5 +40,5 @@ public interface MonitorTargetMapper extends BaseMapper<MonitorTarget> {
     IPage<MonitorTarget> selectMonitorTargetByPage(Page<MonitorTarget> page, @Param("param") MonitorTargetPageParam monitorTargetPageParam, String searchFlag);
 
 
-    List<MonitorTarget> getEvnTarget(@Param("createOrg") String createOrg, @Param("name") String name, @Param("roomId") String roomId);
+    List<MonitorTarget> getEvnTarget(@Param("createOrg") String createOrg, @Param("name") String name, @Param("roomId") String roomId,@Param("platform")String platform);
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/mapping/MonitorTargetMapper.xml

@@ -102,6 +102,9 @@
         <if test="roomId != null and roomId.trim() != ''">
             and t.room_id = #{roomId}
         </if>
+        <if test="platform != null and platform != ''">
+            and t.platform = #{platform}
+        </if>
         order by t.id asc
     </select>
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/MonitorTargetService.java

@@ -172,7 +172,7 @@ public interface MonitorTargetService extends IService<MonitorTarget> {
      */
     void importMonitorDevice(MultipartFile file);
 
-    List<MonitorTarget> getEvnTarget(String orgId, String name, String roomId);
+    List<MonitorTarget> getEvnTarget(String orgId, String name, String roomId,String platform);
 
     /**
      * 清空点位

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -532,8 +532,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     }
 
     @Override
-    public List<MonitorTarget> getEvnTarget(String orgId, String name, String roomId) {
-        return monitorTargetMapper.getEvnTarget(orgId, name, roomId);
+    public List<MonitorTarget> getEvnTarget(String orgId, String name, String roomId,String platform) {
+        return monitorTargetMapper.getEvnTarget(orgId, name, roomId, platform);
     }
 
     @Override