融合通信

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/MapPolygonController.java

@@ -13,6 +13,7 @@ import org.dromara.system.domain.bo.MapPolygonBo;
 import org.dromara.system.domain.bo.MapPolygonDeviceBo;
 import org.dromara.system.domain.vo.MapPolygonDeviceVo;
 import org.dromara.system.domain.vo.MapPolygonVo;
+import org.dromara.system.domain.vo.TDeviceVo;
 import org.dromara.system.service.IMapPolygonDeviceService;
 import org.dromara.system.service.IMapPolygonService;
 import org.springframework.validation.annotation.Validated;
@@ -89,9 +90,10 @@ public class MapPolygonController extends BaseController {
     /**
      * 查询围栏绑定的设备列表
      */
-    @GetMapping("/deviceList/{polygonId}")
+    @GetMapping("/deviceList")
-    public R<List<MapPolygonDeviceVo>> getDeviceList(@PathVariable Integer polygonId) {
+    public TableDataInfo<TDeviceVo> getDeviceList(MapPolygonDeviceBo bo, PageQuery pageQuery) {
-        return R.ok(mapPolygonDeviceService.queryDeviceListByPolygonId(polygonId));
+
+        return mapPolygonDeviceService.queryDeviceListByPolygonId(bo,pageQuery);
     }
 
     /**
@@ -116,9 +118,9 @@ public class MapPolygonController extends BaseController {
     /**
      * 删除围栏设备绑定
      */
-    @DeleteMapping("/device/{ids}")
+    @DeleteMapping("/device/{ids}/{polygonId}")
-    public R<Void> removeDevice(@PathVariable Long[] ids) {
+    public R<Void> removeDevice(@PathVariable String[] ids,@PathVariable Integer polygonId) {
-        return toAjax(mapPolygonDeviceService.deleteWithValidByIds(List.of(ids), true));
+        return toAjax(mapPolygonDeviceService.deleteByPolygonIdAndDeviceCodes(polygonId, List.of(ids)));
     }
 
     /**

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java

@@ -40,4 +40,6 @@ public interface TDeviceMapper extends BaseMapperPlus<TDevice, TDeviceVo> {
 
     int insertOrUpdateByCodeAndType(TDevice device);
 
+    Page<TDeviceVo> getPageOnBindDeviceList(@Param("page") Page<TDevice> page, @Param("polygonId") Integer polygonId);
+
 }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/IMapPolygonDeviceService.java

@@ -3,8 +3,10 @@ package org.dromara.system.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.TDevice;
 import org.dromara.system.domain.bo.MapPolygonDeviceBo;
 import org.dromara.system.domain.vo.MapPolygonDeviceVo;
+import org.dromara.system.domain.vo.TDeviceVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -47,7 +49,7 @@ public interface IMapPolygonDeviceService {
      * @param polygonId 围栏ID
      * @return 设备列表
      */
-    List<MapPolygonDeviceVo> queryDeviceListByPolygonId(Integer polygonId);
+    TableDataInfo<TDeviceVo> queryDeviceListByPolygonId(MapPolygonDeviceBo bo, PageQuery pageQuery);
 
     /**
      * 查询设备绑定的围栏列表
@@ -89,7 +91,7 @@ public interface IMapPolygonDeviceService {
      * @param isValid 是否进行有效性校验
      * @return 是否删除成功
      */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+    Boolean deleteWithValidByIds(Collection<Long> ids,Long polygonId, Boolean isValid);
 
     /**
      * 根据围栏ID和设备编码列表删除绑定

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/MapPolygonDeviceServiceImpl.java

@@ -3,6 +3,7 @@ package org.dromara.system.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import org.dromara.system.domain.MapPolygonDevice;
 import org.dromara.system.domain.TDevice;
 import org.dromara.system.domain.bo.MapPolygonDeviceBo;
 import org.dromara.system.domain.vo.MapPolygonDeviceVo;
+import org.dromara.system.domain.vo.TDeviceVo;
 import org.dromara.system.mapper.MapPolygonDeviceMapper;
 import org.dromara.system.mapper.MapPolygonMapper;
 import org.dromara.system.mapper.TDeviceMapper;
@@ -68,11 +70,10 @@ public class MapPolygonDeviceServiceImpl implements IMapPolygonDeviceService {
     }
 
     @Override
-    public List<MapPolygonDeviceVo> queryDeviceListByPolygonId(Integer polygonId) {
+    @DS("slave")
-        List<MapPolygonDeviceVo> list = baseMapper.selectDeviceListByPolygonId(polygonId);
+    public TableDataInfo<TDeviceVo> queryDeviceListByPolygonId(MapPolygonDeviceBo bo, PageQuery pageQuery) {
-        // 填充设备类型名称
+        Page<TDeviceVo> list = tDeviceMapper.getPageOnBindDeviceList(pageQuery.build(), bo.getPolygonId());
-        fillDeviceTypeName(list);
+        return TableDataInfo.build(list);
-        return list;
     }
 
     @Override
@@ -126,7 +127,6 @@ public class MapPolygonDeviceServiceImpl implements IMapPolygonDeviceService {
             list.add(binding);
         }
 
-        baseMapper.deleteByPolygonId(polygonId);
         // 批量插入
         return baseMapper.insertBatch(list);
     }
@@ -160,11 +160,11 @@ public class MapPolygonDeviceServiceImpl implements IMapPolygonDeviceService {
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<Long> ids,Long polygonId, Boolean isValid) {
         if (isValid) {
             // 进行有效性校验
             for (Long id : ids) {
-                MapPolygonDeviceVo vo = queryById(id);
+                MapPolygonDeviceVo vo = queryById(polygonId);
                 if (vo == null) {
                     throw new RuntimeException("绑定关系不存在");
                 }

stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml

@@ -53,4 +53,8 @@
         update_time = values(update_time)
     </insert>
 
+    <select id="getPageOnBindDeviceList" resultMap="DevicetResult">
+        select d.* from t_device d left join map_polygon_device md on d.device_code = md.device_code where md.polygon_id = #{polygonId}
+    </select>
+
 </mapper>