更新！11

src/main/java/com/zswl/dataservice/controller/iot/IotSendController.java

@@ -45,7 +45,6 @@ public class IotSendController {
     @Operation(summary = "下发消息")
     @RequestMapping(value = "sendIotMessage", method = {RequestMethod.POST})
     public ResultContent sendIotMessage(@RequestBody @Valid IotSendParam param) {
-        param.setUserId(UserContext.currentUser().getId());
         return iotSendMessageService.sendIotMessage(param);
     }
 

src/main/java/com/zswl/dataservice/service/artemis/OperationMessageService.java

@@ -3,7 +3,7 @@ package com.zswl.dataservice.service.artemis;
 import cn.hutool.core.date.StopWatch;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import com.google.gson.JsonObject;
 import com.zswl.dataservice.dao.iot.IotMainDao;
 import com.zswl.dataservice.dao.mqtt.DeviceInfoDao;
@@ -26,7 +26,6 @@ import com.zswl.dataservice.service.base.SuperService;
 import com.zswl.dataservice.service.iot.IotDataVerifyService;
 import com.zswl.dataservice.service.mqtt.DeviceInfoService;
 import com.zswl.dataservice.service.mqtt.GateWayInfoService;
-import com.zswl.dataservice.service.payment.HxzService;
 import com.zswl.dataservice.type.FunctionType;
 import com.zswl.dataservice.type.OperationType;
 import com.zswl.dataservice.utils.CommonUtil;
@@ -49,7 +48,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Method;
@@ -469,7 +467,7 @@ public class OperationMessageService {
             String handleMsg = "处理成功";
 
             Long handlerTime = System.currentTimeMillis();
-            HxzBaseResult handleError = new HxzBaseResult();
+            IotBaseResult handleError = new IotBaseResult();
             // 是否需要返回
             Boolean isNeedReplay = Boolean.TRUE;
             String remoteUrl = iotMain.getRemoteUrl();

src/main/java/com/zswl/dataservice/service/base/CommonService.java

@@ -42,7 +42,7 @@ public class CommonService {
                     update.set(key, value);
                 }
             });
-            UpdateResult updateResult = mongoTemplate.upsert(query, update, collectionName);
+            UpdateResult updateResult = mongoTemplate.updateMulti(query, update, collectionName);
             return updateResult.getUpsertedId();
         }
         return null;
@@ -63,7 +63,7 @@ public class CommonService {
                 update.set(key, value);
             }
         });
-        UpdateResult updateResult = mongoTemplate.upsert(query, update, collectionName);
+        UpdateResult updateResult = mongoTemplate.updateMulti(query, update, collectionName);
         return updateResult.getUpsertedId();
     }
 

src/main/java/com/zswl/dataservice/service/mqtt/GateWayInfoService.java

@@ -328,6 +328,7 @@ public class GateWayInfoService extends SuperService {
                         ActiveMQServerControl addressControl = MBeanServerInvocationHandler.newProxyInstance(connection, addressObjectName, ActiveMQServerControl.class, false);
 
                         for (DeviceInfo deviceInfo : deviceInfos) {
+                            // 添加mqtt用户监听权限  绑定到角色上的
                             addressControl.addSecuritySettings(MqttTopicUtils.buildDeviceAllTopic(deviceInfo.getDeviceId()), roleName, roleName, roleName, roleName, roleName, roleName, roleName, roleName, roleName, roleName);
                         }
                     } catch (Exception e) {

src/main/java/com/zswl/dataservice/service/other/RequestInfoService.java

@@ -3,7 +3,7 @@ package com.zswl.dataservice.service.other;
 import com.zswl.dataservice.dao.payment.RequestInfoDao;
 import com.zswl.dataservice.domain.payment.RequestInfo;
 import com.zswl.dataservice.httpRequest.apiConf.APIResponseModel;
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import com.zswl.dataservice.type.RequestType;
 import com.zswl.dataservice.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +30,7 @@ public class RequestInfoService {
      * @param response
      * @return
      */
-    public boolean addHXZRequestInfo(Object param, HxzBaseResult response) {
+    public boolean addHXZRequestInfo(Object param, IotBaseResult response) {
         RequestInfo requestInfo = new RequestInfo();
         requestInfo.setParam(param);
         requestInfo.setResponse(response);

src/main/java/com/zswl/dataservice/service/payment/HxzService.java

@@ -2,7 +2,7 @@ package com.zswl.dataservice.service.payment;
 
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.models.hxz.*;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import com.zswl.dataservice.dao.mqtt.DeviceInfoDao;
 import com.zswl.dataservice.domain.ExecuteAnnotationService;
 import com.zswl.dataservice.domain.ExecuteAnnotationServiceMethod;

src/main/java/com/zswl/dataservice/service/sync/DeviceSyncFullCardService.java

@@ -124,13 +124,18 @@ public class DeviceSyncFullCardService extends SuperService {
         if (ObjectUtils.isNotEmpty(list)) {
             deviceInfos = list.stream().map(it -> {
                 DeviceInfoSyncParam syncParam = new DeviceInfoSyncParam();
-
                 BeanUtils.copyProperties(it, syncParam);
-                List<GateWay2Device> gateWay2Devices = gateWay2DeviceDao.findByDeviceInfo(it);
-                List<String> gateWayIds = gateWay2Devices.stream().map(it2 -> {
-                    return it2.getGateWayInfo().getGateWayId();
-                }).collect(Collectors.toList());
-                syncParam.setGateWayId(String.join(",", gateWayIds));
+
+                GateWay2Device gateWay2Device = gateWay2DeviceDao.findTopByDeviceInfoOrderByUpdateTimeDesc(it);
+                String gateWayId = "";
+                String gateWayName = "";
+                if (gateWay2Device != null && gateWay2Device.getGateWayInfo() != null) {
+                    GateWayInfo gateWayInfo = gateWay2Device.getGateWayInfo();
+                    gateWayId = gateWayInfo.getGateWayId();
+                    gateWayName = gateWayInfo.getGateWayName();
+                }
+                syncParam.setGateWayId(gateWayId);
+                syncParam.setGateWayName(gateWayName);
                 // 项目code
                 syncParam.setProjectInfoCode(it.getProjectInfoCode());
                 return syncParam;