设备上电提交接口添加区域号保存逻辑

fastbee-admin/src/main/resources/application.yml

@@ -62,7 +62,8 @@ server:
 spring:
   # 环境配置，dev=开发环境，prod=生产环境
   profiles:
-    active: prod               # 环境配置，dev=开发环境，prod=生产环境
+    active: dev               # 环境配置，dev=开发环境，prod=生产环境
+#    active: prod               # 环境配置，dev=开发环境，prod=生产环境
   # 资源信息
   messages:
     # 国际化资源文件路径

fastbee-open-api/src/main/java/com/fastbee/data/controller/sse/DeviceReportSSEController.java

@@ -100,13 +100,15 @@ public class DeviceReportSSEController extends BaseController {
             return AjaxResultPro.success(1102,"voiceType不能为空!",null);
         }
         if(StringUtils.isBlank(reportInfo.getFacType())){
-            return AjaxResultPro.success(111,"facType不能为空!",null);
+            return AjaxResultPro.success(1102,"facType不能为空!",null);
 
         }
         if(StringUtils.isBlank(reportInfo.getTestRecord())){
-            return AjaxResultPro.success(111,"testRecord不能为空!",null);
+            return AjaxResultPro.success(1102,"testRecord不能为空!",null);
+        }
+        if(StringUtils.isBlank(reportInfo.getAreaCode())){
+            return AjaxResultPro.success(1102,"areaCode不能为空!",null);
         }
-
 
 //            String deviceNumber = generateDeviceNumber();
             //映射字段
@@ -123,6 +125,7 @@ public class DeviceReportSSEController extends BaseController {
             deviceReportInfo.setVoiceManufacturer(Long.valueOf(reportInfo.getVoiceType()));
             deviceReportInfo.setReplaceManufacturer(Long.valueOf(reportInfo.getFacType()));
             deviceReportInfo.setTestRecord(reportInfo.getTestRecord());
+            deviceReportInfo.setAreaCode(reportInfo.getAreaCode());
             //设置状态为未审核
             deviceReportInfo.setStatus(0);
         //设备编码查重
@@ -152,6 +155,7 @@ public class DeviceReportSSEController extends BaseController {
                             .set(DeviceReportInfo::getVoiceManufacturer, Long.valueOf(reportInfo.getVoiceType()))
                             .set(DeviceReportInfo::getReplaceManufacturer, Long.valueOf(reportInfo.getFacType()))
                             .set(DeviceReportInfo::getTestRecord,reportInfo.getTestRecord())
+                            .set(DeviceReportInfo::getAreaCode,reportInfo.getAreaCode())
                             .eq(DeviceReportInfo::getImei, deviceReportInfo.getImei())
                             .update();
                     if (update) {
@@ -187,7 +191,7 @@ public class DeviceReportSSEController extends BaseController {
         if(inserted==0){
             return AjaxResultPro.success(1104,"设备上电审核信息插入失败！",null);
         }
-        //插入成功后，插入设备信息
+        //插入成功后，插入设备信息----------------------------------------------插入即可mqtt连接--------------------------------
         Device device= new Device();
         device.setDeviceName(genDeviceNumber);
         device.setProductName("内乡县水电双计设备02");

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DevicePowerDTO.java

@@ -17,7 +17,8 @@ public class DevicePowerDTO {
     private String framType;
     private String facType;
     private String testRecord;
-
+    
+    private String areaCode;
     //---------------------------------
     String serialNumber;
 }