新增 设备解绑接口

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotDeviceBindController.java

@@ -11,6 +11,7 @@ import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindLandVo;
 import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindStatisticVo;
 import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindAddReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindDelReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.FmsBlockListByDeviceBindResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.FmsLandListByDeviceBindResVo;
@@ -221,4 +222,15 @@ public class IotDeviceBindController extends BaseController {
         return toAjax(iIotDeviceBindService.iotDeviceBindAdd(reqVo));
     }
 
+
+    /**
+     * 设备解绑基地地块
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Log(title = "设备解绑基地地块", businessType = BusinessType.DELETE)
+    @PostMapping("/unbind")
+    public AjaxResult unbind(@RequestBody IotDeviceBindDelReqVo reqVo) {
+        return toAjax(iIotDeviceBindService.iotDeviceBindDel(reqVo));
+    }
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/IotDeviceBindBlockDelVo.java

@@ -0,0 +1,17 @@
+package com.yunfeiyun.agmp.iotm.web.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class IotDeviceBindBlockDelVo {
+    private static final long serialVersionUID = 1L;
+
+    /** 地块标识 */
+    private List<String> blockIdList;
+
+    private String tmnId;
+    private String tid;
+}

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/reqvo/FmsLandBlockTreeReqVo.java

@@ -0,0 +1,12 @@
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
+
+import com.yunfeiyun.agmp.iot.common.domain.FmsBlock;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FmsLandBlockTreeReqVo extends FmsBlock {
+    private List<String> landIds;
+    private String landName;
+}

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/reqvo/IotDeviceBindDelReqVo.java

@@ -0,0 +1,29 @@
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设备基础对象 IotDevice
+ * 
+ * @author 杨晓辉
+ * @date 2024-01-04
+ */
+@Data
+public class IotDeviceBindDelReqVo
+{
+    private static final long serialVersionUID = 1L;
+
+    @NotNull(message = "设备标识不能为空")
+    private String devBid;
+
+    @NotNull(message = "基地标识不能为空")
+    private String landId;
+
+    /** 设备地块标识 */
+    private String tmnblockId;
+
+    /** 设备基地标识 */
+    private String tmnlandId;
+}

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/FmsBlockMapper.java

@@ -1,6 +1,8 @@
 package com.yunfeiyun.agmp.iotm.web.mapper;
 
 
+import com.yunfeiyun.agmp.iot.common.domain.FmsBlock;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.FmsLandBlockTreeReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.FmsBlockListByDeviceBindResVo;
 
 import java.util.List;
@@ -15,8 +17,8 @@ public interface FmsBlockMapper
 {
 
     public List<FmsBlockListByDeviceBindResVo> selectFmsBlockListByDeviceBind(String landId);
-//
-//    public List<FmsBlock> selectFmsBlockBaseDataList(FmsLandBlockTreeReqVo fmsLandBlockTreeReqVo);
+
+    public List<FmsBlock> selectFmsBlockBaseDataList(FmsLandBlockTreeReqVo fmsLandBlockTreeReqVo);
 //
 //
 //    public List<FmsBlockListWithDeviceResVo> selectFmsBlockListWithDevice(FmsLandBlockReqVo reqVo);

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/TmnBlockMapper.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.iotm.web.mapper;
 
 import com.yunfeiyun.agmp.iot.common.domain.TmnBlock;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindBlockDelVo;
 
 import java.util.List;
 
@@ -22,6 +23,10 @@ public interface TmnBlockMapper {
      */
     public int insertTmnBlockBatch(List<TmnBlock> tmnBlock);
 
+    public int deleteTmnBlockByBlockIdsAndDevBid(IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo);
+
+    public int deleteTmnBlockByTmnblockId(String tmnblockId);
+
 //    /**
 //     * 根据地块查询各个地块设备数量
 //     * @return
@@ -29,10 +34,9 @@ public interface TmnBlockMapper {
 //    public List<Map<String, Object>> selectCountByBlockId();
 //
 
+
 //
-//    public int deleteTmnBlockByTmnblockId(String tmnblockId);
-//
-//    public int deleteTmnBlockByBlockIdsAndDevBid(IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo);
+
 //
 //
 //

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/TmnLandMapper.java

@@ -22,6 +22,9 @@ public interface TmnLandMapper
      */
     public int insertTmnLandBatch(List<TmnLand> tmnLand);
 
+
+    public int deleteTmnLand(TmnLand tmnLand);
+
 //    /**
 //     * 根据基地统计各个基地的设备数量
 //     * @return
@@ -29,8 +32,7 @@ public interface TmnLandMapper
 //    public List<Map<String, Object>> selectCountByLandId();
 //
 
-//
-//    public int deleteTmnLandByTmnlandId(String tmnlandId);
+
 
 
 

src/main/java/com/yunfeiyun/agmp/iotm/web/service/FmsBlockService.java

@@ -1,8 +1,9 @@
 package com.yunfeiyun.agmp.iotm.web.service;
 
 
+import com.yunfeiyun.agmp.iot.common.domain.FmsBlock;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.FmsLandBlockTreeReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.FmsBlockListByDeviceBindResVo;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -17,8 +18,8 @@ public interface FmsBlockService
 {
 
     public List<FmsBlockListByDeviceBindResVo> selectFmsBlockListByDeviceBind(String landId);
-//
-//    public List<FmsBlock> selectFmsBlockBaseDataList(FmsLandBlockTreeReqVo fmsLandBlockTreeReqVo);
+
+    public List<FmsBlock> selectFmsBlockBaseDataList(FmsLandBlockTreeReqVo fmsLandBlockTreeReqVo);
 //
 //
 //    public List<FmsBlockListWithDeviceResVo> selectFmsBlockListWithDevice(FmsLandBlockReqVo reqVo);

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotDeviceBindService.java

@@ -3,6 +3,7 @@ package com.yunfeiyun.agmp.iotm.web.service;
 import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindStatisticVo;
 import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindAddReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindDelReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindListReqVo;
 
 import java.util.List;
@@ -26,9 +27,9 @@ public interface IIotDeviceBindService {
      * @return
      */
     public int iotDeviceBindAdd(IotDeviceBindAddReqVo iotDeviceBindAddReqVo);
-//
-//    public int iotDeviceBindDel(IotDeviceBindDelReqVo iotDeviceBindDelReqVo);
-//
+
+    public int iotDeviceBindDel(IotDeviceBindDelReqVo iotDeviceBindDelReqVo);
+
 
 //    public List<IotDeviceBindStatisticVo> selectDeviceBindStatisticByLandId(IotDeviceBindListReqVo reqVo);
 //

src/main/java/com/yunfeiyun/agmp/iotm/web/service/ITmnBlockService.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.iotm.web.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.TmnBlock;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindBlockDelVo;
 
 import java.util.List;
 
@@ -18,6 +19,10 @@ public interface ITmnBlockService {
 
     public int insertTmnBlockBatch(List<TmnBlock> tmnBlock);
 
+    public int deleteTmnBlockByBlockIdsAndDevBid(IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo);
+
+    public int deleteTmnBlockByTmnblockId(String tmnblockId);
+
 //    /**
 //     * 根据地块查询各个地块设备数量
 //     * @return
@@ -26,8 +31,8 @@ public interface ITmnBlockService {
 //
 
 //
-//    public int deleteTmnBlockByTmnblockId(String tmnblockId);
+
 //
-//    public int deleteTmnBlockByBlockIdsAndDevBid(IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo);
+
 
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/ITmnLandService.java

@@ -26,6 +26,11 @@ public interface ITmnLandService
      */
     public int insertTmnLandBatch(List<TmnLand> tmnLand);
 
+    public int deleteTmnLand(TmnLand tmnLand);
+
+
+    public int deleteTmnLandByTmnlandId(String tmnlandId);
+
 //    /**
 //     * 根据基地统计各个基地的设备数量
 //     * @return
@@ -33,9 +38,6 @@ public interface ITmnLandService
 //    public List<Map<String, Object>> selectCountByLandId();
 //
 
-//
-//    public int deleteTmnLandByTmnlandId(String tmnlandId);
-
 
 
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/FmsBlockServiceImpl.java

@@ -1,5 +1,8 @@
 package com.yunfeiyun.agmp.iotm.web.service.impl;
 
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.iot.common.domain.FmsBlock;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.FmsLandBlockTreeReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.FmsBlockListByDeviceBindResVo;
 import com.yunfeiyun.agmp.iotm.web.mapper.FmsBlockMapper;
 import com.yunfeiyun.agmp.iotm.web.service.FmsBlockService;
@@ -18,4 +21,10 @@ public class FmsBlockServiceImpl implements FmsBlockService {
     public List<FmsBlockListByDeviceBindResVo> selectFmsBlockListByDeviceBind(String landId) {
         return fmsBlockMapper.selectFmsBlockListByDeviceBind(landId);
     }
+
+    @Override
+    public List<FmsBlock> selectFmsBlockBaseDataList(FmsLandBlockTreeReqVo fmsLandBlockTreeReqVo) {
+        fmsLandBlockTreeReqVo.setTid(SecurityUtils.getTid());
+        return fmsBlockMapper.selectFmsBlockBaseDataList(fmsLandBlockTreeReqVo);
+    }
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotDeviceBindServiceImpl.java

@@ -4,14 +4,19 @@ import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
+import com.yunfeiyun.agmp.iot.common.domain.FmsBlock;
 import com.yunfeiyun.agmp.iot.common.domain.TmnBlock;
 import com.yunfeiyun.agmp.iot.common.domain.TmnLand;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindBlockDelVo;
 import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindStatisticVo;
 import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.FmsLandBlockTreeReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindAddReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindDelReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceBindListReqVo;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceBindMapper;
+import com.yunfeiyun.agmp.iotm.web.service.FmsBlockService;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceBindService;
 import com.yunfeiyun.agmp.iotm.web.service.ITmnBlockService;
 import com.yunfeiyun.agmp.iotm.web.service.ITmnLandService;
@@ -36,6 +41,9 @@ public class IotDeviceBindServiceImpl implements IIotDeviceBindService {
     @Autowired
     private ITmnBlockService iTmnBlockService;
 
+    @Autowired
+    private FmsBlockService fmsBlockService;
+
 //    @Autowired
 //    private FmsBlockMapper fmsBlockMapper;
     /**
@@ -132,39 +140,39 @@ public class IotDeviceBindServiceImpl implements IIotDeviceBindService {
         return status;
     }
 
-//
-//    /**
-//     * @param iotDeviceBindDelReqVo
-//     * @return
-//     */
-//    @Override
-//    public int iotDeviceBindDel(IotDeviceBindDelReqVo iotDeviceBindDelReqVo) {
-//        String landId = iotDeviceBindDelReqVo.getLandId();
-//        String tmnlandId = iotDeviceBindDelReqVo.getTmnlandId();
-//        String tmnblockId = iotDeviceBindDelReqVo.getTmnblockId();
-//        String devBid = iotDeviceBindDelReqVo.getDevBid();
-//        int status = 0;
-//        if(StringUtils.isNotEmpty(tmnlandId)){
-//            status = iTmnLandService.deleteTmnLandByTmnlandId(tmnlandId);
-//            FmsLandBlockTreeReqVo fmsLandBlockTreeReqVo = new FmsLandBlockTreeReqVo();
-//            fmsLandBlockTreeReqVo.setLandId(landId);
-//            List<FmsBlock> fmsBlockList = fmsBlockMapper.selectFmsBlockBaseDataList(fmsLandBlockTreeReqVo);
-//            List<String> blockIdList = new ArrayList<>();
-//            for(FmsBlock fmsBlock: fmsBlockList){
-//                blockIdList.add(fmsBlock.getBlockId());
-//            }
-//            if(blockIdList.size() > 0){
-//                IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo = new IotDeviceBindBlockDelVo();
-//                iotDeviceBindBlockDelVo.setTmnId(devBid);
-//                iotDeviceBindBlockDelVo.setBlockIdList(blockIdList);
-//                iTmnBlockService.deleteTmnBlockByBlockIdsAndDevBid(iotDeviceBindBlockDelVo);
-//            }
-//        } else if (StringUtils.isNotEmpty(tmnblockId)) {
-//            status = iTmnBlockService.deleteTmnBlockByTmnblockId(tmnblockId);
-//        }
-//        return status;
-//    }
-//
+
+    /**
+     * @param iotDeviceBindDelReqVo
+     * @return
+     */
+    @Override
+    public int iotDeviceBindDel(IotDeviceBindDelReqVo iotDeviceBindDelReqVo) {
+        String landId = iotDeviceBindDelReqVo.getLandId();
+        String tmnlandId = iotDeviceBindDelReqVo.getTmnlandId();
+        String tmnblockId = iotDeviceBindDelReqVo.getTmnblockId();
+        String devBid = iotDeviceBindDelReqVo.getDevBid();
+        int status = 0;
+        if(StringUtils.isNotEmpty(tmnlandId)){
+            status = iTmnLandService.deleteTmnLandByTmnlandId(tmnlandId);
+            FmsLandBlockTreeReqVo fmsLandBlockTreeReqVo = new FmsLandBlockTreeReqVo();
+            fmsLandBlockTreeReqVo.setLandId(landId);
+            List<FmsBlock> fmsBlockList = fmsBlockService.selectFmsBlockBaseDataList(fmsLandBlockTreeReqVo);
+            List<String> blockIdList = new ArrayList<>();
+            for(FmsBlock fmsBlock: fmsBlockList){
+                blockIdList.add(fmsBlock.getBlockId());
+            }
+            if(!blockIdList.isEmpty()){
+                IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo = new IotDeviceBindBlockDelVo();
+                iotDeviceBindBlockDelVo.setTmnId(devBid);
+                iotDeviceBindBlockDelVo.setBlockIdList(blockIdList);
+                iTmnBlockService.deleteTmnBlockByBlockIdsAndDevBid(iotDeviceBindBlockDelVo);
+            }
+        } else if (StringUtils.isNotEmpty(tmnblockId)) {
+            status = iTmnBlockService.deleteTmnBlockByTmnblockId(tmnblockId);
+        }
+        return status;
+    }
+
 
 //
 //    @Override

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/TmnBlockServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.iot.common.domain.TmnBlock;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDeviceBindBlockDelVo;
 import com.yunfeiyun.agmp.iotm.web.mapper.TmnBlockMapper;
 import com.yunfeiyun.agmp.iotm.web.service.ITmnBlockService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,25 @@ public class TmnBlockServiceImpl implements ITmnBlockService {
         return tmnBlockMapper.insertTmnBlockBatch(tmnBlock);
     }
 
+    /**
+     * @param iotDeviceBindBlockDelVo
+     * @return
+     */
+    @Override
+    public int deleteTmnBlockByBlockIdsAndDevBid(IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo) {
+        iotDeviceBindBlockDelVo.setTid(SecurityUtils.getTid());
+        return tmnBlockMapper.deleteTmnBlockByBlockIdsAndDevBid(iotDeviceBindBlockDelVo);
+    }
+
+    /**
+     * @param tmnblockId
+     * @return
+     */
+    @Override
+    public int deleteTmnBlockByTmnblockId(String tmnblockId) {
+        return tmnBlockMapper.deleteTmnBlockByTmnblockId(tmnblockId);
+    }
+
 //
 //    @Override
 //    public List<Map<String, Object>> selectCountByBlockId() {
@@ -52,21 +72,7 @@ public class TmnBlockServiceImpl implements ITmnBlockService {
 //
 
 //
-//    /**
-//     * @param tmnblockId
-//     * @return
-//     */
-//    @Override
-//    public int deleteTmnBlockByTmnblockId(String tmnblockId) {
-//        return tmnBlockMapper.deleteTmnBlockByTmnblockId(tmnblockId);
-//    }
+
 //
-//    /**
-//     * @param iotDeviceBindBlockDelVo
-//     * @return
-//     */
-//    @Override
-//    public int deleteTmnBlockByBlockIdsAndDevBid(IotDeviceBindBlockDelVo iotDeviceBindBlockDelVo) {
-//        return tmnBlockMapper.deleteTmnBlockByBlockIdsAndDevBid(iotDeviceBindBlockDelVo);
-//    }
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/TmnLandServiceImpl.java

@@ -53,6 +53,24 @@ public class TmnLandServiceImpl implements ITmnLandService
         return tmnLandMapper.insertTmnLandBatch(tmnLand);
     }
 
+    @Override
+    public int deleteTmnLand(TmnLand tmnLand) {
+        tmnLand.setTid(SecurityUtils.getTid());
+        return tmnLandMapper.deleteTmnLand(tmnLand);
+    }
+
+
+    /**
+     * @param tmnlandId
+     * @return
+     */
+    @Override
+    public int deleteTmnLandByTmnlandId(String tmnlandId) {
+        TmnLand tmnLand = new TmnLand();
+        tmnLand.setTmnlandId(tmnlandId);
+        return deleteTmnLand(tmnLand);
+    }
+
 //
 //    @Override
 //    public List<Map<String, Object>> selectCountByLandId() {
@@ -60,15 +78,7 @@ public class TmnLandServiceImpl implements ITmnLandService
 //    }
 //
 
-//
-//    /**
-//     * @param tmnlandId
-//     * @return
-//     */
-//    @Override
-//    public int deleteTmnLandByTmnlandId(String tmnlandId) {
-//        return tmnLandMapper.deleteTmnLandByTmnlandId(tmnlandId);
-//    }
+
 
 
 }

src/main/resources/mapper/FmsBlockMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="landId"    column="landId"    />
         <result property="blockName"    column="blockName"    />
         <result property="blockType"    column="blockType"    />
+        <result property="blockSeq" column="blockSeq"/>
         <result property="blockManager"    column="blockManager"    />
         <result property="blockManagername"    column="blockManagername"    />
         <result property="blockArea"    column="blockArea"    />
@@ -17,10 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="blockColor"    column="blockColor"    />
         <result property="blockRemark"    column="blockRemark"    />
         <result property="blockPreview"    column="blockPreview"    />
-        <result property="blockSeq" column="blockSeq"/>
         <result property="blockIcon" column="blockIcon"/>
+        <result property="tid" column="tid"/>
     </resultMap>
 
+    <sql id="selectFmsBlockVo">
+        select blockId, landId, blockName, blockType, blockManager, blockManagername, blockArea, blockAreaplant,blockSeq,blockIcon,
+        blockLngrange, blockColor, blockRemark from FmsBlock
+    </sql>
+
     <select id="selectFmsBlockListByDeviceBind" resultType="FmsBlockListByDeviceBindResVo" parameterType="String">
         SELECT fb.blockId, fb.blockName,  IFNULL(f2.devNum, 0) AS devNum, fb.blockSeq
         FROM FmsBlock AS fb
@@ -41,49 +47,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY fb.blockSeq
     </select>
 
+    <select id="selectFmsBlockBaseDataList" resultType="FmsBlock">
+        <include refid="selectFmsBlockVo"/>
+        <where>
+            tid = #{tid}
+            <if test="landId != null  and landId != ''"> and landId = #{landId}</if>
+            <if test="blockName != null  and blockName != ''"> and blockName like concat('%', #{blockName}, '%')</if>
+            <if test="blockNameEq != null  and blockNameEq != ''"> and blockName = #{blockNameEq}</if>
+            <if test="blockType != null  and blockType != ''"> and blockType = #{blockType}</if>
+            <if test="blockManager != null  and blockManager != ''"> and blockManager = #{blockManager}</if>
+            <if test="blockManagername != null  and blockManagername != ''"> and blockManagername like concat('%', #{blockManagername}, '%')</if>
+            <if test="blockArea != null "> and blockArea = #{blockArea}</if>
+            <if test="blockAreaplant != null "> and blockAreaplant = #{blockAreaplant}</if>
+            <if test="blockLngrange != null  and blockLngrange != ''"> and blockLngrange = #{blockLngrange}</if>
+            <if test="blockColor != null  and blockColor != ''"> and blockColor = #{blockColor}</if>
+            <if test="blockRemark != null  and blockRemark != ''"> and blockRemark = #{blockRemark}</if>
+            <if test="blockId != null and blockId != ''">
+                and blockId = #{blockId}
+            </if>
+            <if test="landIds != null and landIds.size()!=0">
+                and landId in
+                <foreach collection="landIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
 
-<!--    <sql id="selectFmsBlockVo">-->
-<!--        select blockId, landId, blockName, blockType, blockManager, blockManagername, blockArea, blockAreaplant,blockSeq,blockIcon,-->
-<!--        blockLngrange, blockColor, blockRemark from FmsBlock-->
-<!--    </sql>-->
 
 <!--    <select id="selectFmsBlockByBlockId" parameterType="String" resultMap="FmsBlockResult">-->
 <!--        <include refid="selectFmsBlockVo"/>-->
 <!--        where blockId = #{blockId}-->
 <!--    </select>-->
 
-<!--    <select id="selectFmsBlockBaseDataList" resultType="FmsBlock">-->
-<!--        <include refid="selectFmsBlockVo"/>-->
-<!--        <where>-->
-<!--            <if test="landId != null  and landId != ''"> and landId = #{landId}</if>-->
-<!--            <if test="blockName != null  and blockName != ''"> and blockName like concat('%', #{blockName}, '%')</if>-->
-<!--            <if test="blockNameEq != null  and blockNameEq != ''"> and blockName = #{blockNameEq}</if>-->
-<!--            <if test="blockType != null  and blockType != ''"> and blockType = #{blockType}</if>-->
-<!--            <if test="blockManager != null  and blockManager != ''"> and blockManager = #{blockManager}</if>-->
-<!--            <if test="blockManagername != null  and blockManagername != ''"> and blockManagername like concat('%', #{blockManagername}, '%')</if>-->
-<!--            <if test="blockArea != null "> and blockArea = #{blockArea}</if>-->
-<!--            <if test="blockAreaplant != null "> and blockAreaplant = #{blockAreaplant}</if>-->
-<!--            <if test="blockLngrange != null  and blockLngrange != ''"> and blockLngrange = #{blockLngrange}</if>-->
-<!--            <if test="blockColor != null  and blockColor != ''"> and blockColor = #{blockColor}</if>-->
-<!--            <if test="blockRemark != null  and blockRemark != ''"> and blockRemark = #{blockRemark}</if>-->
-<!--            <if test="blockId != null and blockId != ''">-->
-<!--                and blockId = #{blockId}-->
-<!--            </if>-->
-<!--            <if test="dataFilter == true and blockIds !=null and blockIds.size()>0">-->
-<!--                and b.blockId in-->
-<!--                <foreach collection="blockIds" item="blockId" index="index" open="(" close=")" separator=",">-->
-<!--                    #{blockId}-->
-<!--                </foreach>-->
-<!--            </if>-->
-<!--            <if test="landIds != null and landIds.size()!=0">-->
-<!--                and landId in-->
-<!--                <foreach collection="landIds" item="item" index="index" open="(" separator="," close=")">-->
-<!--                    #{item}-->
-<!--                </foreach>-->
-<!--            </if>-->
-<!--        </where>-->
-<!--    </select>-->
-<!--    -->
+
+
 
 
 <!--    <select id="selectFmsBlockListWithDevice" resultType="FmsBlockListWithDeviceResVo">-->

src/main/resources/mapper/TmnBlockMapper.xml

@@ -38,6 +38,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
+    <delete id="deleteTmnBlockByBlockIdsAndDevBid" parameterType="IotDeviceBindBlockDelVo">
+        delete from TmnBlock
+        where tmnId = #{tmnId} and tid = #{tid}
+            and blockId in
+            <foreach collection="blockIdList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+    </delete>
+
+    <delete id="deleteTmnBlockByTmnblockId" parameterType="String">
+        delete from TmnBlock where tmnblockId = #{tmnblockId}
+    </delete>
+
 <!--    <select id="selectCountByBlockId" parameterType="String" resultType="map">-->
 <!--        SELECT count(tmnId) count, blockId-->
 <!--        FROM TmnBlock-->
@@ -46,16 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-<!--    <delete id="deleteTmnBlockByTmnblockId" parameterType="String">-->
-<!--        delete from TmnBlock where tmnblockId = #{tmnblockId}-->
-<!--    </delete>-->
 
-<!--    <delete id="deleteTmnBlockByBlockIdsAndDevBid" parameterType="IotDeviceBindBlockDelVo">-->
-<!--        delete from TmnBlock where tmnId = #{tmnId} and blockId in-->
-<!--        <foreach collection="blockIdList" item="item" open="(" separator="," close=")">-->
-<!--            #{item}-->
-<!--        </foreach>-->
-<!--    </delete>-->
+
+
 
 
 <!--    <select id="selectTmnBlockByBlockIdsAndDevType" resultType="com.yunfeiyun.agmp.iot.common.domain.TmnBlock">-->

src/main/resources/mapper/TmnLandMapper.xml

@@ -38,6 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
+    <delete id="deleteTmnLand" parameterType="TmnLand">
+        delete from TmnLand where tmnlandId = #{tmnlandId} and tid = #{tid}
+    </delete>
+
 <!--    <select id="selectCountByLandId" parameterType="String" resultType="map">-->
 <!--        SELECT count(tmnId) count, landId-->
 <!--        FROM TmnLand-->
@@ -46,9 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-<!--    <delete id="deleteTmnLandByTmnlandId" parameterType="String">-->
-<!--        delete from TmnLand where tmnlandId = #{tmnlandId}-->
-<!--    </delete>-->
+
 
 
 </mapper>