Merge remote-tracking branch 'origin/master'

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/controller/IotDeviceCbdController.java

@@ -195,7 +195,6 @@ public class IotDeviceCbdController extends BaseController {
             Map<String, Object> map = new HashMap<>();
             map.put("devBid", resVo.getDevBid());
             map.put("cbdimgDelstatus", "0");
-            System.out.println(resVo.getDevBid()+"xxxxxxxxxxx");
             long count = mongoService.count(IotCbdimg.class, map);
             resVo.setImgCount(count);
 

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

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -32,4 +31,24 @@ public class IotDeviceAddReqVo {
     /** 设备名称 */
     @Excel(name = "设备名称")
     private String devName;
+
+    /** 经度 手动校准 */
+    @Excel(name = "经度 手动校准")
+    private BigDecimal devLngalign;
+
+    /** 纬度（校准） */
+    @Excel(name = "纬度", readConverterExp = "校=准")
+    private BigDecimal devLatalign;
+
+    /** 省 手动校准 */
+    @Excel(name = "省 手动校准")
+    private String devProvincealign;
+
+    /** 市（校准） */
+    @Excel(name = "市", readConverterExp = "校=准")
+    private String devCityalign;
+
+    /** 县（校准） */
+    @Excel(name = "县", readConverterExp = "校=准")
+    private String devDistrictalign;
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 /**
  * 设备基础对象 IotDevice
@@ -36,4 +37,24 @@ public class IotDeviceEditReqVo {
     @NotEmpty(message = "设备编号不能为空")
     @Excel(name = "设备名称")
     private String devName;
+
+    /** 经度 手动校准 */
+    @Excel(name = "经度 手动校准")
+    private BigDecimal devLngalign;
+
+    /** 纬度（校准） */
+    @Excel(name = "纬度", readConverterExp = "校=准")
+    private BigDecimal devLatalign;
+
+    /** 省 手动校准 */
+    @Excel(name = "省 手动校准")
+    private String devProvincealign;
+
+    /** 市（校准） */
+    @Excel(name = "市", readConverterExp = "校=准")
+    private String devCityalign;
+
+    /** 县（校准） */
+    @Excel(name = "县", readConverterExp = "校=准")
+    private String devDistrictalign;
 }

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

@@ -1,8 +1,5 @@
 package com.yunfeiyun.agmp.iotm.web.service.impl;
 
-import java.util.*;
-
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
@@ -15,11 +12,8 @@ import com.yunfeiyun.agmp.iot.common.enums.IotDeviceStatusTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.mq.IotDeviceEditMqModel;
 import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
-import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseCtlReqVo;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
-import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
-
+import com.yunfeiyun.agmp.iotm.mq.service.SendToIotsMsgService;
+import com.yunfeiyun.agmp.iotm.mq.service.SendToTosMsgService;
 import com.yunfeiyun.agmp.iotm.util.MyPageUtil;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceEditReqVo;
@@ -28,16 +22,17 @@ import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceModifyReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
-
-import com.yunfeiyun.agmp.iotm.mq.service.SendToTosMsgService;
-
-import com.yunfeiyun.agmp.iotm.mq.service.SendToIotsMsgService;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconnService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 设备基础Service业务层处理
@@ -71,6 +66,8 @@ public class IotDeviceServiceImpl implements IIotDeviceService
     public int addIotDevice(IotDeviceAddReqVo reqVo) {
         String devconnBid = reqVo.getDevconnBid();
         String[] devCodeList = reqVo.getDevCodeList();
+        BigDecimal devLngalign = reqVo.getDevLngalign();
+        BigDecimal devLatalign = reqVo.getDevLatalign();
 
         if(devCodeList == null || devCodeList.length == 0){
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(),"设备编码不能为空");
@@ -83,6 +80,8 @@ public class IotDeviceServiceImpl implements IIotDeviceService
         String devName = iotDeviceconn.getDevtypeName();
         if(devCodeList.length == 1){
             devName = reqVo.getDevName();
+            devLngalign = null;
+            devLatalign = null;
         }
 
         if(StringUtils.isEmpty(devName) ){
@@ -116,6 +115,11 @@ public class IotDeviceServiceImpl implements IIotDeviceService
             iotDevice.setDevCode(devCode);
             iotDevice.setDevName(devName);
             iotDevice.setDevStatus(IotDeviceStatusTypeEnum.WAIT_ACTIVATE.getCode());
+            iotDevice.setDevLngalign(devLngalign);
+            iotDevice.setDevLatalign(devLatalign);
+            iotDevice.setDevProvincealign(reqVo.getDevProvincealign());
+            iotDevice.setDevCityalign(reqVo.getDevCityalign());
+            iotDevice.setDevDistrictalign(reqVo.getDevDistrictalign());
             iotDevice.setDevCreator(SecurityUtils.getUserId());
             iotDevice.setDevCreateddate(DateUtils.dateTimeNow());
             iotDevice.setDevDelstatus(IotDeviceDelStatusEnum.NOT_DELETE.getCode());
@@ -156,6 +160,9 @@ public class IotDeviceServiceImpl implements IIotDeviceService
         String devName = reqVo.getDevName();
         String devCode = reqVo.getDevCode();
         String devconnBid = reqVo.getDevconnBid();
+        BigDecimal devLngalign = reqVo.getDevLngalign();
+        BigDecimal devLatalign = reqVo.getDevLatalign();
+
         if(StringUtils.isEmpty(devName) || StringUtils.isEmpty(devCode)){
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(),"参数不能为空");
         }
@@ -195,6 +202,11 @@ public class IotDeviceServiceImpl implements IIotDeviceService
         updateIotDevice.setDevtypeBid(newIotDeviceconn.getDevtypeBid());
         updateIotDevice.setDevconnBid(newIotDeviceconn.getDevconnBid());
         updateIotDevice.setFirmBid(newIotDeviceconn.getFirmBid());
+        updateIotDevice.setDevLngalign(devLngalign);
+        updateIotDevice.setDevLatalign(devLatalign);
+        updateIotDevice.setDevProvincealign(reqVo.getDevProvincealign());
+        updateIotDevice.setDevCityalign(reqVo.getDevCityalign());
+        updateIotDevice.setDevDistrictalign(reqVo.getDevDistrictalign());
         updateIotDevice.setDevModifier(SecurityUtils.getUserId());
         updateIotDevice.setDevModifieddate(DateUtils.dateTimeNow());