Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/DeviceServiceImpl.java

@@ -41,6 +41,9 @@ import com.zcxk.rmcp.web.service.ProductService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -76,6 +79,8 @@ public class DeviceServiceImpl implements DeviceService{
     private InstallListMapper installListMapper;
     @Resource
     private DeviceAlarmMapper deviceAlarmMapper;
+    @Autowired
+    private MongoTemplate mongoTemplate;
 
     @Override
     public int insertSelective(Device record) {
@@ -195,6 +200,11 @@ public class DeviceServiceImpl implements DeviceService{
         installListMapper.deleteByDeviceId(ids);
         // 删除告警记录
         deviceAlarmMapper.deleteByDeviceId(ids);
+
+        // 删除抄表记录
+        Query query = new Query();
+        query.addCriteria(Criteria.where("deviceId").in(ids));
+        mongoTemplate.remove(query,"rmcp_meter_read_record");
         log.info("end DeviceServiceImpl batchDel ");
     }