新增 复制虫情配置信息接口

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

@@ -61,4 +61,6 @@ public interface IotWarncountMapper {
     public int deleteIotWarncountByWctBids(@Param("array") String[] ids, @Param("tid") String tid);
 
     public int deleteIotWarncountByDevBidAndWcBid(@Param("devBid") String devBid, @Param("wcBid") String wcBid, @Param("tid") String tid);
+
+    public int deleteIotWarncountByWcBid(@Param("wcBids") String[] wcBids, @Param("tid") String tid);
 }

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

@@ -70,4 +70,6 @@ public interface IotWarnindicatorMapper {
      * @return 结果
      */
     public int insertIotWarnindicatorBatch(List<IotWarnindicator> iotWarnindicator);
+
+    int deleteIotWarnindicatorByWcBids(@Param("array") String[] wcBids, @Param("tid") String tid);
 }

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

@@ -65,4 +65,12 @@ public interface IotWarnobjectMapper {
     List<IotWarnobjectResVo> selectIotWarnobjectResVoList(IotWarnobject iotWarnobject);
 
     List<IotWarnobject> selectIotWarnobjectListByWcBids(@Param("list") List<String> wcBids,@Param("tid") String tid);
+
+    /**
+     * 批量删除告警对象
+     *
+     * @param woBids 需要删除的告警对象主键集合
+     * @return 结果
+     */
+    public int deleteIotWarnobjectByWcBids(@Param("array") String[] wcBids, @Param("tid") String tid);
 }

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

@@ -61,4 +61,6 @@ public interface IIotWarncountService {
     public int deleteIotWarncountByWctBid(String wctBid, String tid);
 
     public int deleteIotWarncountByDevBidAndWcBid(String devBid, String wcBid, String tid);
+
+    public int deleteIotWarncountByWcBid(String[] wcBids, String tid);
 }

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

@@ -95,4 +95,6 @@ public interface IIotWarnindicatorService {
     public int insertIotWarnindicatorBatch(List<IotWarnindicator> iotWarnindicator);
 
     int deleteIotWarnindicatorByWcBid(String wcBid, String tid);
+
+    int deleteIotWarnindicatorByWcBids(String[] wcBids, String tid);
 }

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

@@ -68,4 +68,12 @@ public interface IIotWarnobjectService {
      * @return 结果
      */
     public int deleteIotWarnobjectByWoBid(String woBid, String tid);
+
+    /**
+     * 批量删除告警对象
+     *
+     * @param woBids 需要删除的告警对象主键集合
+     * @return 结果
+     */
+    public int deleteIotWarnobjectByWcBids(String[] wcBids, String tid);
 }

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

@@ -167,9 +167,14 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
      * @param wcBids 需要删除的告警配置主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteIotWarnconfigWcBids(String[] wcBids, String tid){
-        return iotWarnconfigMapper.deleteIotWarnconfigWcBids(wcBids, tid);
+        int status = iotWarnconfigMapper.deleteIotWarnconfigWcBids(wcBids, tid);
+        iIotWarncountService.deleteIotWarncountByWcBid(wcBids, tid);
+        iotWarnindicatorService.deleteIotWarnindicatorByWcBids(wcBids, tid);
+        iotWarnobjectService.deleteIotWarnobjectByWcBids(wcBids, tid);
+        return status;
     }
 
     /**

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

@@ -5,6 +5,7 @@ import com.yunfeiyun.agmp.iotm.web.mapper.IotWarncountMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarncountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -86,8 +87,14 @@ public class IotWarncountServiceImpl implements IIotWarncountService {
         return iotWarncountMapper.deleteIotWarncountByWctBid(wctBid, tid);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteIotWarncountByDevBidAndWcBid(String devBid, String wcBid, String tid) {
         return iotWarncountMapper.deleteIotWarncountByDevBidAndWcBid(devBid, wcBid, tid);
     }
+
+    @Override
+    public int deleteIotWarncountByWcBid(String[] wcBids, String tid) {
+        return iotWarncountMapper.deleteIotWarncountByWcBid(wcBids, tid);
+    }
 }

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

@@ -8,6 +8,7 @@ import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.util.dev.DevTypeUtil;
+import com.yunfeiyun.agmp.iot.common.util.dev.QxElementTypeUtil;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseFunReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceCommonService;
@@ -160,11 +161,14 @@ public class IotWarnindicatorServiceImpl implements IIotWarnindicatorService {
         // 直接返回设备上报的数据
         for (int i = 0; i < jsonArray.size(); i++) {
             JSONObject dataItem = jsonArray.getJSONObject(i);
+            String factorCode = dataItem.getString("factorCode");
+            String typeName = QxElementTypeUtil.getTypeName(factorCode);
             IotWarnindicator iotWarnindicator = new IotWarnindicator();
             iotWarnindicator.setWiAddress(dataItem.getString("address"));
-            iotWarnindicator.setWiCode(dataItem.getString("factorCode"));
+            iotWarnindicator.setWiCode(factorCode);
             iotWarnindicator.setWiName(dataItem.getString("factorName"));
             iotWarnindicator.setWiUnit(dataItem.getString("factorUnit"));
+            iotWarnindicator.setTypeName(typeName);
             result.add(iotWarnindicator);
         }
         return result;
@@ -266,4 +270,9 @@ public class IotWarnindicatorServiceImpl implements IIotWarnindicatorService {
         return iotWarnindicatorMapper.deleteIotWarnindicatorByWcBid(wcBid,tid);
     }
 
+    @Override
+    public int deleteIotWarnindicatorByWcBids(String[] wcBids, String tid) {
+        return iotWarnindicatorMapper.deleteIotWarnindicatorByWcBids(wcBids, tid);
+    }
+
 }

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

@@ -118,4 +118,16 @@ public class IotWarnobjectServiceImpl implements IIotWarnobjectService {
     public int deleteIotWarnobjectByWoBid(String woBid, String tid){
         return iotWarnobjectMapper.deleteIotWarnobjectByWoBid(woBid, tid);
     }
+
+    /**
+     * 批量删除告警对象
+     *
+     * @param wcBids
+     * @param tid
+     * @return 结果
+     */
+    @Override
+    public int deleteIotWarnobjectByWcBids(String[] wcBids, String tid) {
+        return iotWarnobjectMapper.deleteIotWarnobjectByWcBids(wcBids, tid);
+    }
 }

src/main/resources/mapper/IotWarncountMapper.xml

@@ -82,4 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteIotWarncountByDevBidAndWcBid">
         delete from IotWarncount where wcBid = #{wcBid} and devBid = #{devBid} and tid = #{tid}
     </delete>
+
+    <delete id="deleteIotWarncountByWcBid">
+        delete from IotWarncount where wcBid in
+        <foreach item="wcBid" collection="array" open="(" separator="," close=")">
+            #{wcBid}
+        </foreach>
+    </delete>
 </mapper>

src/main/resources/mapper/IotWarnindicatorMapper.xml

@@ -152,4 +152,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteIotWarnindicatorByWcBid">
         delete from IotWarnindicator where wcBid = #{wcBid} and tid = #{tid}
     </delete>
+
+    <delete id="deleteIotWarnindicatorByWcBids">
+        delete from IotWarnindicator where tid = #{tid} and wcBid in
+        <foreach item="wcBid" collection="array" open="(" separator="," close=")">
+            #{wcBid}
+        </foreach>
+    </delete>
 </mapper>

src/main/resources/mapper/IotWarnobjectMapper.xml

@@ -91,4 +91,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and tid = #{tid}
         </where>
     </select>
+
+    <delete id="deleteIotWarnobjectByWcBids">
+        delete from IotWarnobject where tid = #{tid} and wcBid in
+        <foreach item="wcBid" collection="array" open="(" separator="," close=")">
+            #{wcBid}
+        </foreach>
+    </delete>
 </mapper>