机构类型

src/main/java/com/zswl/dataservice/controller/free/GateWayFreeController.java

@@ -32,7 +32,6 @@ public class GateWayFreeController {
     @RequestMapping(value = "gateWayBindDevice", method = {RequestMethod.POST})
     public ResultContent gateWayBindDevice(@RequestBody GateWayBindDeviceParam param) {
         Assert.hasText(param.getGateWayId(), "网关ID不能为空");
-        Assert.hasText(param.getUserName(), "连接账号不能为空");
         return gateWayInfoService.gateWayBindDevice(param);
     }
 }

src/main/java/com/zswl/dataservice/controller/hardware/DeviceController.java

@@ -58,7 +58,7 @@ public class DeviceController {
         return deviceInfoService.deleteDeviceInfo(deviceId);
     }
 
-    @Operation(summary = "查询设备")
+    @Operation(summary = "查询设备详情")
     @RequestMapping(value = "getDeviceById", method = {RequestMethod.GET})
     public ResultContent<DeviceInfoModel> getDeviceById(
             @Parameter(name = "deviceId", description = "数据ID", example = "")

src/main/java/com/zswl/dataservice/domain/mqtt/GateWayInfo.java

@@ -26,6 +26,9 @@ public class GateWayInfo extends SuperEntity {
     @Schema(description = "网关名称")
     private String gateWayName;
 
+    @Schema(description = "ip地址")
+    private String ip;
+
     @Schema(description = "网关在线状态")
     OnLineState state;
 }

src/main/java/com/zswl/dataservice/init/UserInit.java

@@ -1,5 +1,6 @@
 package com.zswl.dataservice.init;
 
+import com.zswl.dataservice.service.base.InitService;
 import com.zswl.dataservice.service.user.impl.UserServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,15 +19,15 @@ import java.util.concurrent.TimeUnit;
 public class UserInit implements CommandLineRunner {
 
     @Autowired
-    UserServiceImpl userService;
+    InitService initService;
 
     @Override
     public void run(String... args) throws Exception {
         CompletableFuture.runAsync(() -> {
             try {
                 TimeUnit.SECONDS.sleep(10);
-                log.info("---------开始初始平台管理员信息-----------");
-                userService.initAdmin();
+                log.info("---------开始初始平台信息-----------");
+                initService.init();
             } catch (Exception e) {
                 e.printStackTrace();
             }

src/main/java/com/zswl/dataservice/model/mqtt/GateWayBindDeviceParam.java

@@ -18,6 +18,9 @@ public class GateWayBindDeviceParam {
     @Schema(description = "网关名称")
     private String gateWayName;
 
+    @Schema(description = "ip地址")
+    private String ip;
+
     @Schema(description = "设备列表")
     private List<DeviceInfoAddParam> devices;
 

src/main/java/com/zswl/dataservice/model/mqtt/ProjectInfoModel.java

@@ -10,6 +10,7 @@ import lombok.Data;
  * @date 2024/5/21
  */
 @Data
+@Schema(description = "项目信息")
 public class ProjectInfoModel extends SuperModel {
     @Schema(description = "名称")
     private String name;

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

@@ -0,0 +1,32 @@
+package com.zswl.dataservice.service.base;
+
+import com.zswl.dataservice.service.mqtt.GateWayUserInfoService;
+import com.zswl.dataservice.service.user.impl.UserServiceImpl;
+import com.zswl.dataservice.utils.result.ResultContent;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author TRX
+ * @date 2024/6/26
+ */
+@Slf4j
+@Service
+public class InitService extends SuperService {
+
+    @Autowired
+    UserServiceImpl userService;
+
+    @Autowired
+    GateWayUserInfoService gateWayUserInfoService;
+
+    public ResultContent init() {
+        userService.initAdmin();
+
+        gateWayUserInfoService.initDefaultUser();
+
+        return ResultContent.buildSuccess();
+    }
+
+}

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

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
 import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -94,7 +95,9 @@ public class GateWayInfoService {
         addGateWayInfo(addParam);
         // 网关信息
         GateWayInfo gateWayInfo = gateWayInfoDao.findTopByGateWayId(param.getGateWayId());
-
+        if (StringUtils.isEmpty(param.getUserName())) {
+            param.setUserName("admin");
+        }
         // 验证连接账号
         GateWayUserInfo gateWayUserInfo = gateWayUserInfoDao.findTopByUserName(param.getUserName());
         if (ObjectUtils.isEmpty(gateWayUserInfo)) {
@@ -106,7 +109,7 @@ public class GateWayInfoService {
             // 如果有绑定关系
             GateWayInfo oldGateWayInfo = gateWay2User.getGateWayInfo();
             if (!oldGateWayInfo.getGateWayId().equals(gateWayInfo.getGateWayId())) {
-                return ResultContent.buildFail(String.format("连接账号%s已使用", gateWayUserInfo.getUserName()));
+//                return ResultContent.buildFail(String.format("连接账号%s已使用", gateWayUserInfo.getUserName()));
             }
         }
 

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

@@ -51,6 +51,25 @@ public class GateWayUserInfoService {
     @Autowired
     Mqtt2UserDao mqtt2UserDao;
 
+    /**
+     * 初始mqtt连接账号信息
+     * @return
+     */
+    public ResultContent initDefaultUser() {
+        String userName = "admin";
+        GateWayUserInfo entity = gateWayUserInfoDao.findTopByUserName(userName);
+        if (ObjectUtils.isEmpty(entity)) {
+            GateWayUserInfoAddParam param = new GateWayUserInfoAddParam();
+            param.setUserName("admin");
+            param.setPassWord("admin123");
+            addGateWayUser(param);
+            log.info(String.format("gateWayUser [%s] 初始化成功", userName));
+        }else {
+            log.info(String.format("gateWayUser [%s] 已初始化", userName));
+        }
+        return ResultContent.buildSuccess();
+    }
+
     /**
      * 添加用户
      *