fix:第一次提交

pom.xml

@@ -83,17 +83,11 @@
             <artifactId>okio</artifactId>
             <version>3.6.0</version>
         </dependency>
-        <!-- mybatis-flex -->
         <dependency>
-            <groupId>com.mybatis-flex</groupId>
-            <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
-            <version>1.9.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-<!--        redis-->
+        <!--        redis-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -125,6 +119,25 @@
             <version>0.11.5</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.49</version>
+        </dependency>
+        <dependency>
+            <groupId>io.hypersistence</groupId>
+            <artifactId>hypersistence-utils-hibernate-63</artifactId>
+            <version>3.7.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-spatial</artifactId>
+            <version>6.5.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/lqkj/cmlcp/config/WebSecurityConfig.java

@@ -3,6 +3,8 @@ package com.lqkj.cmlcp.config;
 
 import com.lqkj.cmlcp.config.auth.LoginAuthenticationProvider;
 import com.lqkj.cmlcp.filter.JwtAuthFilter;
+import com.lqkj.cmlcp.handler.MyAccessDeniedHandler;
+import com.lqkj.cmlcp.handler.MyAuthenticationEntryPoint;
 import com.lqkj.cmlcp.module.authority.service.impl.DatabaseUserDetailService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,23 +38,19 @@ public class WebSecurityConfig {
         return http
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests((requests) -> requests
+//                        .requestMatchers("/api/getAll").hasRole("超级管理员")
                         .requestMatchers(
-                                "/jwt/token",
-                                "/jwt/getAdminToken",
-                                "/encrypt/**",
-                                "/swagger-ui.html",
-                                "/swagger-ui/**",
-                                "/v3/api-docs/**",
-                                "/geom/all",
-                                "/test/**",
-                                "/upload/**")
+                                "/**")
                         .permitAll()
                         .requestMatchers("/**")
                         .authenticated())
                 .sessionManagement((session) -> session
                         .sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-                .authenticationProvider(authenticationProvider())
+//                .authenticationProvider(authenticationProvider())
                 .addFilterBefore(authFilter, UsernamePasswordAuthenticationFilter.class)
+                .exceptionHandling(exception -> exception
+                        .accessDeniedHandler(new MyAccessDeniedHandler())
+                        .authenticationEntryPoint(new MyAuthenticationEntryPoint()))
                 .build();
     }
 

src/main/java/com/lqkj/cmlcp/exception/GlobalExceptionHandler.java

@@ -3,6 +3,7 @@ package com.lqkj.cmlcp.exception;
 import com.lqkj.cmlcp.message.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,6 +21,13 @@ public class GlobalExceptionHandler {
     public Result<String> resolveException(Exception e) {
         logger.error("收到异常", e);
 
-        return Result.fail(e.toString());
+        return Result.fail(e.getMessage());
+    }
+
+    @ExceptionHandler(UsernameNotFoundException.class)
+    @ResponseBody
+    public Result<String> resolveException(UsernameNotFoundException e) {
+        logger.error("收到异常", e);
+        return Result.fail(e.getMessage());
     }
 }

src/main/java/com/lqkj/cmlcp/handler/MyAccessDeniedHandler.java

@@ -0,0 +1,34 @@
+package com.lqkj.cmlcp.handler;
+
+import com.alibaba.fastjson2.JSON;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MyAccessDeniedHandler implements AccessDeniedHandler {
+    @Override
+    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException, IOException {
+        Map<String,Object> result = new HashMap();
+        result.put("code",401);   // 没有权限
+        result.put("message","没有权限");   //
+        result.put("success", false);
+
+
+        //  将结果对象转换成json字符串
+        String json = JSON.toJSONString(result);
+
+        //  返回json数据到前端
+        //  响应头
+        response.setContentType("application/json;charset=UTF-8");
+        //  响应体
+        response.getWriter().println(json);
+        //返回页面
+        //response.sendRedirect(request.getContextPath()+"/main");
+    }
+}

src/main/java/com/lqkj/cmlcp/handler/MyAuthenticationEntryPoint.java

@@ -0,0 +1,33 @@
+package com.lqkj.cmlcp.handler;
+
+import com.alibaba.fastjson2.JSON;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MyAuthenticationEntryPoint implements AuthenticationEntryPoint {
+    @Override
+    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
+        String localizedMessage = "Unauthorized";//authException.getLocalizedMessage();
+
+        Map<String,Object> result = new HashMap();
+        result.put("code",401);   // 告诉用户需要登录
+        result.put("message",localizedMessage);   //
+
+        result.put("success", false);
+
+        //  将结果对象转换成json字符串
+        String json = JSON.toJSONString(result);
+        //  返回json数据到前端
+        //  响应头
+        response.setContentType("application/json;charset=UTF-8");
+        //  响应体
+        response.getWriter().println(json);
+    }
+}

src/main/java/com/lqkj/cmlcp/message/Result.java

@@ -36,6 +36,14 @@ public class Result<T> {
         return result;
     }
 
+    public static <T> Result<T> build(T body, Integer code, String message, Boolean isSuccess) {
+        Result<T> result = build(body);
+        result.setCode(code);
+        result.setMessage(message);
+        result.setSuccess(isSuccess);
+        return result;
+    }
+
     public static <T> Result<T> build(Integer code, String message, Boolean isSuccess) {
         Result<T> result = build(null);
         result.setCode(code);
@@ -82,13 +90,12 @@ public class Result<T> {
 
     /**
      * 操作失败
-     * @param data
+     * @param message
      * @param <T>
      * @return
      */
-    public static<T> Result<T> fail(T data){
-        Result<T> result = build(data);
-        return build(data, ResultCodeEnum.FAIL, false);
+    public static<T> Result<T> fail(String message){
+        return build(null, 201, message, false);
     }
 
     public Result<T> message(String msg){

src/main/java/com/lqkj/cmlcp/module/api/controller/ApiInfoController.java

@@ -0,0 +1,40 @@
+package com.lqkj.cmlcp.module.api.controller;
+
+import com.lqkj.cmlcp.message.Result;
+import com.lqkj.cmlcp.module.api.domain.ApiInfo;
+import com.lqkj.cmlcp.module.api.service.ApiInfoService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@Tag(name = "产品配置接口", description = "产品配置接口")
+@RequestMapping("/api")
+public class ApiInfoController {
+
+    @Autowired
+    private ApiInfoService apiInfoService;
+
+
+    @PostMapping("/saveApi")
+    public Result saveConfig(@RequestBody ApiInfo apiInfo) {
+        apiInfoService.saveApi(apiInfo);
+        return Result.ok();
+    }
+
+    @GetMapping("/getAll")
+    public Result getConfig(@RequestParam(required = false, defaultValue = "") String name,
+                            @RequestParam(required = true) Integer type) {
+        return Result.ok(apiInfoService.findAll(name, type));
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody List<Integer> ids) {
+        apiInfoService.delete(ids);
+        return Result.ok();
+    }
+
+}

src/main/java/com/lqkj/cmlcp/module/api/domain/ApiInfo.java

@@ -0,0 +1,58 @@
+package com.lqkj.cmlcp.module.api.domain;
+
+import com.alibaba.fastjson2.JSONObject;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.Type;
+
+@Entity
+@Table(name = "api_info")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ApiInfo {
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "name")
+    @Schema(description = "api名字")
+    private String name;
+
+    @Column(name = "method")
+    @Schema(description = "参数类型")
+    private String method;
+
+    @Column(name = "url")
+    @Schema(description = "请求地址")
+    private String url;
+
+    @Type(JsonType.class)
+    @Column(name = "headers", columnDefinition = "jsonb")
+    @Schema(description = "请求头")
+    private JSONObject headers;
+
+    @Type(JsonType.class)
+    @Column(name = "params", columnDefinition = "jsonb")
+    @Schema(description = "请求参数")
+    private JSONObject params;
+
+    @Type(JsonType.class)
+    @Column(name = "data", columnDefinition = "jsonb")
+    @Schema(description = "请求体")
+    private JSONObject data;
+
+    @Column(name = "type")
+    @Schema(description = "api类型, 1 rest; 2 static")
+    private Integer type;
+
+}
+
+

src/main/java/com/lqkj/cmlcp/module/api/repository/ApiInfoRepository.java

@@ -0,0 +1,19 @@
+package com.lqkj.cmlcp.module.api.repository;
+
+import com.lqkj.cmlcp.module.api.domain.ApiInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ApiInfoRepository extends JpaRepository<ApiInfo, Integer> {
+
+
+    @Query(nativeQuery = true,
+            value = "select * from api_info t where t.type = :type " +
+            "and (:name = '' or t.name like concat('%', :name, '%'))")
+    List<ApiInfo> findAllByType(@Param("name") String name, @Param("type") Integer type);
+}

src/main/java/com/lqkj/cmlcp/module/api/service/ApiInfoService.java

@@ -0,0 +1,15 @@
+package com.lqkj.cmlcp.module.api.service;
+
+import com.lqkj.cmlcp.module.api.domain.ApiInfo;
+
+import java.util.List;
+
+public interface ApiInfoService {
+
+    void saveApi(ApiInfo configInfo);
+
+    List<ApiInfo> findAll(String name, Integer type);
+
+    void delete(List<Integer> ids);
+
+}

src/main/java/com/lqkj/cmlcp/module/api/service/impl/ApiInfoServiceImpl.java

@@ -0,0 +1,35 @@
+package com.lqkj.cmlcp.module.api.service.impl;
+
+import com.lqkj.cmlcp.module.api.domain.ApiInfo;
+import com.lqkj.cmlcp.module.api.repository.ApiInfoRepository;
+import com.lqkj.cmlcp.module.api.service.ApiInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+public class ApiInfoServiceImpl implements ApiInfoService {
+
+
+    @Autowired
+    private ApiInfoRepository apiInfoRepository;
+    @Override
+    @Transactional
+    public void saveApi(ApiInfo apiInfo) {
+        apiInfoRepository.save(apiInfo);
+    }
+
+    @Override
+    public List<ApiInfo> findAll(String name, Integer type) {
+        return apiInfoRepository.findAllByType(name, type);
+    }
+
+    @Override
+    public void delete(List<Integer> ids) {
+        apiInfoRepository.deleteAllById(ids);
+    }
+}

src/main/java/com/lqkj/cmlcp/module/authority/controller/RoleInfoController.java

@@ -0,0 +1,114 @@
+package com.lqkj.cmlcp.module.authority.controller;
+
+import com.lqkj.cmlcp.message.Result;
+import com.lqkj.cmlcp.module.authority.domain.RoleInfo;
+import com.lqkj.cmlcp.module.authority.service.RoleInfoService;
+import com.lqkj.cmlcp.module.jwt.service.JwtService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/role")
+@Tag(name = "角色管理", description = "角色管理")
+public class RoleInfoController {
+
+    
+    
+    @Autowired
+    private RoleInfoService roleInfoService;
+
+    @Autowired
+    private JwtService jwtService;
+    
+    
+    @Operation(
+            summary = "5.3.14 角色列表接口",
+            description = "5.3.14 角色列表接口"
+    )
+    @PostMapping("/all")
+    public Result<List<RoleInfo>> allRoles() {
+        return Result.ok(roleInfoService.allRoles(), "查询全部角色列表");
+    }
+
+    @Operation(
+            summary = "5.3.15 角色分页接口",
+            description = "5.3.15 角色分页接口",
+            parameters = {
+                    @Parameter(name = "roleName", description = "角色名称"),
+                    @Parameter(name = "page", description = "页码"),
+                    @Parameter(name = "pageSize", description = "每页数据条数")
+            }
+    )
+    @PostMapping("/pageQuery")
+    public Result<Page<RoleInfo>> pageQuery(@RequestParam(required = false, defaultValue = "") String roleName,
+                                            @RequestParam(required = false, defaultValue = "0") Integer page,
+                                            @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+        return Result.ok(roleInfoService.pageQuery(roleName, page, pageSize), "角色分页接口");
+    }
+
+    @Operation(
+            summary = "5.1.3.29 获取角色详情接口",
+            description = "5.1.3.29 获取角色详情接口",
+            parameters = {
+                    @Parameter(name = "roleId", description = "角色ID", required = true)
+            }
+    )
+    @PostMapping("/detail")
+    public Result<RoleInfo> detail(@RequestParam Integer roleId) {
+        return Result.ok(roleInfoService.detail(roleId), "获取角色详情");
+    }
+
+    @Operation(
+            summary = "5.1.3.16 角色保存接口",
+            description = "5.1.3.16 角色保存接口",
+            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
+                    description = "角色信息实体",
+                    required = true,
+                    content = @Content(
+                            mediaType = "application/json",
+                            schema = @Schema(implementation = RoleInfo.class)
+                    )
+            )
+    )
+    @PostMapping("/save")
+    public Result<String> save(@RequestBody RoleInfo roleInfo) {
+        String msg = roleInfoService.save(roleInfo);
+        if (StringUtils.isNotBlank(msg)) return Result.fail(msg);
+        return Result.ok(null, "角色保存接口");
+    }
+
+    @Operation(
+            summary = "5.1.3.17 权限树接口",
+            description = "5.1.3.17 权限树接口"
+    )
+    @PostMapping("/authTree")
+    public Result authTree(HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        return Result.ok(roleInfoService.queryAuthTree(userCode), "获取权限树接口");
+    }
+
+    @Operation(
+            summary = "5.1.3.18 角色删除接口",
+            description = "5.1.3.18 角色删除接口",
+            parameters = {
+                    @Parameter(name = "roleIds", description = "角色ID列表")
+            }
+    )
+    @PostMapping("/delete")
+    public Result<String> delete(@RequestParam List<Integer> roleIds) {
+        String msg = roleInfoService.delete(roleIds);
+        if (StringUtils.isNotBlank(msg)) return Result.fail("角色【" + msg + "】需要先删除关联用户！");
+        return Result.ok(null, "角色删除接口");
+    }
+}

src/main/java/com/lqkj/cmlcp/module/authority/controller/UserInfoController.java

@@ -0,0 +1,158 @@
+package com.lqkj.cmlcp.module.authority.controller;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.lqkj.cmlcp.message.Result;
+import com.lqkj.cmlcp.module.authority.domain.UserInfo;
+import com.lqkj.cmlcp.module.authority.service.UserInfoService;
+import com.lqkj.cmlcp.module.jwt.service.JwtService;
+import com.lqkj.cmlcp.utils.AESUtils;
+import com.lqkj.cmlcp.utils.RSAUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/user")
+@Tag(name = "用户管理", description = "用户管理")
+public class UserInfoController {
+
+    @Autowired
+    private UserInfoService userInfoService;
+
+    @Autowired
+    private JwtService jwtService;
+
+    @Operation(
+            summary = "5.1.1.3 获取登录用户接口",
+            description = "5.1.1.3 获取登录用户接口"
+    )
+    @PostMapping("/detail")
+    public Result<UserInfo> detail(HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String username = jwtService.decryptUsernameWithHeader(authHeader);
+        return Result.ok(userInfoService.detailByUserCode(username), "获取登录用户");
+    }
+
+    @Operation(
+            summary = "5.1.3.24 获取管理菜单接口",
+            description = "5.1.3.24 获取管理菜单接口"
+    )
+    @PostMapping("/authList")
+    public Result authList(HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String username = jwtService.decryptUsernameWithHeader(authHeader);
+        return Result.ok(userInfoService.findAuthListWithUserCode(username), "获取管理菜单接口");
+    }
+
+    @Operation(
+            summary = "5.1.3.11 用户分页接口",
+            description = "5.1.3.11 用户分页接口",
+            parameters = {
+                    @Parameter(name = "userCode", description = "用户账号"),
+                    @Parameter(name = "displayName", description = "用户名"),
+                    @Parameter(name = "page", description = "页码"),
+                    @Parameter(name = "pageSize", description = "每页数据条数"),
+                    @Parameter(name = "key", description = "RSA加密后的aesKey")
+            }
+    )
+    @PostMapping("/manage/pageQuery")
+    public Result<JSONObject> pageQuery(@RequestParam(required = false, defaultValue = "") String userCode,
+                                                 @RequestParam(required = false, defaultValue = "") String displayName,
+                                                 @RequestParam(required = false, defaultValue = "0") Integer page,
+                                                 @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+                                                 @RequestParam String key) throws Exception {
+        Page<UserInfo> userInfoPage = userInfoService.pageQuery(userCode, displayName, page, pageSize);
+        String aesKey = RSAUtils.decryptBase64(key);
+        List<UserInfo> list = new ArrayList<>();
+        for (UserInfo userInfo : userInfoPage.getContent()) {
+            list.add(AESUtils.encryptUser(userInfo, aesKey));
+        }
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(userInfoPage));
+        jsonObject.put("content", list);
+        return Result.ok(jsonObject, "用户分页接口");
+    }
+
+    @Operation(
+            summary = "5.1.3.28 用户详情接口",
+            description = "5.1.3.28 用户详情接口",
+            parameters = {
+                    @Parameter(name = "userId", required = true, description = "用户ID"),
+                    @Parameter(name = "key", description = "RSA加密后的aesKey")
+            }
+    )
+    @PostMapping("/manage/detail")
+    public Result<UserInfo> detailById(@RequestParam Integer userId,
+                                            @RequestParam String key) throws Exception {
+        String aesKey = RSAUtils.decryptBase64(key);
+        return Result.ok(AESUtils.encryptUser(userInfoService.detail(userId), aesKey), "用户详情接口");
+    }
+
+    @Operation(
+            summary = "5.1.3.12 保存用户接口",
+            description = "5.1.3.12 保存用户接口",
+            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
+                    description = "用户实体",
+                    required = true,
+                    content = @Content(
+                            mediaType = "application/json",
+                            schema = @Schema(implementation = UserInfo.class)
+                    )
+            )
+    )
+    @PostMapping("/manage/save")
+    public Result save(@RequestBody UserInfo userInfo) {
+        userInfo.setUserCode(RSAUtils.decryptBase64(userInfo.getUserCode()));
+        if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() == 172) {
+            userInfo.setPassword(RSAUtils.decryptBase64(userInfo.getPassword()));
+        }
+//        userInfo.setAuthorizationCode(RSAUtils.decryptBase64(userInfo.getAuthorizationCode()));
+        String message = userInfoService.save(userInfo);
+        if (message == null) return Result.ok(null, "保存用户接口");
+        return Result.fail(message);
+    }
+
+    @Operation(
+            summary = "5.1.3.13 删除用户接口",
+            description = "5.1.3.13 删除用户接口",
+            parameters = {
+                    @Parameter(name = "userIds", required = true, description = "用户ID列表")
+            }
+    )
+    @PostMapping("/manage/delete")
+    public Result delete(@RequestParam List<Integer> userIds) {
+        userInfoService.delete(userIds);
+        return Result.ok(null, "删除用户接口");
+    }
+
+
+    @Operation(
+            summary = "5.1.2.13 用户设置",
+            description = "5.1.2.13 用户设置",
+            parameters = {
+                    @Parameter(name = "displayName", description = "用户名称"),
+                    @Parameter(name = "headImgPath", description = "头像地址")
+            }
+    )
+    @PostMapping( "/updateInfo")
+    public Result<String> saveUser(@RequestParam(required = false) String displayName,
+                                         @RequestParam(required = false) String headImgPath,
+                                         HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        userInfoService.updateInfo(userCode, displayName, headImgPath);
+        return Result.ok(null, "更新用户信息");
+    }
+
+}

src/main/java/com/lqkj/cmlcp/module/authority/domain/LoginBody.java

@@ -0,0 +1,14 @@
+package com.lqkj.cmlcp.module.authority.domain;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class LoginBody {
+    @Schema(description = "登录账号，RSA加密")
+    private String username;
+    @Schema(description = "登录密码，RSA加密")
+    private String password;
+    @Schema(description = "授权码，RSA加密")
+    private String authCode;
+}

src/main/java/com/lqkj/cmlcp/module/authority/domain/RoleInfo.java

@@ -1,39 +1,43 @@
 package com.lqkj.cmlcp.module.authority.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mybatisflex.annotation.Column;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.*;
 import lombok.*;
 import lombok.experimental.Accessors;
 
+
 import java.util.Date;
 import java.util.List;
 
-
+@Entity
+@Table(name = "role_info")
 @Accessors(chain = true)
 @Data(staticConstructor = "create")
 @NoArgsConstructor
 @AllArgsConstructor
 public class RoleInfo {
 
-    @Id(keyType = KeyType.Auto)
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Schema(description = "角色ID")
     private Integer roleId;
 
     @Schema(description = "角色名称")
+
+    @Column(name = "role_name")
     private String roleName;
 
-    @Schema(description = "")
+    @Column(name = "en_name")
     private String enName;
 
+    @Column(name = "update_time")
     @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
-    @Column(ignore = true)
+    @Transient
     private List<Integer> authorityList;
 
-    @Column(ignore = true)
+    @Transient
     private String auths;
 }

src/main/java/com/lqkj/cmlcp/module/authority/domain/UserInfo.java

@@ -2,10 +2,7 @@ package com.lqkj.cmlcp.module.authority.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.mybatisflex.annotation.Column;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.core.activerecord.Model;
+import jakarta.persistence.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,13 +15,16 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+@Entity
+@Table(name = "user_info")
 @Accessors(chain = true)
 @Data(staticConstructor = "create")
 @NoArgsConstructor
 @AllArgsConstructor
-public class UserInfo extends Model<UserInfo> implements UserDetails {
+public class UserInfo implements UserDetails {
 
-	@Id(keyType = KeyType.Auto)
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Schema(description = "用户ID")
 	private Integer Id;
 
@@ -67,40 +67,41 @@ public class UserInfo extends Model<UserInfo> implements UserDetails {
 	@Schema(description = "是否能进入后台")
 	private Boolean hasManage;
 
+	@Transient
 	@Schema(description = "角色列表")
 	private List<RoleInfo> roleInfoList;
 
+	@Transient
 	@Schema(description = "角色ID数组")
 	private List<Integer> roleIds;
 
-	@Column(ignore = true)
+	@Transient
 	private String roleNames;
 
-
 	/**
 	 * @Description 得到用户的角色列表
 	 */
-	@Column(ignore = true)
+	@Transient
     private Collection<? extends GrantedAuthority> authorities;
 	/**
 	 * 判断用户是否为过期
 	 */
-	@Column(ignore = true)
+	@Transient
     private boolean accountNonExpired = true;
 	/**
 	 * 判断用户是否为锁定
 	 */
-	@Column(ignore = true)
+	@Transient
     private boolean accountNonLocked = true;
 	/**
 	 * 判断密码是否未过期
 	 */
-	@Column(ignore = true)
+	@Transient
     private boolean credentialsNonExpired = true;
 	/**
 	 * 判断账户是否激活
 	 */
-	@Column(ignore = true)
+	@Transient
     private boolean enabled = true;
 
 

src/main/java/com/lqkj/cmlcp/module/authority/mapper/UserInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lqkj.cmlcp.module.authority.mapper;
-
-import com.lqkj.cmlcp.module.authority.domain.UserInfo;
-import com.mybatisflex.core.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface UserInfoMapper extends BaseMapper<UserInfo> {
-    void initUserIdSeq();
-
-    void initSuperAdminRole();
-
-}

src/main/java/com/lqkj/cmlcp/module/authority/repository/RoleInfoRepository.java

@@ -0,0 +1,134 @@
+package com.lqkj.cmlcp.module.authority.repository;
+
+import com.lqkj.cmlcp.module.authority.domain.RoleInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface RoleInfoRepository extends JpaRepository<RoleInfo, Integer> {
+
+    @Query(nativeQuery = true,
+        value = "select ri.* from role_info ri, user_role ur where ur.user_id = :userId and ur.role_id = ri.role_id order by ri.role_id"
+    )
+    List<RoleInfo> listWithUserId(@Param("userId") Integer userId);
+
+    @Query(nativeQuery = true,
+        value = "select string_agg(ri.role_name, ',') from user_role ur, role_info ri where ur.role_id = ri.role_id and ur.user_id = :userId"
+    )
+    String findRoleNames(@Param("userId") Integer userId);
+
+    @Modifying
+    @Query(nativeQuery = true,
+        value = "with t1 as(delete from user_role where user_id = :userId and role_id not in :roleIds)" +
+                "insert into user_role(role_id, user_id) " +
+                "select role_id, :userId from role_info where role_id in :roleIds " +
+                "on conflict (role_id, user_id) do nothing "
+    )
+    void updateUserRole(@Param("userId") Integer userId,
+                        @Param("roleIds") List<Integer> roleIds);
+
+    @Query(nativeQuery = true,
+            value = "with t1 as(select * from role_info where role_name like concat('%', :roleName, '%')), " +
+                    "t2 as(select ra.role_id, string_agg(distinct(authority_name), ',') as auths from role_authority ra, authority_info ai " +
+                        "where ra.authority_id = ai.authority_id " +
+                            "and ra.role_id in (select role_id from t1) " +
+                        "group by ra.role_id) " +
+                    "select t1.role_id as \"roleId\", t1.role_name as \"roleName\", t2.auths, " +
+                        "to_char(t1.update_time, 'yyyy-mm-dd hh24:mi:ss') as \"updateTime\" " +
+                    "from t1, t2 where t1.role_id = t2.role_id " +
+                    "order by t1.role_id")
+    Page<Map<String, Object>> pageQuery(@Param("roleName") String roleName,
+                                        Pageable pageable);
+
+    @Query(nativeQuery = true,
+            value = "select * from role_info where role_name like concat('%', :roleName, '%') and role_id != 1 order by role_id")
+    Page<RoleInfo> pageQueryV2(@Param("roleName") String roleName,
+                                        Pageable pageable);
+
+    @Query(nativeQuery = true,
+        value = "select * from role_info where role_id != 1 order by role_id"
+    )
+    List<RoleInfo> queryAll();
+
+    @Query(nativeQuery = true,
+        value = "select string_agg(distinct (authority_name), ',') " +
+                "from role_authority ra , authority_info ai " +
+                "where ra.role_id = :roleId and ra.authority_id = ai.authority_id"
+    )
+    String queryAuthNamesWithRole(@Param("roleId") Integer roleId);
+
+    @Query(nativeQuery = true,
+        value = "select ai.authority_id from authority_info ai, role_authority ra " +
+                "where ra.role_id = :roleId and ai.authority_id = ra.authority_id " +
+                "order by ai.authority_id"
+    )
+    List<Map<String, Object>> queryAuthsWithRole(@Param("roleId") Integer roleId);
+
+    @Query(nativeQuery = true,
+        value = "select count(*) > 0 from role_info where en_name = :enName"
+    )
+    Boolean hasSameEnName(@Param("enName") String enName);
+
+    @Query(nativeQuery = true,
+            value = "select count(*) > 0 from role_info where role_name = :roleName"
+    )
+    Boolean hasSameName(@Param("roleName") String roleName);
+
+    @Query(nativeQuery = true,
+            value = "select count(*) > 0 from role_info where en_name = :enName and role_id != :roleId"
+    )
+    Boolean hasSameEnNameWithoutOneId(@Param("enName") String enName,
+                                      @Param("roleId") Integer roleId);
+
+    @Query(nativeQuery = true,
+            value = "select count(*) > 0 from role_info where role_name = :roleName and role_id != :roleId"
+    )
+    Boolean hasSameNameWithoutOneId(@Param("roleName") String roleName,
+                                    @Param("roleId") Integer roleId);
+
+    @Modifying
+    @Query(nativeQuery = true,
+        value = "with t1 as (delete from role_authority where role_id = :roleId and authority_id not in :authorityIds)" +
+                "insert into role_authority(role_id, authority_id) " +
+                "select :roleId, authority_id from authority_info where authority_id in :authorityIds " +
+                "on conflict (role_id, authority_id) do nothing "
+    )
+    void updateRoleAuthority(@Param("roleId") Integer roleId,
+                             @Param("authorityIds") List<Integer> authorityIds);
+
+    @Query(nativeQuery = true,
+        value = "select ai.authority_id, ai.parent_id, ai.authority_name " +
+                "from authority_info ai, role_authority ra , user_role ur , user_info ui " +
+                "where ai.authority_id = ra.authority_id " +
+                    "and ra.role_id = ur.role_id " +
+                    "and ur.user_id = ui.user_id " +
+                    "and ui.user_code = :userCode " +
+                "order by ai.parent_id, ai.authority_id"
+    )
+    List<Map<String, Object>> queryAuthsByUser(String userCode);
+
+
+    @Modifying
+    @Query(nativeQuery = true,
+        value = "delete from role_info where role_id in :roleIds"
+    )
+    void deleteNoUserRole(List<Integer> roleIds);
+
+    @Query(nativeQuery = true,
+        value = "select distinct (role_id) from user_role where role_id in :roleIds"
+    )
+    List<Integer> findHasUserRole(@Param("roleIds") List<Integer> roleIds);
+
+    @Query(nativeQuery = true,
+        value = "select string_agg(role_name, ',') from role_info where role_id in :hasUserRoleIds"
+    )
+    String findHasUserRoleNames(@Param("hasUserRoleIds") List<Integer> hasUserRoleIds);
+}

src/main/java/com/lqkj/cmlcp/module/authority/repository/UserInfoRepository.java

@@ -0,0 +1,91 @@
+package com.lqkj.cmlcp.module.authority.repository;
+
+import com.lqkj.cmlcp.module.authority.domain.UserInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface UserInfoRepository extends JpaRepository<UserInfo, Integer> {
+
+    @Query(nativeQuery = true,
+            value = "select * from user_info t where user_code = :userCode")
+    UserInfo findByUserCode(@Param("userCode") String userCode);
+
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "update user_info set login_error_count = 0, locking = false, lock_time = null where id = :userId")
+    void cleanLockStatus(@Param("userId") Integer userId);
+
+    @Transactional
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "INSERT INTO user_info (id, user_code, display_name, password, authorization_code, head_img, " +
+                    "file_save_path, has_auth, login_error_count, locking, lock_time, update_time, has_manage) " +
+                    "VALUES (1, 'admin', '超级管理员', '$2a$10$OIBK8kKBDY07OS4CcVdx9e2GdxKH4T2lqWfDXgubjwZbxbis5.vSu', '87449007', " +
+                    "NULL, NULL, 't', 0, 'f', NULL, now(), 't');"
+    )
+    void initSuperAdmin();
+
+    @Transactional
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "ALTER SEQUENCE user_info_id_seq RESTART WITH 3"
+    )
+    void initUserIdSeq();
+
+    @Transactional
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "insert into user_role values (1, 1)"
+    )
+    void initSuperAdminRole();
+
+    @Query(nativeQuery = true,
+            value = "select role_id from user_role where user_id = :userId")
+    List<Integer> findUserRole(@Param("userId") Integer userId);
+
+
+    @Query(nativeQuery = true,
+            value = "select count(*) = 1 " +
+                    "from user_info natural join user_role natural join role_authority " +
+                    "where user_id = :userId and authority_id = 6 "
+    )
+    Boolean hasAuth(Integer userId);
+
+
+    @Query(nativeQuery = true,
+            value = "select ai.authority_id, en_name as \"name\", route as \"path\", component, redirect, authority_name as title, icon, parent_id " +
+                    "from authority_info ai, role_authority ra, user_role ur, user_info ui " +
+                    "where ui.user_code = :userCode " +
+                    "and ur.user_id = ui.id " +
+                    "and ur.role_id = ra.role_id " +
+                    "and ra.authority_id = ai.authority_id " +
+                    "order by ai.parent_id, ai.order_id"
+    )
+    List<Map<String, Object>> queryAuthWithUserCode(String userCode);
+
+    @Query(nativeQuery = true,
+            value = "select * from user_info " +
+                    "where id != 1 " +
+                    "and (:userCode = '' or user_code like concat('%', :userCode, '%')) " +
+                    "and (:displayName = '' or display_name like concat('%', :displayName, '%')) " +
+                    "order by update_time desc"
+    )
+    Page<UserInfo> pageQueryV2(@Param("userCode") String userCode,
+                               @Param("displayName") String displayName,
+                               Pageable pageable);
+
+    @Query(nativeQuery = true,
+            value = "select count(*) > 0 from user_info where user_code = :userCode"
+    )
+    Boolean hasSameUserCode(@Param("userCode") String userCode);
+}

src/main/java/com/lqkj/cmlcp/module/authority/service/RoleInfoService.java

@@ -0,0 +1,56 @@
+package com.lqkj.cmlcp.module.authority.service;
+
+import com.lqkj.cmlcp.module.authority.domain.RoleInfo;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RoleInfoService {
+
+    /**
+     * 获取所有角色
+     * @return
+     */
+    List<RoleInfo> allRoles();
+
+
+    /**
+     * 获取角色分页
+     * @param roleName
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    Page<RoleInfo> pageQuery(String roleName, Integer page, Integer pageSize);
+
+    /**
+     * 获取角色详情接口
+     * @param roleId
+     * @return
+     */
+    RoleInfo detail(Integer roleId);
+
+
+    /**
+     * 角色保存接口
+     * @param roleInfo
+     * @return
+     */
+    String save(RoleInfo roleInfo);
+
+
+    /**
+     * 获取权限树
+     * @param userCode
+     * @return
+     */
+    List<Map<String, Object>> queryAuthTree(String userCode);
+
+    /**
+     * 删除角色
+     * @param roleIds
+     * @return
+     */
+    String delete(List<Integer> roleIds);
+}

src/main/java/com/lqkj/cmlcp/module/authority/service/UserInfoService.java

@@ -1,16 +1,78 @@
 package com.lqkj.cmlcp.module.authority.service;
 
 import com.lqkj.cmlcp.module.authority.domain.UserInfo;
-import com.mybatisflex.core.service.IService;
+import org.springframework.data.domain.Page;
 
-public interface UserInfoService extends IService<UserInfo> {
+import java.util.List;
+import java.util.Map;
+
+public interface UserInfoService{
+
+    /**
+     * 根据账号查询用户信息
+     * @param userCode
+     * @return
+     */
     UserInfo findByUserCode(String userCode);
 
+    /**
+     * 账号是否锁定
+     * @param userCode
+     * @return
+     */
     boolean isLocked(String userCode);
 
+    /**
+     * 更新登录错误次数/锁定用户
+     * @param userCode
+     * @return
+     */
     String lockedUser(String userCode);
 
+    /**
+     * 解锁用户
+     * @param userCode
+     */
     void unlockedUser(String userCode);
 
+    /**
+     * 根据账号查询用户信息
+     * @param username
+     * @return
+     */
     UserInfo selectByUserName(String username);
+
+    List<Integer> findUserRole(Integer userId);
+
+    /**
+     * 根据账号查询用户信息
+     * @param username
+     * @return
+     */
+    UserInfo detailByUserCode(String username);
+
+    /**
+     * 获取管理菜单接口
+     * @param username
+     * @return
+     */
+    List<Map<String, Object>> findAuthListWithUserCode(String username);
+
+    /**
+     * 用户分页接口
+     * @param userCode
+     * @param displayName
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    Page<UserInfo> pageQuery(String userCode, String displayName, Integer page, Integer pageSize);
+
+    UserInfo detail(Integer userId);
+
+    String save(UserInfo userInfo);
+
+    void delete(List<Integer> userIds);
+
+    void updateInfo(String userCode, String displayName, String headImgPath);
 }

src/main/java/com/lqkj/cmlcp/module/authority/service/impl/DatabaseUserDetailService.java

@@ -2,6 +2,7 @@ package com.lqkj.cmlcp.module.authority.service.impl;
 
 import com.lqkj.cmlcp.module.authority.domain.UserInfo;
 import com.lqkj.cmlcp.module.authority.service.UserInfoService;
+import com.lqkj.cmlcp.utils.RSAUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -17,12 +18,12 @@ public class DatabaseUserDetailService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-//        if (username.length() != 172) throw new UsernameNotFoundException("用户名错误！");
-//        try {
-//            username = RSAUtils.decryptBase64(username);
-//        } catch (Exception e) {
-//            throw new UsernameNotFoundException("用户名错误！");
-//        }
+        if (username.length() != 172) throw new UsernameNotFoundException("用户名错误！");
+        try {
+            username = RSAUtils.decryptBase64(username);
+        } catch (Exception e) {
+            throw new UsernameNotFoundException("用户名错误！");
+        }
         UserInfo userInfo = userInfoService.selectByUserName(username);
         if (userInfo == null) {
             throw new UsernameNotFoundException("用户名不存在！");

src/main/java/com/lqkj/cmlcp/module/authority/service/impl/RoleInfoServiceImpl.java

@@ -0,0 +1,108 @@
+package com.lqkj.cmlcp.module.authority.service.impl;
+
+import com.lqkj.cmlcp.module.authority.domain.RoleInfo;
+import com.lqkj.cmlcp.module.authority.repository.RoleInfoRepository;
+import com.lqkj.cmlcp.module.authority.service.RoleInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+public class RoleInfoServiceImpl implements RoleInfoService {
+
+    @Autowired
+    private RoleInfoRepository roleInfoRepository;
+
+    public List<RoleInfo> allRoles() {
+        return roleInfoRepository.queryAll();
+    }
+
+    public Page<RoleInfo> pageQuery(String roleName, Integer page, Integer pageSize) {
+        Pageable pageable = PageRequest.of(page, pageSize);
+        Page<RoleInfo> roleInfoPage = roleInfoRepository.pageQueryV2(roleName, pageable);
+        for (RoleInfo role : roleInfoPage) {
+            role.setAuths(roleInfoRepository.queryAuthNamesWithRole(role.getRoleId()));
+        }
+        return roleInfoPage;
+    }
+
+    public RoleInfo detail(Integer roleId) {
+        RoleInfo roleInfo = roleInfoRepository.findById(roleId).get();
+        List<Integer> auths = roleInfoRepository
+                .queryAuthsWithRole(roleId)
+                .stream()
+                .map(v -> (Integer) v.get("authority_id"))
+                .toList();
+        roleInfo.setAuthorityList(auths);
+        return roleInfo;
+    }
+
+    @Transactional
+    public String save(RoleInfo roleInfo) {
+        List<Integer> authorityIds = roleInfo.getAuthorityList();
+        if (roleInfo.getRoleId() == null) {
+            if (roleInfoRepository.hasSameEnName(roleInfo.getEnName())) {
+                return "英文名重复！";
+            }
+            if (roleInfoRepository.hasSameName(roleInfo.getRoleName())) {
+                return "角色名称重复！";
+            }
+            roleInfo.setUpdateTime(new Date());
+            roleInfo = roleInfoRepository.save(roleInfo);
+        } else {
+            if (roleInfoRepository.hasSameEnNameWithoutOneId(roleInfo.getEnName(), roleInfo.getRoleId())) {
+                return "英文名重复！";
+            }
+            if (roleInfoRepository.hasSameNameWithoutOneId(roleInfo.getRoleName(), roleInfo.getRoleId())) {
+                return "角色名称重复！";
+            }
+            RoleInfo oldRole = roleInfoRepository.findById(roleInfo.getRoleId()).get();
+            oldRole.setRoleName(roleInfo.getRoleName());
+            oldRole.setEnName(roleInfo.getEnName());
+            oldRole.setUpdateTime(new Date());
+            roleInfoRepository.save(oldRole);
+        }
+
+        roleInfoRepository.updateRoleAuthority(roleInfo.getRoleId(), authorityIds);
+        return null;
+    }
+
+    public List<Map<String, Object>> queryAuthTree(String userCode) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        Map<Integer, List<Map<String, Object>>> childrenMap = new HashMap<>();
+
+        List<Map<String, Object>> authList = roleInfoRepository.queryAuthsByUser(userCode);
+        for (Map<String, Object> auth : authList) {
+            Map<String, Object> result = new HashMap<>();
+            result.put("id", auth.get("authority_id"));
+            result.put("name", auth.get("authority_name"));
+
+            Integer parentId = (Integer) auth.get("parent_id");
+            if (parentId == null) {
+                result.put("children", childrenMap.get((Integer) auth.get("authority_id")));
+                resultList.add(result);
+            } else {
+                List<Map<String, Object>> children = childrenMap.getOrDefault(parentId, new ArrayList<>());
+                children.add(result);
+                childrenMap.put(parentId, children);
+            }
+        }
+
+        return resultList;
+    }
+
+    @Transactional
+    public String delete(List<Integer> roleIds) {
+        List<Integer> hasUserRoleIds = roleInfoRepository.findHasUserRole(roleIds);
+        roleIds.removeAll(hasUserRoleIds);
+        roleInfoRepository.deleteNoUserRole(roleIds);
+        return roleInfoRepository.findHasUserRoleNames(hasUserRoleIds);
+    }
+}

src/main/java/com/lqkj/cmlcp/module/authority/service/impl/UserInfoServiceImpl.java

@@ -1,29 +1,44 @@
 package com.lqkj.cmlcp.module.authority.service.impl;
 
 import com.lqkj.cmlcp.module.authority.domain.UserInfo;
-import com.lqkj.cmlcp.module.authority.mapper.UserInfoMapper;
+import com.lqkj.cmlcp.module.authority.repository.RoleInfoRepository;
+import com.lqkj.cmlcp.module.authority.repository.UserInfoRepository;
 import com.lqkj.cmlcp.module.authority.service.UserInfoService;
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.core.update.UpdateChain;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.PostConstruct;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.Objects;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-@Component
-public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements UserInfoService{
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+public class UserInfoServiceImpl implements UserInfoService{
+
+
+    @Autowired
+    private RoleInfoRepository roleInfoRepository;
 
     @Autowired
-    private UserInfoMapper userInfoMapper;
+    private UserInfoRepository userInfoRepository;
 
+    @Lazy
+    @Autowired
+    private PasswordEncoder passwordEncoder;
 
     @Override
     public UserInfo findByUserCode(String userCode) {
-        return userInfoMapper.selectOneByQuery(new QueryWrapper().eq("user_code",userCode));
+
+        return userInfoRepository.findByUserCode(userCode);
     }
 
         /**
@@ -39,12 +54,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         }else {
             if (userInfo.getLocking()) {
                 if (new Date().getTime() - userInfo.getLockTime().getTime() > 1000 * 60 * 60){
-                    UpdateChain.of(UserInfo.class)
-                            .set(UserInfo::getLocking, false)
-                            .set(UserInfo::getLockTime, null)
-                            .set(UserInfo::getLoginErrorCount, 0)
-                            .where(UserInfo::getId).eq(userInfo.getId())
-                            .update();
+                    userInfoRepository.cleanLockStatus(userInfo.getId());
                     return false;
                 }else{
                     return true;
@@ -72,10 +82,10 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
             if (loginErrorCount == 4){
                 userInfo.setLocking(true);
                 userInfo.setLockTime(new Date());
-                userInfoMapper.update(userInfo);
+                userInfoRepository.save(userInfo);
                 return "账号已被冻结,请稍后重试";
             }
-            userInfoMapper.update(userInfo);
+            userInfoRepository.save(userInfo);
             return "账号、密码或授权码输入错误," + (4 - loginErrorCount) +"次错误后,账号将会冻结1小时";
         }
     }
@@ -87,63 +97,168 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     @Transactional
     public void unlockedUser(String userCode){
         UserInfo userInfo = findByUserCode(userCode);
-        UpdateChain.of(UserInfo.class)
-                .set(UserInfo::getLocking, false)
-                .set(UserInfo::getLockTime, null)
-                .set(UserInfo::getLoginErrorCount, 0)
-                .where(UserInfo::getId).eq(userInfo.getId())
-                .update();
+        userInfoRepository.cleanLockStatus(userInfo.getId());
     }
 
     @Override
     public UserInfo selectByUserName(String username) {
-        return userInfoMapper.selectOneByQuery(new QueryWrapper().eq("user_name",username));
+        return findByUserCode(username);
     }
 
+    @Override
+    public List<Integer> findUserRole(Integer userId) {
 
-    @PostConstruct
-    @Transactional
-    public void initSuperUser() {
-        if (Objects.isNull(userInfoMapper.selectOneById(1))){
-            initSuperAdmin();
-            initUserIdSeq();
-            initSuperAdminRole();
-        }
+        return userInfoRepository.findUserRole(userId);
     }
 
-    private void initSuperAdmin() {
-        UserInfo userInfo = new UserInfo()
-                .setId(1)
-                .setUserCode("admin")
-                .setDisplayName("超级管理员")
-                .setPassword("$2a$10$OIBK8kKBDY07OS4CcVdx9e2GdxKH4T2lqWfDXgubjwZbxbis5.vSu")
-                .setAuthorizationCode("87449007")
-                .setHeadImg("")
-                .setFileSavePath("")
-                .setHasManage(true)
-                .setHasAuth(true)
-                .setLocking(false)
-                .setLockTime(null)
-                .setLoginErrorCount(0)
-                .setUpdateTime(new Date())
-                .setEnabled(true);
-        userInfoMapper.insert(userInfo);
-
+    @Override
+    public UserInfo detailByUserCode(String userCode) {
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        userInfo.setHasAuth(userInfoRepository.hasAuth(userInfo.getId()));
+        return userInfo;
     }
 
-    private void initUserIdSeq() {
-        userInfoMapper.initUserIdSeq();
+    @Override
+    public List<Map<String, Object>> findAuthListWithUserCode(String userCode) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        if (userInfo.getHasManage()) {
+            List<Map<String, Object>> authList = userInfoRepository.queryAuthWithUserCode(userCode);
+
+            Map<Integer, List<Map<String, Object>>> childrenMap = new HashMap<>();
+            for (Map<String, Object> auth : authList) {
+                Map<String, Object> result = new HashMap<>(auth);
+                Map<String, Object> metaObject = new HashMap<>();
+                metaObject.put("icon", auth.get("icon"));
+                metaObject.put("title", auth.get("title"));
+                result.put("meta", metaObject);
+
+                if (auth.get("parent_id") == null) {
+                    result.put("children", childrenMap.get(auth.get("authority_id")));
+                    resultList.add(result);
+                } else {
+                    List<Map<String, Object>> childrenList = childrenMap.getOrDefault(auth.get("parent_id"), new ArrayList<>());
+                    childrenList.add(result);
+                    childrenMap.put((Integer) auth.get("parent_id"), childrenList);
+                }
+            }
+        }
+
+        return resultList;
     }
 
-    private void initSuperAdminRole() {
+    @Override
+    public Page<UserInfo> pageQuery(String userCode, String displayName, Integer page, Integer pageSize) {
+        Pageable pageable = PageRequest.of(page, pageSize);
+        Page<UserInfo> userInfos = userInfoRepository.pageQueryV2(userCode, displayName, pageable);
+        for (UserInfo userInfo : userInfos.getContent()) {
+            userInfo.setRoleNames(roleInfoRepository.findRoleNames(userInfo.getId()));
+        }
+        return userInfos;
+    }
 
-        userInfoMapper.initSuperAdminRole();
+    @Override
+    public UserInfo detail(Integer userId) {
+        UserInfo userInfo = userInfoRepository.findById(userId).get();
+        userInfo.setRoleInfoList(roleInfoRepository.listWithUserId(userId));
+        return userInfo;
     }
 
-    private void test(){
+    @Transactional
+    @Override
+    public String save(UserInfo userInfo) {
 
+        // 账号判断，8位数字
+        String userCodeRegex = "\\d{8}";
+        Pattern pattern = Pattern.compile(userCodeRegex);
+        Matcher matcher = pattern.matcher(userInfo.getUserCode());
+        if (!matcher.find()) {
+            return "账号必须是8位数字！";
+        }
+        // 显示名称判断，2-8位中文字符
+        String displayNameRegex = "[\u4E00-\u9FA5]{2,8}";
+        pattern = Pattern.compile(displayNameRegex);
+        matcher = pattern.matcher(userInfo.getDisplayName());
+        if (!matcher.find()) {
+            return "名称必须是2-8位中文字符！";
+        }
 
+        // 授权码判断，8位数字、大写字母、小写字母
+        String auCodeRegex = "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8}$";
+        pattern = Pattern.compile(auCodeRegex);
+        matcher = pattern.matcher(userInfo.getAuthorizationCode());
+        if (!matcher.find()) {
+            return "授权码必须是8位数字、大写字母、小写字母！";
+        }
 
+        if (userInfo.getId() == null) {
+            // 重复判断
+            if (userInfoRepository.hasSameUserCode(userInfo.getUserCode())) {
+                return "账号与已有账号重复，请设置其他账号！";
+            }
+            // 密码判断，8-16位数字、大写字母、小写字母
+            String passwordRegex = "^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$";
+            pattern = Pattern.compile(passwordRegex);
+            matcher = pattern.matcher(userInfo.getPassword());
+            if (!matcher.find()) {
+                return "密码必须是8-16位数字、大写字母、小写字母！";
+            }
+
+            userInfo.setLocking(false);
+            userInfo.setPassword(passwordEncoder.encode(userInfo.getPassword()));
+            userInfo.setUpdateTime(new Date());
+            userInfo = userInfoRepository.save(userInfo);
+        } else {
+            if (StringUtils.isNotBlank(userInfo.getPassword())) {
+                // 密码判断，8-16位数字、大写字母、小写字母
+                String passwordRegex = "^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$";
+                pattern = Pattern.compile(passwordRegex);
+                matcher = pattern.matcher(userInfo.getPassword());
+                if (!matcher.find()) {
+                    return "密码必须是8-16位数字、大写字母、小写字母！";
+                }
+            }
+            UserInfo oldUser = userInfoRepository.findById(userInfo.getId()).get();
+            if (StringUtils.isNotBlank(userInfo.getPassword())) {
+                oldUser.setPassword(passwordEncoder.encode(userInfo.getPassword()));
+            }
+            oldUser.setDisplayName(userInfo.getDisplayName());
+            oldUser.setHasManage(userInfo.getHasManage());
+            oldUser.setAuthorizationCode(userInfo.getAuthorizationCode());
+            oldUser.setUpdateTime(new Date());
+            userInfoRepository.save(oldUser);
+        }
+        roleInfoRepository.updateUserRole(userInfo.getId(), userInfo.getRoleIds());
+        return null;
+    }
+
+    @Override
+    public void delete(List<Integer> userIds) {
+        userInfoRepository.deleteAllByIdInBatch(userIds);
     }
 
+    @Override
+    public void updateInfo(String userCode, String displayName, String headImgPath) {
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        if (StringUtils.isNotBlank(displayName)) {
+            userInfo.setDisplayName(displayName);
+        }
+        if ((StringUtils.isNotBlank(headImgPath))) {
+            userInfo.setHeadImg(headImgPath);
+        }
+        userInfoRepository.save(userInfo);
+    }
+
+    @PostConstruct
+    @Transactional
+    public void initSuperUser() {
+        if (!userInfoRepository.existsById(1)) {
+            userInfoRepository.initSuperAdmin();
+            userInfoRepository.initUserIdSeq();
+            userInfoRepository.initSuperAdminRole();
+        }
+    }
+
+
+
 }

src/main/java/com/lqkj/cmlcp/module/base/controller/BaseController.java

@@ -25,8 +25,19 @@ public class BaseController {
                     @Parameter(name = "file", description = "空间信息json文件上传接口", required = true)
             }
     )
-    @PostMapping({"/addJsonFile"})
+    @PostMapping({"/uploadJsonFile"})
     public Result<String> addJsonFile(MultipartFile file) {
         return Result.ok(baseService.uploadJsonFile(file, "base/json/"));
     }
+
+
+    /**
+     * 上传图片
+     * @param file
+     * @return
+     */
+    @PostMapping("/uploadImg")
+    public Result<String> uploadImg(MultipartFile file) {
+        return Result.ok(baseService.uploadImg(file, "base/img/"));
+    }
 }

src/main/java/com/lqkj/cmlcp/module/base/service/BaseService.java

@@ -6,4 +6,12 @@ public interface BaseService {
 
 
     String uploadJsonFile(MultipartFile file, String s);
+
+    /**
+     * 上传图片
+     * @param file
+     * @param s
+     * @return
+     */
+    String uploadImg(MultipartFile file, String s);
 }

src/main/java/com/lqkj/cmlcp/module/base/service/impl/BaseServiceImpl.java

@@ -1,6 +1,5 @@
 package com.lqkj.cmlcp.module.base.service.impl;
 
-import com.lqkj.cmlcp.message.Result;
 import com.lqkj.cmlcp.module.base.service.BaseService;
 import com.lqkj.cmlcp.utils.FileUtils;
 import org.springframework.stereotype.Service;
@@ -20,4 +19,16 @@ public class BaseServiceImpl implements BaseService {
         FileUtils.saveFile(file, filePath, newFileName);
         return filePath.substring(1) + newFileName;
     }
+
+    @Override
+    public String uploadImg(MultipartFile file, String path) {
+        String fileName = file.getOriginalFilename();
+        String suffix = fileName == null ? "" : fileName.substring(fileName.lastIndexOf(".") + 1);
+        if (!suffix.equals("png") && !suffix.equals("jpg"))
+            throw new RuntimeException("上传文件类型必须是png、jpg图片文件");
+        String newFileName = UUID.randomUUID() + "." + suffix;
+        String filePath = "./upload/" + path;
+        FileUtils.saveFile(file, filePath, newFileName);
+        return filePath.substring(1) + newFileName;
+    }
 }

src/main/java/com/lqkj/cmlcp/module/config/controller/ConfigInfoController.java

@@ -0,0 +1,31 @@
+package com.lqkj.cmlcp.module.config.controller;
+
+import com.lqkj.cmlcp.message.Result;
+import com.lqkj.cmlcp.module.config.domain.ConfigInfo;
+import com.lqkj.cmlcp.module.config.service.ConfigInfoService;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+@RestController
+@Tag(name = "地图配置接口", description = "地图配置接口")
+@RequestMapping("/config")
+public class ConfigInfoController {
+
+    @Autowired
+    private ConfigInfoService configInfoService;
+
+
+    @PostMapping("/saveConfig")
+    public Result saveConfig(@RequestBody ConfigInfo configInfo) {
+        configInfoService.saveAll(configInfo);
+        return Result.ok();
+    }
+
+    @GetMapping("/getConfig")
+    public Result getConfig() {
+        return Result.ok(configInfoService.findAll());
+    }
+
+}

src/main/java/com/lqkj/cmlcp/module/config/domain/ConfigInfo.java

@@ -0,0 +1,48 @@
+package com.lqkj.cmlcp.module.config.domain;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "config_info")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ConfigInfo {
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "server_address")
+    @Schema(description = "服务地址")
+    private String serverAddress;
+
+    @Column(name = "map_token")
+    @Schema(description = "参数类型")
+    private String mapToken;
+
+    @Column(name = "map_id")
+    @Schema(description = "地图id")
+    private String mapId;
+
+    @Column(name = "map_style_id")
+    @Schema(description = "地图样式id")
+    private String mapStyleId;
+
+    @Column(name = "ue_stream_address")
+    @Schema(description = "ue像素流地址")
+    private String ueStreamAddress;
+
+    @Column(name = "ue_h5_address")
+    @Schema(description = "ueh5地址")
+    private String ueH5Address;
+
+}
+
+

src/main/java/com/lqkj/cmlcp/module/config/repository/ConfigInfoRepository.java

@@ -0,0 +1,9 @@
+package com.lqkj.cmlcp.module.config.repository;
+
+import com.lqkj.cmlcp.module.config.domain.ConfigInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ConfigInfoRepository extends JpaRepository<ConfigInfo, Integer> {
+}

src/main/java/com/lqkj/cmlcp/module/config/service/ConfigInfoService.java

@@ -0,0 +1,10 @@
+package com.lqkj.cmlcp.module.config.service;
+
+import com.lqkj.cmlcp.module.config.domain.ConfigInfo;
+
+public interface ConfigInfoService {
+
+    void saveAll(ConfigInfo configInfo);
+
+    ConfigInfo findAll();
+}

src/main/java/com/lqkj/cmlcp/module/config/service/impl/ConfigInfoServiceImpl.java

@@ -0,0 +1,31 @@
+package com.lqkj.cmlcp.module.config.service.impl;
+
+import com.lqkj.cmlcp.module.config.domain.ConfigInfo;
+import com.lqkj.cmlcp.module.config.repository.ConfigInfoRepository;
+import com.lqkj.cmlcp.module.config.service.ConfigInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+public class ConfigInfoServiceImpl implements ConfigInfoService {
+
+
+    @Autowired
+    private ConfigInfoRepository configInfoRepository;
+    @Override
+    @Transactional
+    public void saveAll(ConfigInfo configInfo) {
+        configInfoRepository.save(configInfo);
+    }
+
+    @Override
+    public ConfigInfo findAll() {
+        List<ConfigInfo> configInfos = configInfoRepository.findAll();
+        return configInfos.size() > 0 ? configInfos.get(0) : null;
+    }
+}

src/main/java/com/lqkj/cmlcp/module/encrypt/controller/EncryptController.java

@@ -0,0 +1,49 @@
+package com.lqkj.cmlcp.module.encrypt.controller;
+
+import com.lqkj.cmlcp.message.Result;
+import com.lqkj.cmlcp.utils.RSAUtils;
+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.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/encrypt")
+@Tag(name = "加密工具类", description = "加密工具类")
+public class EncryptController {
+
+    @Operation(
+            summary = "5.1.1.1 获取RSA公钥接口",
+            description = "5.1.1.1 获取RSA公钥接口"
+    )
+    @PostMapping("/rsaKey")
+    public Result<String> rsaKey() {
+        return Result.ok(RSAUtils.generateBase64PublicKey(), "获取RSA公钥");
+    }
+
+    @Operation(
+            summary = "5.1.1.5 RSA加密接口",
+            description = "5.1.1.5 RSA加密接口",
+            parameters = {
+                @Parameter(name = "word", description = "需加密的字符串", required = true)
+            }
+    )
+    @PostMapping("/rsaEncrypt")
+    public Result<String> rsaEncrypt(String word) {
+        return Result.ok(RSAUtils.encryptBase64(word), "RSA加密数据");
+    }
+
+    @Operation(
+            summary = "5.1.1.6 RSA解密接口",
+            description = "5.1.1.6 RSA解密接口",
+            parameters = {
+                    @Parameter(name = "word", description = "需解密的字符串", required = true)
+            }
+    )
+    @PostMapping("/rsaDecrypt")
+    public Result<String> rsaDecrypt(String word) {
+        return Result.ok(RSAUtils.decryptBase64(word), "RSA解密数据");
+    }
+}

src/main/java/com/lqkj/cmlcp/module/test/controller/TestController.java

@@ -1,29 +0,0 @@
-package com.lqkj.cmlcp.module.test.controller;
-
-import com.lqkj.cmlcp.message.Result;
-import com.lqkj.cmlcp.module.test.service.CaptchaService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-    @Autowired
-    private CaptchaService captchaService;
-
-    @GetMapping("/test1")
-    public Result test1() {
-        var captcha = captchaService.findAll();
-        return Result.ok(captcha);
-    }
-
-    @PostMapping("/test2")
-    public Result test2() {
-        var captcha = captchaService.findById();
-        return Result.ok(captcha);
-    }
-}

src/main/java/com/lqkj/cmlcp/module/test/domain/Captcha.java

@@ -1,33 +0,0 @@
-package com.lqkj.cmlcp.module.test.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-
-@Accessors(chain = true)
-@Data(staticConstructor = "create")
-@NoArgsConstructor
-@AllArgsConstructor
-public class Captcha {
-
-    private static final long serialVersionUID = 1L;
-
-    @Schema(description = "验证码id")
-    private Long id;
-
-    @Schema(description = "验证码")
-    private String code;
-
-    @Schema(description = "手机号")
-    private String phoneNumber;
-
-    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private Date createTime;
-
-}

src/main/java/com/lqkj/cmlcp/module/test/mapper/CaptchaMapper.java

@@ -1,9 +0,0 @@
-package com.lqkj.cmlcp.module.test.mapper;
-
-import com.lqkj.cmlcp.module.test.domain.Captcha;
-import com.mybatisflex.core.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface CaptchaMapper extends BaseMapper<Captcha> {
-}

src/main/java/com/lqkj/cmlcp/module/test/service/CaptchaService.java

@@ -1,12 +0,0 @@
-package com.lqkj.cmlcp.module.test.service;
-
-import com.lqkj.cmlcp.module.test.domain.Captcha;
-import com.mybatisflex.core.service.IService;
-
-import java.util.List;
-
-public interface CaptchaService extends IService<Captcha> {
-    List<Captcha> findAll();
-
-    Captcha findById();
-}

src/main/java/com/lqkj/cmlcp/module/test/service/impl/CaptchaServiceImpl.java

@@ -1,44 +0,0 @@
-package com.lqkj.cmlcp.module.test.service.impl;
-
-import com.lqkj.cmlcp.module.test.domain.Captcha;
-import com.lqkj.cmlcp.module.test.mapper.CaptchaMapper;
-import com.lqkj.cmlcp.module.test.service.CaptchaService;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
-import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Objects;
-
-
-@Service
-@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class CaptchaServiceImpl extends ServiceImpl<CaptchaMapper, Captcha> implements CaptchaService {
-    @Autowired
-    private CaptchaMapper captchaMapper;
-
-    @Resource
-    private RedisTemplate<String, List<Captcha>> redisTemplate;
-
-
-    @Override
-    public List<Captcha> findAll() {
-        var test = redisTemplate.opsForValue().get("test");
-        if (Objects.nonNull(test)){
-            return test;
-        }
-        var list = super.list();
-        redisTemplate.opsForValue().set("test",list);
-        return super.list();
-
-    }
-
-    @Override
-    public Captcha findById() {
-        return captchaMapper.selectOneById(1);
-    }
-}

src/main/java/com/lqkj/cmlcp/module/zone/controller/ProjectInfoController.java

@@ -0,0 +1,43 @@
+package com.lqkj.cmlcp.module.zone.controller;
+
+
+import com.lqkj.cmlcp.message.Result;
+import com.lqkj.cmlcp.module.zone.domain.ProjectInfo;
+import com.lqkj.cmlcp.module.zone.service.ProjectInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 项目信息管理
+ */
+@RestController
+@RequestMapping("/project")
+public class ProjectInfoController {
+
+
+    @Autowired
+    private ProjectInfoService projectInfoService;
+
+    @PostMapping("/pageQuery")
+    public Result pageQuery(@RequestParam(required = false, defaultValue = "") String projectName,
+                            @RequestParam(required = false, defaultValue = "0") Integer page,
+                            @RequestParam(required = false, defaultValue = "10") Integer pageSize){
+
+        return Result.ok(projectInfoService.pageQuery(projectName, page, pageSize));
+    }
+
+    @PostMapping("/save")
+    public Result save(@RequestBody ProjectInfo projectInfo){
+        projectInfoService.save(projectInfo);
+        return Result.ok();
+    }
+
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody List<Integer> ids){
+        projectInfoService.delete(ids);
+        return Result.ok();
+    }
+}

src/main/java/com/lqkj/cmlcp/module/zone/controller/ZoneInfoController.java

@@ -0,0 +1,52 @@
+package com.lqkj.cmlcp.module.zone.controller;
+
+import com.lqkj.cmlcp.message.Result;
+import com.lqkj.cmlcp.module.zone.domain.ZoneInfo;
+import com.lqkj.cmlcp.module.zone.service.ZoneInfoService;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 态势/作品信息管理
+ */
+@RestController
+@RequestMapping("/zone")
+public class ZoneInfoController {
+
+    @Autowired
+    private ZoneInfoService zoneInfoService;
+
+
+    @PostMapping("/save")
+    public Result save(@RequestBody ZoneInfo zoneInfo, HttpServletRequest request) {
+
+        zoneInfoService.save(zoneInfo);
+        return Result.ok();
+    }
+
+    @PostMapping("/pageQuery")
+    public Result pageQuery(@RequestParam(required = false, defaultValue = "") String name,
+                            @RequestParam(required = false, defaultValue = "0") Integer page,
+                            @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+
+        return Result.ok(zoneInfoService.pageQuery(name, page, pageSize));
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody List<Integer> ids) {
+        zoneInfoService.delete(ids);
+        return Result.ok();
+    }
+
+    /**
+     * 根据项目id获取态势/作品
+     */
+    @PostMapping("/getList")
+    public Result getList(@RequestParam Integer projectId) {
+        return Result.ok(zoneInfoService.getList(projectId));
+    }
+}

src/main/java/com/lqkj/cmlcp/module/zone/domain/ProjectInfo.java

@@ -0,0 +1,60 @@
+package com.lqkj.cmlcp.module.zone.domain;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+import java.util.Date;
+
+@Entity
+@Table(name = "project_info")
+@Accessors(chain = true)
+@Data()
+@NoArgsConstructor
+@AllArgsConstructor
+@SQLDelete(sql = "UPDATE project_info SET is_delete = true WHERE id = ?")
+@Where(clause = "is_delete = false")
+public class ProjectInfo{
+
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 项目名称
+     */
+    @Column(name = "project_name")
+    private String projectName;
+
+    /**
+     * 缩略图
+     */
+    @Column(name = "thumbnail")
+    private String thumbnail;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete", columnDefinition = "boolean default false")
+    private Boolean isDelete;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date updateTime;
+}

src/main/java/com/lqkj/cmlcp/module/zone/domain/ZoneInfo.java

@@ -0,0 +1,106 @@
+package com.lqkj.cmlcp.module.zone.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.Where;
+
+import java.util.Date;
+
+
+/**
+ * 作品/态势表
+ */
+@Entity
+@Table(name = "zone_info")
+@Accessors(chain = true)
+@Data()
+@NoArgsConstructor
+@AllArgsConstructor
+@SQLDelete(sql = "UPDATE zone_info SET is_delete = true WHERE id = ?")
+@Where(clause = "is_delete = false")
+public class ZoneInfo {
+
+    /**
+     * 作品id
+     */
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 作品名称
+     */
+    @Column(name = "zone_name")
+    private String zoneName;
+
+    /**
+     * 缩略图
+     */
+    @Column(name = "thumbnail")
+    private String thumbnail;
+
+    /**
+     * 插槽数据
+     */
+    @Type(JsonType.class)
+    @Column(name = "data_slotters", columnDefinition = "jsonb")
+    private JSONArray dataSlotters;
+
+    /**
+     * 画布样式
+     */
+    @Type(JsonType.class)
+    @Column(name = "canvas_style", columnDefinition = "jsonb")
+    private JSONObject canvasStyle;
+
+    /**
+     * 画布数据
+     */
+    @Type(JsonType.class)
+    @Column(name = "canvas_data", columnDefinition = "jsonb")
+    private JSONArray canvasData;
+
+    /**
+     * 项目id
+     */
+    @Column(name = "project_id")
+    private Integer projectId;
+
+    /**
+     * 态势类型
+     */
+    @Column(name = "posture_type")
+    private Integer postureType;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete", columnDefinition = "boolean default false")
+    private Boolean isDelete;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date updateTime;
+
+    public ZoneInfo(Integer projectId) {
+        this.projectId = projectId;
+    }
+}

src/main/java/com/lqkj/cmlcp/module/zone/domain/ZoneModel.java

@@ -0,0 +1,26 @@
+package com.lqkj.cmlcp.module.zone.domain;
+
+import com.google.gson.JsonObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ZoneModel {
+
+    private Integer zoneId;
+
+    private String zoneName;
+
+    private String thumbnail;
+
+    private List<JsonObject> dataSlotters;
+
+    private List<JsonObject> canvasData;
+
+    private JsonObject canvasStyle;
+
+}

src/main/java/com/lqkj/cmlcp/module/zone/repository/ProjectInfoRepository.java

@@ -0,0 +1,20 @@
+package com.lqkj.cmlcp.module.zone.repository;
+
+import com.lqkj.cmlcp.module.zone.domain.ProjectInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface ProjectInfoRepository extends JpaRepository<ProjectInfo, Integer> {
+
+    @Query(nativeQuery = true,
+            value = "select * from project_info t where t.is_delete = false " +
+                    "and (:projectName = '' or project_name like concat('%', :projectName, '%'))")
+    Page<ProjectInfo> pageQuery(@Param("projectName") String projectName, PageRequest pageRequest);
+
+    ProjectInfo findByProjectName(String projectName);
+}

src/main/java/com/lqkj/cmlcp/module/zone/repository/ZoneInfoRepository.java

@@ -0,0 +1,21 @@
+package com.lqkj.cmlcp.module.zone.repository;
+
+import com.lqkj.cmlcp.module.zone.domain.ZoneInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
+
+
+    @Query(nativeQuery = true,
+            value = "select * from zone_info t where t.is_delete = false " +
+            "and (:name = '' or zone_name like concat('%', :name, '%'))")
+    Page<ZoneInfo> pageQuery(@Param("name") String name, PageRequest pageRequest);
+
+    ZoneInfo findByZoneName(String zoneName);
+}

src/main/java/com/lqkj/cmlcp/module/zone/service/ProjectInfoService.java

@@ -0,0 +1,14 @@
+package com.lqkj.cmlcp.module.zone.service;
+
+import com.lqkj.cmlcp.module.zone.domain.ProjectInfo;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+public interface ProjectInfoService {
+    Page<ProjectInfo> pageQuery(String projectName, Integer page, Integer pageSize);
+
+    void save(ProjectInfo projectInfo);
+
+    void delete(List<Integer> ids);
+}

src/main/java/com/lqkj/cmlcp/module/zone/service/ZoneInfoService.java

@@ -0,0 +1,21 @@
+package com.lqkj.cmlcp.module.zone.service;
+
+import com.lqkj.cmlcp.module.zone.domain.ZoneInfo;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+public interface ZoneInfoService{
+    void save(ZoneInfo zoneInfo);
+
+    Page<ZoneInfo> pageQuery(String name, Integer page, Integer pageSize);
+
+    void delete(List<Integer> ids);
+
+    /**
+     * 获取项目下所有区域信息
+     * @param projectId
+     * @return
+     */
+    List<ZoneInfo> getList(Integer projectId);
+}

src/main/java/com/lqkj/cmlcp/module/zone/service/impl/ProjectInfoServiceImpl.java

@@ -0,0 +1,45 @@
+package com.lqkj.cmlcp.module.zone.service.impl;
+
+import com.lqkj.cmlcp.module.zone.domain.ProjectInfo;
+import com.lqkj.cmlcp.module.zone.repository.ProjectInfoRepository;
+import com.lqkj.cmlcp.module.zone.service.ProjectInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+public class ProjectInfoServiceImpl implements ProjectInfoService {
+
+
+    @Autowired
+    private ProjectInfoRepository projectInfoRepository;
+
+    @Override
+    public Page<ProjectInfo> pageQuery(String projectName, Integer page, Integer pageSize) {
+        return projectInfoRepository.pageQuery(projectName, PageRequest.of(page, pageSize));
+    }
+
+    @Override
+    public void save(ProjectInfo projectInfo) {
+        ProjectInfo oldProject = projectInfoRepository.findByProjectName(projectInfo.getProjectName());
+        if (Objects.nonNull(projectInfo.getId()) && !projectInfo.getId().equals(oldProject.getId())) throw new RuntimeException("项目名称已存在");
+        if (Objects.isNull(projectInfo.getId()) && Objects.nonNull(oldProject)) throw new RuntimeException("项目名称已存在");
+        if (Objects.isNull(projectInfo.getId())) projectInfo.setCreateTime(new Date());
+        projectInfo.setIsDelete(false);
+        projectInfo.setUpdateTime(new Date());
+        projectInfoRepository.save(projectInfo);
+    }
+
+    @Override
+    public void delete(List<Integer> ids) {
+        projectInfoRepository.deleteAllById(ids);
+    }
+}

src/main/java/com/lqkj/cmlcp/module/zone/service/impl/ZoneInfoServiceImpl.java

@@ -0,0 +1,58 @@
+package com.lqkj.cmlcp.module.zone.service.impl;
+
+import com.lqkj.cmlcp.module.zone.domain.ZoneInfo;
+import com.lqkj.cmlcp.module.zone.repository.ZoneInfoRepository;
+import com.lqkj.cmlcp.module.zone.service.ZoneInfoService;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+public class ZoneInfoServiceImpl implements ZoneInfoService {
+
+    @Autowired
+    private ZoneInfoRepository zoneInfoRepository;
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public void save(ZoneInfo zoneInfo) {
+        ZoneInfo oldzone = zoneInfoRepository.findByZoneName(zoneInfo.getZoneName());
+        if (Objects.nonNull(zoneInfo.getId()) && Objects.nonNull(oldzone)
+                && !oldzone.getId().equals(zoneInfo.getId())) throw new RuntimeException("作品名称已存在");
+        if (Objects.isNull(zoneInfo.getId()) && Objects.nonNull(oldzone)) throw new RuntimeException("作品名称已存在");
+        if (Objects.isNull(zoneInfo.getId())) zoneInfo.setCreateTime(new Date());
+        zoneInfo.setIsDelete(false);
+        zoneInfo.setUpdateTime(new Date());
+        zoneInfoRepository.save(zoneInfo);
+    }
+
+    @Override
+    public Page<ZoneInfo> pageQuery(String name, Integer page, Integer pageSize) {
+        PageRequest pageRequest = PageRequest.of(page, pageSize);
+        return zoneInfoRepository.pageQuery(name, pageRequest);
+    }
+
+    @Override
+    public void delete(List<Integer> ids) {
+        zoneInfoRepository.deleteAllById(ids);
+    }
+
+    @Override
+    public List<ZoneInfo> getList(Integer projectId) {
+        return zoneInfoRepository.findAll(Example.of(new ZoneInfo(projectId)));
+    }
+
+}

src/main/java/com/lqkj/cmlcp/utils/AESUtils.java

@@ -0,0 +1,85 @@
+package com.lqkj.cmlcp.utils;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.lqkj.cmlcp.module.authority.domain.UserInfo;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Date;
+import java.util.Objects;
+import java.util.Random;
+
+
+public class AESUtils {
+    private static final String ALGORITHM = "AES";
+    private static final String TRANSFORMATION = "AES";
+
+    public static String encrypt(String plainText, String key) throws Exception {
+        Cipher cipher = Cipher.getInstance(TRANSFORMATION);
+        StringBuilder keyBuilder = new StringBuilder(key);
+        while (keyBuilder.length() < 16) {
+            keyBuilder.append("\0");
+        }
+        byte[] keyBytes = keyBuilder.toString().getBytes(StandardCharsets.UTF_8);
+        cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(keyBytes, ALGORITHM));
+        byte[] doFinal = cipher.doFinal(plainText.getBytes(StandardCharsets.UTF_8));
+        return Base64.getEncoder().encodeToString(doFinal);
+    }
+
+    public static String decrypt(String cipherText, String key) throws Exception {
+        Cipher cipher = Cipher.getInstance(TRANSFORMATION);
+        StringBuilder keyBuilder = new StringBuilder(key);
+        while (keyBuilder.length() < 16) {
+            keyBuilder.append("\0");
+        }
+        byte[] keyBytes = keyBuilder.toString().getBytes(StandardCharsets.UTF_8);
+        cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(keyBytes, ALGORITHM));
+        byte[] doFinal = cipher.doFinal(Base64.getDecoder().decode(cipherText));
+        return new String(doFinal);
+    }
+
+    public static String generateRandomKey(int length) {
+        String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder(length);
+        for (int i = 0; i < length; i++) {
+            int index = random.nextInt(characters.length());
+            sb.append(characters.charAt(index));
+        }
+        return sb.toString();
+    }
+
+    public static UserInfo encryptUser(UserInfo userInfo, String key) throws Exception {
+        Date updateTime = userInfo.getUpdateTime();
+        Date lockTime = userInfo.getLockTime();
+        JSONObject object = JSON.parseObject(JSON.toJSONString(userInfo));
+        object.remove("updateTime");
+        object.remove("lockTime");
+        JSONArray jsonArray = object.getJSONArray("roleInfoList");
+        if (jsonArray != null && jsonArray.size() > 0) {
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject object1 = jsonArray.getJSONObject(i);
+                object1.remove("updateTime");
+            }
+        }
+        UserInfo encryptUser = JSON.parseObject(JSON.toJSONString(object), UserInfo.class);
+        encryptUser.setUserCode(encrypt(encryptUser.getUserCode(), key));
+        if (Objects.nonNull(encryptUser.getAuthorizationCode())) encryptUser.setAuthorizationCode(encrypt(encryptUser.getAuthorizationCode(), key));
+        encryptUser.setUpdateTime(updateTime);
+        encryptUser.setLockTime(lockTime);
+        return encryptUser;
+    }
+    public static void main(String[] args) throws Exception {
+//        String plainText = "123456";
+        String key = "abc";
+//        String cipherText = AESUtils.encrypt(plainText, key);
+        String cipherText = "5GzvPLBVRxQC6k37cknLMg==";
+        System.out.println(cipherText);
+        String plainText = AESUtils.decrypt(cipherText, key);
+        System.out.println(plainText);
+    }
+}

src/main/resources/application-install.yml

@@ -1,5 +1,5 @@
 server:
-  address: 192.168.4.219
+  address: 192.168.4.194
   servlet:
     context-path: /cmlcp-server
   port: 9999
@@ -38,6 +38,30 @@ spring:
   jdbc:
     template:
       query-timeout: 20s
+  jpa:
+    hibernate:
+      ddl-auto: none
+    generate-ddl: false
+    show-sql: false
+    open-in-view: true
+    properties:
+      hibernate:
+        event:
+          merge:
+            entity_copy_observer: allow
+        jdbc:
+          batch_size: 1000
+          fetch_size: 1000
+        temp:
+          use_jdbc_metadata_defaults: false
+        dialect: org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect
+        jpa:
+          properties:
+            hibernate:
+              jdbc:
+                batch_size: 1000
+              order_inserts: true
+    database-platform: org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect
   datasource:
     hikari:
       driver-class-name: org.postgresql.Driver
@@ -65,6 +89,11 @@ spring:
       chain:
         cache: true
         enabled: true
+  session:
+    jdbc:
+      initialize-schema: never
+  main:
+    allow-bean-definition-overriding: true
 logging:
   register-shutdown-hook: true
   level:
@@ -74,5 +103,12 @@ logging:
     org.hibernate.SQL: debug
     io.swagger.models.parameters.AbstractSerializableParameter: error
   file:
-    name: ./log/link.log
-    path: classpath:log4j2.xml
+    name: ./log/lcp.log
+    path: classpath:log4j2.xml
+springdoc:
+  api-docs:
+    enabled: false
+    path: /v3/api-docs
+  swagger-ui:
+    persist-authorization: true
+    path: /swagger-ui.html

src/main/resources/com/lqkj/cmlcp/module/authority/mapper/UserInfoMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.lqkj.cmlcp.module.authority.mapper.UserInfoMapper">
-
-    <insert id="initSuperAdminRole">
-        insert into user_role values (1, 1)
-    </insert>
-
-    <select id="initUserIdSeq">
-        ALTER SEQUENCE user_info_id_seq RESTART WITH 3
-    </select>
-
-</mapper>

src/main/resources/com/lqkj/cmlcp/module/test/mapper/CaptchaMapper.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.lqkj.cmlcp.module.test.mapper.CaptchaMapper">
-</mapper>

src/main/resources/db/migration/V1__INIT.sql

@@ -161,4 +161,141 @@ comment on column user_role.role_id is
 '角色ID：role_id';
 
 comment on column user_role.user_id is
-'用户ID：user_id';
+'用户ID：user_id';
+
+
+
+create table zone_info (
+                           id SERIAL NOT NULL,
+                           zone_name VARCHAR(255) NULL,
+                           thumbnail VARCHAR(255) NULL,
+                           data_slotters jsonb NULL,
+                           canvas_style jsonb NULL,
+                           canvas_data jsonb NULL,
+                           is_delete BOOL not null default false,
+                           update_time TIMESTAMP NULL,
+                           create_time TIMESTAMP NULL,
+                           constraint PK_ZONE_INFO primary key (id)
+);
+comment on table zone_info is
+'作品/模板：zone_info';
+
+comment on column zone_info.id is
+'作品ID：id';
+
+comment on column zone_info.zone_name is
+'作品名称：zone_name';
+
+comment on column zone_info.thumbnail is
+'缩略图：thumbnail';
+
+comment on column zone_info.data_slotters is
+'数据：data_slotters';
+
+comment on column zone_info.canvas_style is
+'画布样式：canvas_style';
+
+comment on column zone_info.canvas_data is
+'画布数据：canvas_data';
+
+comment on column zone_info.is_delete is
+'是否删除：is_delete 0:否 1:是' ;
+
+comment on column zone_info.update_time is
+'更新时间：update_time';
+
+comment on column zone_info.create_time is
+'创建时间：create_time';
+
+
+
+create table config_info (
+                             id SERIAL NOT NULL,
+                             server_address VARCHAR(255) NULL,
+                             map_token VARCHAR(1000) NULL,
+                             map_id VARCHAR(255) NULL,
+                             map_style_id VARCHAR(255) NULL,
+                             ue_stream_address VARCHAR(255) NULL,
+                             ue_h5_address VARCHAR(255) NULL,
+                             constraint PK_CONFIG_INFO primary key (id)
+);
+comment on table config_info is
+'系统配置：config_info';
+comment on column config_info.id is
+'主键：id';
+comment on column config_info.server_address is
+'服务地址：server_address';
+comment on column config_info.map_token is
+'地图token：map_token';
+comment on column config_info.map_id is
+'地图id：map_id';
+comment on column config_info.map_style_id is
+'地图样式id：map_style_id';
+comment on column config_info.ue_stream_address is
+'UE推流地址：ue_stream_address';
+comment on column config_info.ue_h5_address is
+'UE h5地址：ue_h5_address';
+
+
+
+create table api_info(
+                         id SERIAL NOT NULL,
+                         name VARCHAR(255) NULL,
+                         method VARCHAR(255) NULL,
+                         url VARCHAR(255) NULL,
+                         headers jsonb NULL,
+                         params jsonb NULL,
+                         data jsonb NULL,
+                         type int NULL,
+                         constraint PK_API_INFO primary key (id)
+);
+comment on table api_info is
+'接口信息：api_info';
+comment on column api_info.id is
+'主键：id';
+comment on column api_info.name is
+'接口名称：name';
+comment on column api_info.method is
+'请求方式：method';
+comment on column api_info.url is
+'请求地址：url';
+comment on column api_info.headers is
+'请求头：headers';
+comment on column api_info.params is
+'请求参数：params';
+comment on column api_info.data is
+'请求体：data';
+comment on column api_info.type is
+'api类型：type 1:接口 2:mock';
+
+
+
+create table project_info(
+                             id SERIAL NOT NULL,
+                             project_name VARCHAR(255) NULL,
+                             thumbnail VARCHAR(255) NULL,
+                             is_delete BOOL not null default false,
+                             update_time TIMESTAMP NULL,
+                             create_time TIMESTAMP NULL,
+                             constraint PK_PROJECT_INFO primary key (id)
+);
+comment on table project_info is
+'项目信息：project_info';
+comment on column project_info.id is
+'项目ID：id';
+comment on column project_info.project_name is
+'项目名称：project_name';
+comment on column project_info.thumbnail is
+'缩略图：thumbnail';
+comment on column project_info.is_delete is
+'是否删除：is_delete 0:否 1:是' ;
+comment on column project_info.update_time is
+'更新时间：update_time';
+comment on column project_info.create_time is
+'创建时间：create_time';
+alter table zone_info add column project_id int;
+comment on column zone_info.project_id is
+'项目ID：project_id';
+alter table zone_info add column posture_type int;
+comment on column zone_info.posture_type is
+'态势型：posture_type';

src/main/resources/log4j2.xml

@@ -27,18 +27,14 @@
     </Appenders>
 
     <Loggers>
-        <Logger name="org.apache.catalina.startup.DigesterFactory" level="info" />
-        <Logger name="org.apache.catalina.util.LifecycleBase" level="info" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="info" />
-        <logger name="org.apache.sshd.common.util.SecurityUtils" level="info"/>
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="info" />
-        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="info" />
-        <Logger name="org.hibernate.validator.internal.util.Version" level="info" />
-        <logger name="org.springframework.boot.actuate.endpoint.jmx" level="info"/>
-        <logger name="com.apache.ibatis" level="info"/>
-        <logger name="java.sql.Connection" level="info"/>
-        <logger name="java.sql.Statement" level="info"/>
-        <logger name="java.sql.PreparedStatement" level="info"/>
+        <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
+        <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
+        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
+        <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
+        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
+        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
+        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
+        <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
         <AsyncRoot level="info" additivity="false">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="File"/>