学校功能

src/main/java/com/zswl/dataservice/auth/JWTManager.java

@@ -11,7 +11,7 @@ import com.auth0.jwt.interfaces.JWTVerifier;
 import com.auth0.jwt.interfaces.RSAKeyProvider;
 import com.zswl.dataservice.config.SystemDefaultConfig;
 import com.zswl.dataservice.model.user.LoginUser;
-import com.zswl.dataservice.service.RedisService;
+import com.zswl.dataservice.service.base.RedisService;
 import com.zswl.dataservice.utils.ConfigDict;
 import com.zswl.dataservice.utils.exception.UnauthorizedException;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/zswl/dataservice/auth/UserContextInterceptor.java

@@ -3,7 +3,7 @@ package com.zswl.dataservice.auth;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zswl.dataservice.model.user.LoginUser;
-import com.zswl.dataservice.service.RedisService;
+import com.zswl.dataservice.service.base.RedisService;
 import com.zswl.dataservice.utils.exception.UnauthorizedException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -12,7 +12,6 @@ import org.apache.commons.codec.binary.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.handler.WebRequestHandlerInterceptorAdapter;
 
 //@Slf4j
 public class UserContextInterceptor implements HandlerInterceptor {

src/main/java/com/zswl/dataservice/components/DataRecord.java

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.components;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import lombok.*;
 import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zswl/dataservice/config/WebMvcConfig.java

@@ -3,17 +3,12 @@ package com.zswl.dataservice.config;
 import com.zswl.dataservice.auth.AuthSettings;
 import com.zswl.dataservice.auth.JWTManager;
 import com.zswl.dataservice.auth.UserContextInterceptor;
-import com.zswl.dataservice.service.RedisService;
+import com.zswl.dataservice.service.base.RedisService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.reflect.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.servlet.config.annotation.*;
 
-import java.lang.reflect.Field;
-import java.util.List;
-
 /**
  * @author TRX
  * @date 2024/3/21

src/main/java/com/zswl/dataservice/controller/TestController.java

@@ -1,7 +1,7 @@
 package com.zswl.dataservice.controller;
 
 import com.zswl.dataservice.model.mqtt.SendMessageModel;
-import com.zswl.dataservice.service.UserService;
+import com.zswl.dataservice.service.user.UserService;
 import com.zswl.dataservice.utils.result.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

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

@@ -1,11 +1,8 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.hardware;
 
-import com.zswl.dataservice.model.TokenModel;
 import com.zswl.dataservice.model.mqtt.DeviceInfoAddParam;
 import com.zswl.dataservice.model.mqtt.DeviceInfoModel;
 import com.zswl.dataservice.model.mqtt.DeviceInfoSearchParam;
-import com.zswl.dataservice.model.params.TokenParam;
-import com.zswl.dataservice.service.AppInfoService;
 import com.zswl.dataservice.service.mqtt.DeviceInfoService;
 import com.zswl.dataservice.utils.result.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
@@ -22,9 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 设备管理 服务
  *

src/main/java/com/zswl/dataservice/controller/GateWayController.java → src/main/java/com/zswl/dataservice/controller/hardware/GateWayController.java

@@ -1,4 +1,4 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.hardware;
 
 import com.zswl.dataservice.model.mqtt.*;
 import com.zswl.dataservice.service.mqtt.GateWayInfoService;

src/main/java/com/zswl/dataservice/controller/GateWayUserInfoController.java → src/main/java/com/zswl/dataservice/controller/hardware/GateWayUserInfoController.java

@@ -1,7 +1,6 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.hardware;
 
 import com.zswl.dataservice.model.mqtt.*;
-import com.zswl.dataservice.service.mqtt.DeviceInfoService;
 import com.zswl.dataservice.service.mqtt.GateWayUserInfoService;
 import com.zswl.dataservice.utils.result.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/zswl/dataservice/controller/MqttInfoController.java → src/main/java/com/zswl/dataservice/controller/hardware/MqttInfoController.java

@@ -1,17 +1,11 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.hardware;
 
 import com.zswl.dataservice.model.mqtt.*;
-import com.zswl.dataservice.service.mqtt.DeviceInfoService;
 import com.zswl.dataservice.service.mqtt.MqttInfoService;
 import com.zswl.dataservice.utils.result.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
-import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/zswl/dataservice/controller/OperationLogsController.java → src/main/java/com/zswl/dataservice/controller/hardware/OperationLogsController.java

@@ -1,4 +1,4 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.hardware;
 
 import com.zswl.dataservice.model.operLogs.OperationLogsModel;
 import com.zswl.dataservice.model.operLogs.OperationLogsSearchParam;

src/main/java/com/zswl/dataservice/controller/OperationMessageController.java → src/main/java/com/zswl/dataservice/controller/hardware/OperationMessageController.java

@@ -1,4 +1,4 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.hardware;
 
 import com.zswl.dataservice.model.mqtt.*;
 import com.zswl.dataservice.service.mqtt.DeviceInfoService;
@@ -11,9 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/zswl/dataservice/controller/OauthController.java → src/main/java/com/zswl/dataservice/controller/user/OauthController.java

@@ -1,23 +1,22 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.user;
 
-import com.zswl.dataservice.model.TokenModel;
 import com.zswl.dataservice.model.params.LoginModel;
-import com.zswl.dataservice.model.params.TokenParam;
-import com.zswl.dataservice.service.AppInfoService;
-import com.zswl.dataservice.service.AuthService;
-import com.zswl.dataservice.service.UserService;
+import com.zswl.dataservice.model.user.LoginUser;
+import com.zswl.dataservice.service.user.AuthService;
+import com.zswl.dataservice.service.user.UserService;
 import com.zswl.dataservice.utils.result.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 访问令牌 服务
  *
@@ -27,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/oauth")
 @RestController
 @Validated
+@Tag(name = "登录")
 public class OauthController {
 
     @Autowired
@@ -43,14 +43,23 @@ public class OauthController {
 
     @Operation(summary = "创建Token，需要提供登录名和密码！")
     @RequestMapping(value = "/free/token", method = {RequestMethod.POST})
-    public ResultContent createToken(LoginModel data) {
+    public ResultContent createToken(LoginModel data, HttpServletRequest request, HttpServletResponse response) {
         if (StringUtils.isEmpty(data.getLoginName())) {
             return ResultContent.buildFail("登录名不能为空");
         }
         if (StringUtils.isEmpty(data.getPassWord())) {
             return ResultContent.buildFail("密码名不能为空");
         }
-        return authService.createToken(data);
+        ResultContent<LoginUser> resultContent = authService.createToken(data);
+        if (resultContent.isSuccess()) {
+            LoginUser loginUser = resultContent.getContent();
+            response.setHeader("accessToken", loginUser.getToken());
+            Cookie cookie = new Cookie("accessToken", loginUser.getToken());
+            cookie.setMaxAge(60 * 60 * 24 * 3);
+            cookie.setPath("/");
+            response.addCookie(cookie);
+        }
+        return resultContent;
     }
 
 }

src/main/java/com/zswl/dataservice/controller/ProjectInfoController.java → src/main/java/com/zswl/dataservice/controller/user/ProjectInfoController.java

@@ -1,6 +1,8 @@
-package com.zswl.dataservice.controller;
+package com.zswl.dataservice.controller.user;
 
-import com.zswl.dataservice.model.mqtt.*;
+import com.zswl.dataservice.model.mqtt.ProjectInfoAddParam;
+import com.zswl.dataservice.model.mqtt.ProjectInfoModel;
+import com.zswl.dataservice.model.mqtt.ProjectInfoSearchParam;
 import com.zswl.dataservice.service.mqtt.DeviceInfoService;
 import com.zswl.dataservice.service.mqtt.ProjectInfoService;
 import com.zswl.dataservice.utils.result.ResultContent;
@@ -11,10 +13,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.http.MediaType;
-import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 项目 服务

src/main/java/com/zswl/dataservice/controller/user/UserController.java

@@ -0,0 +1,62 @@
+package com.zswl.dataservice.controller.user;
+
+import com.zswl.dataservice.model.mqtt.DeviceInfoAddParam;
+import com.zswl.dataservice.model.mqtt.DeviceInfoModel;
+import com.zswl.dataservice.model.mqtt.DeviceInfoSearchParam;
+import com.zswl.dataservice.service.mqtt.DeviceInfoService;
+import com.zswl.dataservice.utils.result.ResultContent;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.util.Assert;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用户管理 服务
+ *
+ * @author TRX
+ * @date 2024/3/21
+ */
+@RequestMapping("/user/userInfo")
+@RestController
+@Validated
+@Tag(name = "用户管理")
+public class UserController {
+
+    @Autowired
+    DeviceInfoService deviceInfoService;
+
+    @Operation(summary = "添加设备")
+    @RequestMapping(value = "addDeviceInfo", method = {RequestMethod.POST})
+    public ResultContent addDeviceInfo(@RequestBody DeviceInfoAddParam param) {
+        Assert.hasText(param.getDeviceId(), "设备ID不能为空");
+        Assert.hasText(param.getDeviceName(), "设备名称不能为空");
+        return deviceInfoService.addDeviceInfo(param);
+    }
+
+    @Operation(summary = "设备列表-分页查询")
+    @RequestMapping(value = {"pageActivity"}, method = {RequestMethod.POST})
+    public ResultContent<Page<DeviceInfoModel>> pageActivity(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) DeviceInfoSearchParam param) {
+        return deviceInfoService.pageDevice(pageable, param);
+    }
+
+    @Operation(summary = "删除设备")
+    @RequestMapping(value = "deleteDeviceInfo", method = {RequestMethod.GET})
+    public ResultContent deleteDeviceInfo(String deviceId) {
+        return deviceInfoService.deleteDeviceInfo(deviceId);
+    }
+
+    @Operation(summary = "查询设备")
+    @RequestMapping(value = "getDeviceById", method = {RequestMethod.GET})
+    public ResultContent<DeviceInfoModel> getDeviceById(String deviceId) {
+        return deviceInfoService.getDeviceById(deviceId);
+    }
+}

src/main/java/com/zswl/dataservice/dao/AppInfoDao.java

@@ -1,11 +1,6 @@
 package com.zswl.dataservice.dao;
 
-import com.zswl.dataservice.domain.AppInfo;
-import com.zswl.dataservice.domain.SuperEntity;
-import com.zswl.dataservice.domain.User;
-import org.springframework.data.mongodb.repository.MongoRepository;
-
-import java.util.List;
+import com.zswl.dataservice.domain.user.AppInfo;
 
 /**
  * @author TRX

src/main/java/com/zswl/dataservice/dao/MongoDao.java

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.dao;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 /**

src/main/java/com/zswl/dataservice/dao/TokenLoginDao.java

@@ -1,7 +1,7 @@
 package com.zswl.dataservice.dao;
 
-import com.zswl.dataservice.domain.TokenLogin;
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.user.TokenLogin;
+import com.zswl.dataservice.domain.user.User;
 
 public interface TokenLoginDao extends MongoDao<TokenLogin> {
     TokenLogin findTopByUser(User user);

src/main/java/com/zswl/dataservice/dao/UserDao.java

@@ -1,9 +1,7 @@
 package com.zswl.dataservice.dao;
 
 import com.zswl.dataservice.dao.extend.UserDaoExtend;
-import com.zswl.dataservice.domain.User;
-
-import java.util.List;
+import com.zswl.dataservice.domain.user.User;
 
 public interface UserDao extends MongoDao<User>, UserDaoExtend {
 

src/main/java/com/zswl/dataservice/dao/extend/UserDaoExtend.java

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.dao.extend;
 
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.user.User;
 import com.zswl.dataservice.model.user.UserSearchParams;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/com/zswl/dataservice/dao/impl/UserDaoImpl.java

@@ -1,7 +1,7 @@
 package com.zswl.dataservice.dao.impl;
 
 import com.zswl.dataservice.dao.extend.UserDaoExtend;
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.user.User;
 import com.zswl.dataservice.helper.DBHelper;
 import com.zswl.dataservice.model.user.UserSearchParams;
 import org.apache.commons.lang3.ObjectUtils;

src/main/java/com/zswl/dataservice/dao/mqtt/DeviceInfoDao.java

@@ -2,7 +2,6 @@ package com.zswl.dataservice.dao.mqtt;
 
 import com.zswl.dataservice.dao.MongoDao;
 import com.zswl.dataservice.dao.mqtt.extend.DeviceInfoDaoExtend;
-import com.zswl.dataservice.domain.AppInfo;
 import com.zswl.dataservice.domain.mqtt.DeviceInfo;
 
 /**

src/main/java/com/zswl/dataservice/domain/SuperEntity.java → src/main/java/com/zswl/dataservice/domain/base/SuperEntity.java

@@ -1,4 +1,4 @@
-package com.zswl.dataservice.domain;
+package com.zswl.dataservice.domain.base;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.EntityListeners;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.mqtt.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.mqtt.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.mqtt.type.MqttUserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.mqtt.type.AddressType;
 import com.zswl.dataservice.utils.mqtt.type.CommonState;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,7 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.mqtt.type.LoginType;
 import com.zswl.dataservice.utils.mqtt.type.LogsLevel;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.domain.mqtt;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.mqtt.type.CommonState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

src/main/java/com/zswl/dataservice/domain/AppInfo.java → src/main/java/com/zswl/dataservice/domain/user/AppInfo.java

@@ -1,5 +1,6 @@
-package com.zswl.dataservice.domain;
+package com.zswl.dataservice.domain.user;
 
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.type.AppState;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/zswl/dataservice/domain/TokenLogin.java → src/main/java/com/zswl/dataservice/domain/user/TokenLogin.java

@@ -1,5 +1,6 @@
-package com.zswl.dataservice.domain;
+package com.zswl.dataservice.domain.user;
 
+import com.zswl.dataservice.domain.base.SuperEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/zswl/dataservice/domain/User.java → src/main/java/com/zswl/dataservice/domain/user/User.java

@@ -1,5 +1,6 @@
-package com.zswl.dataservice.domain;
+package com.zswl.dataservice.domain.user;
 
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.type.UserState;
 import com.zswl.dataservice.type.UserType;
 import io.swagger.v3.oas.annotations.media.Schema;

src/main/java/com/zswl/dataservice/helper/BatchQueryHelper.java

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.helper;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.bean.EntityObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;

src/main/java/com/zswl/dataservice/helper/DBHelper.java

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.helper;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.helper.jpa.TransactionHelper;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/zswl/dataservice/helper/ReIndexHelper.java

@@ -1,6 +1,6 @@
 package com.zswl.dataservice.helper;
 
-import com.zswl.dataservice.domain.SuperEntity;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import com.zswl.dataservice.utils.bean.BeanUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/zswl/dataservice/model/params/LoginModel.java

@@ -1,10 +1,13 @@
 package com.zswl.dataservice.model.params;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
+ * 登录model
+ *
  * @author TRX
  * @date 2024/4/7
  */
@@ -12,18 +15,16 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class LoginModel {
-    /**
-     * 登录名
-     */
+
+    @Schema(description = "登录名", example = "admin")
     private String loginName;
-    /**
-     * 密码
-     */
+
+    @Schema(description = "密码", example = "123abc")
     private String passWord;
-    /**
-     * 登录类型 Pc
-     */
+
+    @Schema(description = "登录类型 Pc")
     private String deviceType;
 
+    @Schema(description = "设备的uuid")
     private String deviceUUid;
 }

src/main/java/com/zswl/dataservice/service/RedisService.java → src/main/java/com/zswl/dataservice/service/base/RedisService.java

@@ -1,4 +1,4 @@
-package com.zswl.dataservice.service;
+package com.zswl.dataservice.service.base;
 
 import com.zswl.dataservice.utils.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zswl/dataservice/service/SuperService.java → src/main/java/com/zswl/dataservice/service/base/SuperService.java

@@ -1,8 +1,8 @@
-package com.zswl.dataservice.service;
+package com.zswl.dataservice.service.base;
 
 import com.zswl.dataservice.auth.UserContext;
 import com.zswl.dataservice.dao.UserDao;
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.user.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 

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

@@ -1,8 +1,6 @@
 package com.zswl.dataservice.service.mqtt;
 
-import com.zswl.dataservice.auth.UserContext;
 import com.zswl.dataservice.dao.mqtt.DeviceInfoDao;
-import com.zswl.dataservice.domain.User;
 import com.zswl.dataservice.domain.mqtt.DeviceInfo;
 import com.zswl.dataservice.model.mqtt.DeviceInfoAddParam;
 import com.zswl.dataservice.model.mqtt.DeviceInfoModel;

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

@@ -2,12 +2,12 @@ package com.zswl.dataservice.service.mqtt;
 
 import com.zswl.dataservice.dao.UserDao;
 import com.zswl.dataservice.dao.mqtt.OperationLogsDao;
-import com.zswl.dataservice.domain.SuperEntity;
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.base.SuperEntity;
+import com.zswl.dataservice.domain.user.User;
 import com.zswl.dataservice.domain.mqtt.OperationLogs;
 import com.zswl.dataservice.model.operLogs.OperationLogsModel;
 import com.zswl.dataservice.model.operLogs.OperationLogsSearchParam;
-import com.zswl.dataservice.service.SuperService;
+import com.zswl.dataservice.service.base.SuperService;
 import com.zswl.dataservice.utils.DateUtils;
 import com.zswl.dataservice.utils.bean.BeanUtils;
 import com.zswl.dataservice.utils.mqtt.type.LogsLevel;

src/main/java/com/zswl/dataservice/service/AppInfoService.java → src/main/java/com/zswl/dataservice/service/user/AppInfoService.java

@@ -1,7 +1,7 @@
-package com.zswl.dataservice.service;
+package com.zswl.dataservice.service.user;
 
 import com.zswl.dataservice.dao.AppInfoDao;
-import com.zswl.dataservice.domain.AppInfo;
+import com.zswl.dataservice.domain.user.AppInfo;
 import com.zswl.dataservice.model.TokenModel;
 import com.zswl.dataservice.model.params.TokenParam;
 import com.zswl.dataservice.type.AppState;
@@ -11,8 +11,6 @@ import com.zswl.dataservice.utils.result.ResultContent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.security.MessageDigest;
-
 /**
  * @author TRX
  * @date 2024/3/21

src/main/java/com/zswl/dataservice/service/AuthService.java → src/main/java/com/zswl/dataservice/service/user/AuthService.java

@@ -1,13 +1,14 @@
-package com.zswl.dataservice.service;
+package com.zswl.dataservice.service.user;
 
 import com.zswl.dataservice.auth.JWTManager;
 import com.zswl.dataservice.config.SystemDefaultConfig;
 import com.zswl.dataservice.dao.TokenLoginDao;
 import com.zswl.dataservice.dao.UserDao;
-import com.zswl.dataservice.domain.TokenLogin;
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.user.TokenLogin;
+import com.zswl.dataservice.domain.user.User;
 import com.zswl.dataservice.model.params.LoginModel;
 import com.zswl.dataservice.model.user.LoginUser;
+import com.zswl.dataservice.service.base.RedisService;
 import com.zswl.dataservice.type.UserState;
 import com.zswl.dataservice.type.UserType;
 import com.zswl.dataservice.utils.bean.BeanUtils;
@@ -17,7 +18,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 
 /**

src/main/java/com/zswl/dataservice/service/UserService.java → src/main/java/com/zswl/dataservice/service/user/UserService.java

@@ -1,11 +1,12 @@
-package com.zswl.dataservice.service;
+package com.zswl.dataservice.service.user;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonObject;
 import com.zswl.dataservice.config.SystemDefaultConfig;
 import com.zswl.dataservice.dao.UserDao;
-import com.zswl.dataservice.domain.User;
+import com.zswl.dataservice.domain.user.User;
 import com.zswl.dataservice.model.mqtt.SendMessageModel;
+import com.zswl.dataservice.service.base.RedisService;
 import com.zswl.dataservice.type.ResultState;
 import com.zswl.dataservice.type.UserState;
 import com.zswl.dataservice.type.UserType;
@@ -71,8 +72,14 @@ public class UserService {
         return ResultContent.buildSuccess();
     }
 
+
+    public ResultContent updateUserPassWord() {
+
+        return ResultContent.buildSuccess();
+    }
+
     /**
-     * 验证用户密码私发正确
+     * 验证用户密码是否正确
      *
      * @param uid
      * @param passWord

src/main/java/com/zswl/dataservice/utils/bean/EntityObjectUtil.java

@@ -1,8 +1,7 @@
 package com.zswl.dataservice.utils.bean;
 
 
-import com.zswl.dataservice.domain.SuperEntity;
-import com.zswl.dataservice.utils.bean.BeanUtil;
+import com.zswl.dataservice.domain.base.SuperEntity;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Update;