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

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

@@ -71,6 +71,6 @@ mybatis-plus:
 # 阿里云对接配置
 aliyun:
   server-subscription:
-    enable: false  # 是否开启阿里云物联网服务端订阅
+    enable: true  # 是否开启阿里云物联网服务端订阅
   product:
     productKey: a1ALlsBa2ZK

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceEntity.java

@@ -76,7 +76,7 @@ public class BusDeviceEntity extends TenantGenericEntity<String,String> {
      * 根据阿里云返回的数据更新设备对象
      * @param data 由queryDeviceDetail接口返回的数据
      */
-    public void setFields(QueryDeviceDetailResponse.Data data) {
+    public void updateFields(QueryDeviceDetailResponse.Data data) {
         this.deviceId = data.getDeviceName();
         this.config.setProductKey(data.getProductKey());
         this.config.setIotId(data.getIotId());
@@ -90,7 +90,7 @@ public class BusDeviceEntity extends TenantGenericEntity<String,String> {
      * 根据设备查询接口返回的数据，更新设备对象
      * @param item
      */
-    public void setFields(QueryDeviceResponse.DeviceInfo item) {
+    public void updateFields(QueryDeviceResponse.DeviceInfo item) {
         this.deviceId = item.getDeviceName();
         this.config.setProductKey(item.getProductKey());
         this.config.setIotId(item.getIotId());

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceRunningEntity.java

@@ -92,7 +92,7 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
      * @param items
      */
     public void setFiledsByItems(String deviceName, Items items) {
-        this.setDeviceId(deviceName)  ;
+        this.setDeviceId(deviceName);
         this.setClassification( items.getString(PumpParams.classification));
         this.setDataNumber(items.getInteger(PumpParams.dataNumber));
         this.setPatientCode( items.getString(PumpParams.patientCode));

coffee-system/src/main/java/com/coffee/bus/service/LocalBusDeviceService.java

@@ -151,7 +151,7 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
         QueryDeviceDetailResponse response = aliyunIotSdk.queryDeviceDetail(deviceId);
         // 设备存在
         if (response.getSuccess()){
-            device.setFields(response.getData());
+            device.updateFields(response.getData());
             // 存储设备
             this.saveByDeviceId(device);
             return device;
@@ -171,7 +171,7 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
             BusDeviceEntity device = new BusDeviceEntity();
             device.setConfig(new AliIotConfig());
             // 更新设备属性
-            device.setFields(item);
+            device.updateFields(item);
             n.updateAndGet(v -> v + (this.saveByDeviceId(device)?1:0));
         });
         return n.get();