From bc340780898066d6b0134abaa92be025b17ed13e Mon Sep 17 00:00:00 2001 From: mi9688 Date: Wed, 8 Jan 2025 08:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=8A=E7=94=B5=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E5=8F=B7=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastbee-admin/src/main/resources/application.yml | 3 ++- .../controller/sse/DeviceReportSSEController.java | 12 ++++++++---- .../com/fastbee/iot/model/dto/DevicePowerDTO.java | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fastbee-admin/src/main/resources/application.yml b/fastbee-admin/src/main/resources/application.yml index e87bcbd..f00bf0f 100644 --- a/fastbee-admin/src/main/resources/application.yml +++ b/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: # 国际化资源文件路径 diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/sse/DeviceReportSSEController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/sse/DeviceReportSSEController.java index a18a67c..e95f42e 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/sse/DeviceReportSSEController.java +++ b/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"); diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DevicePowerDTO.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DevicePowerDTO.java index 551b407..3c1106c 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DevicePowerDTO.java +++ b/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; } \ No newline at end of file