she稳重点人

blade-auth/src/main/java/org/springblade/auth/granter/RegisterTokenGranter.java

@@ -40,9 +40,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.NumberUtil;
 import org.springblade.system.cache.ParamCache;
+import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.enums.UserType;
-import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;

blade-auth/src/main/java/org/springblade/auth/granter/SocialTokenGranter.java

@@ -42,9 +42,9 @@ import org.springblade.core.social.props.SocialProperties;
 import org.springblade.core.social.utils.SocialUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springblade.system.pojo.entity.UserOauth;
-import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailService.java

@@ -35,9 +35,9 @@ import org.springblade.core.oauth2.utils.OAuth2ExceptionUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springblade.system.pojo.enums.UserType;
-import org.springblade.system.feign.IUserClient;
 
 import java.util.Optional;
 

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -42,7 +42,12 @@ public interface LauncherConstant {
 	/**
 	 * nacos 密码
 	 */
-	String NACOS_PASSWORD = "nacos";
+	String NACOS_PASSWORD = "xwkj2022@";
+
+	/**
+	 * nacos 命名空间id
+	 */
+	String NACOS_NAMESPACE = "0ba5b96b-be30-4315-9776-e75c94269272";
 
 	/**
 	 * nacos dev 地址
@@ -57,7 +62,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos test 地址
 	 */
-	String NACOS_TEST_ADDR = "172.30.0.48:8848";
+	String NACOS_TEST_ADDR = "127.0.0.1:8848";
 
 	/**
 	 * sentinel dev 地址

blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -27,7 +27,6 @@ package org.springblade.common.launch;
 
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.auto.service.AutoService;
-import org.springblade.core.launch.constant.NacosConstant;
 import org.springblade.core.launch.service.LauncherService;
 import org.springblade.core.launch.utils.PropsUtil;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -45,19 +44,22 @@ public class LauncherServiceImpl implements LauncherService {
 	@Override
 	public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
 		Properties props = System.getProperties();
+		// 指定注册配置信息
+		PropsUtil.setProperty(props, "spring.cloud.nacos.username", LauncherConstant.NACOS_USERNAME);
+		PropsUtil.setProperty(props, "spring.cloud.nacos.password", LauncherConstant.NACOS_PASSWORD);
+		PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
+		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
+		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
+		PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
 		// 开启多数据源
 		PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true");
-		// 指定注册配置信息
-		PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].data-id", NacosConstant.dataId("example", profile));
-		PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].group", NacosConstant.NACOS_CONFIG_GROUP);
-		PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH);
 		// 指定注册IP
 		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.ip", "127.0.0.1");
 		// 指定注册端口
 		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.port", "8200");
 		// 自定义命名空间
-		// PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE);
-		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE);
+		PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE);
+		PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE);
 		// 自定义分组
 		// PropsUtil.setProperty(props, "spring.cloud.nacos.config.group", NacosConstant.NACOS_CONFIG_GROUP);
 		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group", NacosConstant.NACOS_CONFIG_GROUP);

blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java

@@ -27,9 +27,10 @@ package org.springblade.develop.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -42,7 +43,6 @@ import org.springblade.develop.pojo.entity.Datasource;
 import org.springblade.develop.service.IDatasourceService;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.Valid;
 import java.util.List;
 
 /**

blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/ModelController.java

@@ -33,9 +33,10 @@ import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -52,7 +53,6 @@ import org.springblade.develop.service.IModelPrototypeService;
 import org.springblade.develop.service.IModelService;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.Valid;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;

blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/ModelPrototypeController.java

@@ -28,9 +28,10 @@ package org.springblade.develop.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -42,7 +43,6 @@ import org.springblade.develop.pojo.entity.ModelPrototype;
 import org.springblade.develop.service.IModelPrototypeService;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.Valid;
 import java.util.List;
 
 /**

blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/CodeServiceImpl.java

@@ -27,8 +27,8 @@ package org.springblade.develop.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.develop.pojo.entity.Code;
 import org.springblade.develop.mapper.CodeMapper;
+import org.springblade.develop.pojo.entity.Code;
 import org.springblade.develop.service.ICodeService;
 import org.springframework.stereotype.Service;
 

blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/DatasourceServiceImpl.java

@@ -26,8 +26,8 @@
 package org.springblade.develop.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.develop.pojo.entity.Datasource;
 import org.springblade.develop.mapper.DatasourceMapper;
+import org.springblade.develop.pojo.entity.Datasource;
 import org.springblade.develop.service.IDatasourceService;
 import org.springframework.stereotype.Service;
 

blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/ModelPrototypeServiceImpl.java

@@ -27,8 +27,8 @@ package org.springblade.develop.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.develop.pojo.entity.ModelPrototype;
 import org.springblade.develop.mapper.ModelPrototypeMapper;
+import org.springblade.develop.pojo.entity.ModelPrototype;
 import org.springblade.develop.service.IModelPrototypeService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/ModelServiceImpl.java

@@ -29,10 +29,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.develop.mapper.ModelMapper;
 import org.springblade.develop.pojo.entity.Code;
 import org.springblade.develop.pojo.entity.Model;
 import org.springblade.develop.pojo.entity.ModelPrototype;
-import org.springblade.develop.mapper.ModelMapper;
 import org.springblade.develop.service.ICodeService;
 import org.springblade.develop.service.IModelPrototypeService;
 import org.springblade.develop.service.IModelService;

blade-ops/blade-flow/src/main/java/org/springblade/flow/business/controller/WorkController.java

@@ -32,7 +32,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import org.flowable.engine.TaskService;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;

blade-ops/blade-flow/src/main/java/org/springblade/flow/business/feign/FlowClient.java

@@ -35,8 +35,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flow.core.pojo.entity.BladeFlow;
 import org.springblade.flow.core.feign.IFlowClient;
+import org.springblade.flow.core.pojo.entity.BladeFlow;
 import org.springblade.flow.core.utils.TaskUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java

@@ -31,7 +31,6 @@ import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.AllArgsConstructor;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java

@@ -32,7 +32,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowModelController.java

@@ -34,7 +34,6 @@ import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowProcessController.java

@@ -29,7 +29,6 @@ import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.flow.core.pojo.entity.BladeFlow;

blade-ops/blade-flow/src/main/resources/processes/LeaveProcess.bpmn20.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+             xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
+             typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
+             targetNamespace="http://www.flowable.org/processdef">
     <process id="Leave" name="请假流程" isExecutable="true">
         <documentation>请假流程</documentation>
         <startEvent id="start" name="开始" flowable:initiator="applyUser"></startEvent>

blade-ops/blade-job/src/main/java/org/springblade/job/controller/JobInfoController.java

@@ -27,9 +27,10 @@ package org.springblade.job.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -37,11 +38,10 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.job.pojo.entity.JobInfo;
-import org.springblade.job.service.IJobInfoService;
 import org.springblade.job.pojo.vo.JobInfoVO;
+import org.springblade.job.service.IJobInfoService;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.Valid;
 import java.util.Map;
 
 /**

blade-ops/blade-job/src/main/java/org/springblade/job/controller/JobServerController.java

@@ -27,9 +27,10 @@ package org.springblade.job.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -38,11 +39,10 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.job.pojo.entity.JobServer;
-import org.springblade.job.service.IJobServerService;
 import org.springblade.job.pojo.vo.JobServerVO;
+import org.springblade.job.service.IJobServerService;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.Valid;
 import java.util.List;
 import java.util.Map;
 

blade-ops/blade-job/src/main/java/org/springblade/job/service/impl/JobInfoServiceImpl.java

@@ -36,13 +36,13 @@ import org.springblade.core.tool.utils.ConvertUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
+import org.springblade.job.mapper.JobInfoMapper;
 import org.springblade.job.pojo.dto.JobDTO;
 import org.springblade.job.pojo.entity.JobInfo;
 import org.springblade.job.pojo.entity.JobServer;
-import org.springblade.job.mapper.JobInfoMapper;
+import org.springblade.job.pojo.vo.JobInfoVO;
 import org.springblade.job.service.IJobInfoService;
 import org.springblade.job.service.IJobServerService;
-import org.springblade.job.pojo.vo.JobInfoVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tech.powerjob.client.PowerJobClient;

blade-ops/blade-job/src/main/java/org/springblade/job/service/impl/JobServerServiceImpl.java

@@ -32,10 +32,10 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.job.pojo.entity.JobServer;
 import org.springblade.job.mapper.JobServerMapper;
-import org.springblade.job.service.IJobServerService;
+import org.springblade.job.pojo.entity.JobServer;
 import org.springblade.job.pojo.vo.JobServerVO;
+import org.springblade.job.service.IJobServerService;
 import org.springframework.stereotype.Service;
 import tech.powerjob.common.response.ResultDTO;
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/ResourceApplication.java

@@ -26,7 +26,6 @@
 package org.springblade.resource;
 
 import org.springblade.core.cloud.client.BladeCloudApplication;
-import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.launch.constant.AppConstant;
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/AttachController.java

@@ -27,9 +27,10 @@ package org.springblade.resource.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -38,12 +39,10 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.pojo.entity.Attach;
-import org.springblade.resource.service.IAttachService;
 import org.springblade.resource.pojo.vo.AttachVO;
+import org.springblade.resource.service.IAttachService;
 import org.springframework.web.bind.annotation.*;
 
-import jakarta.validation.Valid;
-
 /**
  * 附件表 控制器
  *

blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java

@@ -27,9 +27,11 @@ package org.springblade.resource.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
@@ -41,13 +43,10 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.pojo.entity.Oss;
-import org.springblade.resource.service.IOssService;
 import org.springblade.resource.pojo.vo.OssVO;
+import org.springblade.resource.service.IOssService;
 import org.springblade.resource.wrapper.OssWrapper;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.v3.oas.annotations.Hidden;
-
-import jakarta.validation.Valid;
 
 import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/SmsController.java

@@ -27,9 +27,11 @@ package org.springblade.resource.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
@@ -41,13 +43,10 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.pojo.entity.Sms;
-import org.springblade.resource.service.ISmsService;
 import org.springblade.resource.pojo.vo.SmsVO;
+import org.springblade.resource.service.ISmsService;
 import org.springblade.resource.wrapper.SmsWrapper;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.v3.oas.annotations.Hidden;
-
-import jakarta.validation.Valid;
 
 import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/SmsMapper.java

@@ -25,10 +25,11 @@
  */
 package org.springblade.resource.mapper;
 
-import org.springblade.resource.pojo.entity.Sms;
-import org.springblade.resource.pojo.vo.SmsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.resource.pojo.entity.Sms;
+import org.springblade.resource.pojo.vo.SmsVO;
+
 import java.util.List;
 
 /**

blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/AttachServiceImpl.java

@@ -27,10 +27,10 @@ package org.springblade.resource.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.resource.pojo.entity.Attach;
 import org.springblade.resource.mapper.AttachMapper;
-import org.springblade.resource.service.IAttachService;
+import org.springblade.resource.pojo.entity.Attach;
 import org.springblade.resource.pojo.vo.AttachVO;
+import org.springblade.resource.service.IAttachService;
 import org.springframework.stereotype.Service;
 
 /**

blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/OssServiceImpl.java

@@ -32,9 +32,9 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.resource.mapper.OssMapper;
 import org.springblade.resource.pojo.entity.Oss;
 import org.springblade.resource.pojo.vo.OssVO;
-import org.springblade.resource.mapper.OssMapper;
 import org.springblade.resource.service.IOssService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

blade-ops/blade-resource/src/main/java/org/springblade/resource/service/impl/SmsServiceImpl.java

@@ -32,10 +32,10 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.resource.pojo.entity.Sms;
 import org.springblade.resource.mapper.SmsMapper;
-import org.springblade.resource.service.ISmsService;
+import org.springblade.resource.pojo.entity.Sms;
 import org.springblade.resource.pojo.vo.SmsVO;
+import org.springblade.resource.service.ISmsService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

blade-service-api/blade-bzdz-api/src/main/java/org/springblade/modules/entity/FwFzEntity.java

@@ -1,9 +1,7 @@
 package org.springblade.modules.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
 /**

blade-service-api/blade-bzdz-api/src/main/java/org/springblade/modules/vo/RhzfSaveVO.java

@@ -2,7 +2,6 @@ package org.springblade.modules.vo;
 
 import lombok.Data;
 import org.springblade.modules.entity.FwFzEntity;
-import org.springblade.modules.entity.FzWgrEntity;
 
 import java.util.Date;
 import java.util.List;

blade-service-api/blade-bzdz-api/src/main/java/org/springblade/modules/vo/SyrkVO.java

@@ -2,8 +2,6 @@ package org.springblade.modules.vo;
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class SyrkVO {
 	private Long id;

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictBizCache.java

@@ -30,9 +30,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringPool;
+import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.pojo.entity.DictBiz;
 import org.springblade.system.pojo.enums.DictBizEnum;
-import org.springblade.system.feign.IDictBizClient;
 
 import java.util.List;
 

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/cache/DictCache.java

@@ -29,9 +29,9 @@ import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringPool;
+import org.springblade.system.feign.IDictClient;
 import org.springblade.system.pojo.entity.Dict;
 import org.springblade.system.pojo.enums.DictEnum;
-import org.springblade.system.feign.IDictClient;
 
 import java.util.List;
 import java.util.Optional;

blade-service-api/blade-scope-api/src/main/java/org/springblade/system/handler/ApiScopePermissionHandler.java

@@ -25,12 +25,12 @@
  */
 package org.springblade.system.handler;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.handler.IPermissionHandler;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.WebUtil;
 
-import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 
 import static org.springblade.system.cache.ApiScopeCache.permissionCode;

blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/ParamCache.java

@@ -28,8 +28,8 @@ package org.springblade.system.cache;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.system.pojo.entity.Param;
 import org.springblade.system.feign.ISysClient;
+import org.springblade.system.pojo.entity.Param;
 
 import static org.springblade.core.cache.constant.CacheConstant.PARAM_CACHE;
 

blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/RegionCache.java

@@ -28,8 +28,8 @@ package org.springblade.system.cache;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.SpringUtil;
-import org.springblade.system.pojo.entity.Region;
 import org.springblade.system.feign.ISysClient;
+import org.springblade.system.pojo.entity.Region;
 
 import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RhzfZdVO.java

@@ -71,4 +71,8 @@ public class RhzfZdVO {
 	private List<ZdVO> zylb;
 
 	private List<ZdVO> jyfs;
+
+	private List<ZdVO> clqk;
+
+	private List<ZdVO> djjg;
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/UserInfoVO.java

@@ -0,0 +1,19 @@
+package org.springblade.system.pojo.vo;
+
+import lombok.Data;
+import org.springblade.system.pojo.entity.Dept;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class UserInfoVO {
+	private Long id; // 用户id
+	private String name;
+	private String phone;
+	private String parentId; // 如果是民警，则是所属派出所id
+	private String parentName;
+	private String deptId; // 如果是民警，则是所属社区id
+	private List<Dept> deptList = new ArrayList<>();
+
+}

blade-service-api/blade-user-api/src/main/java/org/springblade/system/cache/UserCache.java

@@ -31,8 +31,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.system.pojo.entity.User;
 import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
 
 import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;

blade-service-api/pom.xml

@@ -35,6 +35,7 @@
         <module>blade-rhzfFwLs-api</module>
         <module>blade-sydw-api</module>
         <module>blade-rhzfRyLs-api</module>
+        <module>swzdr-api</module>
     </modules>
 
     <dependencies>

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyCarEntity.java

@@ -28,5 +28,15 @@ public class RyCarEntity extends BaseEntity {
 	 */
 	@Schema(description = "车辆号牌")
 	private String cph;
+	/**
+	 * 车主姓名
+	 */
+	@Schema(description = "车主姓名")
+	private String czxm;
+	/**
+	 * 车主与重点人关系
+	 */
+	@Schema(description = "车主与重点人关系")
+	private String czgx;
 
 }

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyCgspEntity.java

@@ -0,0 +1,51 @@
+package org.springblade.swzdr.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+/**
+ * 人员_撤管记录 实体类
+ *
+ * @author BladeX
+ * @since 2024-09-27
+ */
+@Data
+@TableName("swzdr_ry_cgsp")
+@Schema(description = "RyCgsp对象")
+@EqualsAndHashCode(callSuper = true)
+public class RyCgspEntity extends BaseEntity {
+
+	/**
+	 * swzdr_ry_info表id
+	 */
+	@Schema(description = "swzdr_ry_info表id")
+	private Long ryId;
+	/**
+	 * 信访处置说明
+	 */
+	@Schema(description = "信访处置说明")
+	private String czsm;
+	/**
+	 * 撤管原因
+	 */
+	@Schema(description = "撤管原因")
+	private String cgyy;
+	/**
+	 * 息访保证书
+	 */
+	@Schema(description = "息访保证书")
+	private String bzs;
+	/**
+	 * 审批结果 0待审批 1=批准 2=驳回
+	 */
+	@Schema(description = "审批结果 0待审批 1=批准 2=驳回")
+	private Integer spjg;
+	/**
+	 * 驳回原因
+	 */
+	@Schema(description = "驳回原因")
+	private String jjyy;
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyDjclEntity.java

@@ -0,0 +1,57 @@
+package org.springblade.swzdr.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+/**
+ * 人员_打击处理 实体类
+ *
+ * @author BladeX
+ * @since 2024-09-29
+ */
+@Data
+@TableName("swzdr_ry_djcl")
+@Schema(description = "RyDjcl对象")
+@EqualsAndHashCode(callSuper = true)
+public class RyDjclEntity extends BaseEntity {
+
+	/**
+	 * swzdr_ry_info表id
+	 */
+	@Schema(description = "swzdr_ry_info表id")
+	private Long ryId;
+	/**
+	 * 处理情况
+	 */
+	@Schema(description = "处理情况")
+	private String clqk;
+	/**
+	 * 发生时间
+	 */
+	@Schema(description = "发生时间")
+	private String fssj;
+	/**
+	 * 上访地点
+	 */
+	@Schema(description = "上访地点")
+	private String sfdd;
+	/**
+	 * 打击结果
+	 */
+	@Schema(description = "打击结果")
+	private String djjg;
+	/**
+	 * 上访行为描述
+	 */
+	@Schema(description = "上访行为描述")
+	private String xwms;
+	/**
+	 * 附件
+	 */
+	@Schema(description = "附件")
+	private String fj;
+
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyDjspEntity.java

@@ -27,12 +27,12 @@ public class RyDjspEntity extends BaseEntity {
 	 * 当前等级 0=无/1=C/2=B/3=A
 	 */
 	@Schema(description = "当前等级 0=无/1=C/2=B/3=A")
-	private Integer sourceLevel;
+	private String sourceLevel;
 	/**
 	 * 目标等级 0=无/1=C/2=B/3=A
 	 */
 	@Schema(description = "目标等级 0=无/1=C/2=B/3=A")
-	private Integer targetLevel;
+	private String targetLevel;
 	/**
 	 * 申请升降级原因
 	 */

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyInfoEntity.java

@@ -44,6 +44,31 @@ public class RyInfoEntity extends BaseEntity {
 	@Schema(description = "民族")
 	private String mz;
 	/**
+	 * 照片
+	 */
+	@Schema(description = "照片")
+	private String zp;
+	/**
+	 * 文化程度
+	 */
+	@Schema(description = "文化程度")
+	private String whcd;
+	/**
+	 * 婚姻状况
+	 */
+	@Schema(description = "婚姻状况")
+	private String hyzk;
+	/**
+	 * 政治面貌
+	 */
+	@Schema(description = "政治面貌")
+	private String zzmm;
+	/**
+	 * 人员信息类型 1=常住 2=暂住 5=寄住
+	 */
+	@Schema(description = "人员信息类型 1=常住 2=暂住 5=寄住")
+	private Integer ryType;
+	/**
 	 * 户籍地详址
 	 */
 	@Schema(description = "户籍地详址")
@@ -54,6 +79,11 @@ public class RyInfoEntity extends BaseEntity {
 	@Schema(description = "户籍地派出所")
 	private String hjdpcs;
 	/**
+	 * 户籍地派出所id
+	 */
+	@Schema(description = "户籍地派出所id")
+	private Long hjdpcsdm;
+	/**
 	 * 居住地详址
 	 */
 	@Schema(description = "居住地详址")
@@ -64,10 +94,20 @@ public class RyInfoEntity extends BaseEntity {
 	@Schema(description = "居住地派出所")
 	private String jzdpcs;
 	/**
+	 * 稳控类别
+	 */
+	@Schema(description = "稳控类别")
+	private String wklb;
+	/**
 	 * 重视等级 0=无/1=C/2=B/3=A
 	 */
 	@Schema(description = "0=无/1=C/2=B/3=A")
-	private Integer level;
+	private String level;
+	/**
+	 * 稳控单位
+	 */
+	@Schema(description = "稳控单位")
+	private Long wkdw;
 	/**
 	 * 派出所id
 	 */

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyLhspEntity.java

@@ -0,0 +1,37 @@
+package org.springblade.swzdr.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+/**
+ * 人员_列化审批 实体类
+ *
+ * @author BladeX
+ * @since 2024-09-24
+ */
+@Data
+@TableName("swzdr_ry_lhsp")
+@Schema(description = "RyLhsp对象")
+@EqualsAndHashCode(callSuper = true)
+public class RyLhspEntity extends BaseEntity {
+
+	/**
+	 * swzdr_ry_info表id
+	 */
+	@Schema(description = "swzdr_ry_info表id")
+	private Long userId;
+	/**
+	 * 审批结果 0待审批 1=批准 2=驳回
+	 */
+	@Schema(description = "审批结果 0待审批 1=批准 2=驳回")
+	private Integer spjg;
+	/**
+	 * 驳回原因
+	 */
+	@Schema(description = "驳回原因")
+	private String jjyy;
+
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyRwzlEntity.java

@@ -0,0 +1,47 @@
+package org.springblade.swzdr.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+/**
+ * 人员_任务指令(接收/转递) 实体类
+ *
+ * @author BladeX
+ * @since 2024-10-10
+ */
+@Data
+@TableName("swzdr_ry_rwzl")
+@Schema(description = "RyRwzl对象")
+@EqualsAndHashCode(callSuper = true)
+public class RyRwzlEntity extends BaseEntity {
+
+	/**
+	 * swzdr_ry_info表id
+	 */
+	@Schema(description = "swzdr_ry_info表id")
+	private Long ryId;
+	/**
+	 * 接收的派出所id
+	 */
+	@Schema(description = "接收的派出所id")
+	private Long jsPcsId;
+	/**
+	 * 1=接收 2=转递(转递时需要填写zd_pcs_id)
+	 */
+	@Schema(description = "1=接收 2=转递(转递时需要填写zd_pcs_id)")
+	private Integer zt;
+	/**
+	 * 转递的派出所id
+	 */
+	@Schema(description = "转递的派出所id")
+	private Long zdPcsId;
+	/**
+	 * 转递原因
+	 */
+	@Schema(description = "转递原因")
+	private String zdyy;
+
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyXfqtEntity.java

@@ -54,6 +54,11 @@ public class RyXfqtEntity extends BaseEntity {
 	@Schema(description = "sqzdr_xfqt表id")
 	private Long xfqtId;
 	/**
+	 * 群体名称
+	 */
+	@Schema(description = "群体名称")
+	private String qtmc;
+	/**
 	 * 扮演角色
 	 */
 	@Schema(description = "扮演角色")

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/entity/RyXsEntity.java

@@ -28,4 +28,9 @@ public class RyXsEntity extends BaseEntity {
 	 */
 	@Schema(description = "写实内容")
 	private String xsnr;
+	/**
+	 * 1=日常写实 2=战时写实
+	 */
+	@Schema(description = "1=日常写实 2=战时写实")
+	private int type;
 }

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/vo/RyCgspVO.java

@@ -0,0 +1,49 @@
+package org.springblade.swzdr.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.swzdr.pojo.entity.RyCgspEntity;
+
+import java.io.Serial;
+
+/**
+ * 人员_撤管记录 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-09-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RyCgspVO extends RyCgspEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private Long ryId;
+
+	private String xm;
+
+	private Integer xb;
+
+	private String gmsfhm;
+
+	private String lxdh;
+
+	private String hjdxz;
+
+	private String jzdxz;
+
+	private String pcsName;
+
+	private String cuJh;
+
+	private String cuName;
+
+	private String cuDeptName;
+
+	private String uuJh;
+
+	private String uuName;
+
+	private String uuDeptName;
+
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/vo/RyDjclVO.java

@@ -0,0 +1,31 @@
+package org.springblade.swzdr.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.swzdr.pojo.entity.RyDjclEntity;
+
+import java.io.Serial;
+
+/**
+ * 人员_打击处理 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RyDjclVO extends RyDjclEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private Long ryId;
+
+	private String xm;
+
+	private String level;
+
+	private Integer xb;
+
+	private String gmsfhm;
+
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/vo/RyDjspVO.java

@@ -17,4 +17,16 @@ import java.io.Serial;
 public class RyDjspVO extends RyDjspEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
+
+	private String xm;
+
+	private int xb;
+
+	private String jh;
+
+	private String gmsfhm;
+
+	private String lxdh;
+
+	private String deptName;
 }

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/vo/RyInfoVO.java

@@ -18,4 +18,9 @@ public class RyInfoVO extends RyInfoEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private Long userId;
+
+	private String lxdh;
+
+	private String deptName;
 }

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/vo/RyLhspVO.java

@@ -0,0 +1,36 @@
+package org.springblade.swzdr.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.swzdr.pojo.entity.RyLhspEntity;
+
+import java.io.Serial;
+
+/**
+ * 人员_列化审批 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RyLhspVO extends RyLhspEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private String xm;
+
+	private Integer xb;
+
+	private String gmsfhm;
+
+	private String mz;
+
+	private String lxdh;
+
+	private String hjdxz;
+
+	private String jzdxz;
+
+	private String pcsName;
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/vo/RyRwzlVO.java

@@ -0,0 +1,38 @@
+package org.springblade.swzdr.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.swzdr.pojo.entity.RyRwzlEntity;
+
+import java.io.Serial;
+
+/**
+ * 人员_任务指令(接收/转递) 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-10-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RyRwzlVO extends RyRwzlEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private String wklb;
+
+	private String xm;
+
+	private Integer xb;
+
+	private String level;
+
+	private String gmsfhm;
+
+	private String lxdh;
+
+	private String jzdxz;
+
+	private Long zdPcsId;
+
+	private String wkdwName;
+}

blade-service-api/swzdr-api/src/main/java/org/springblade/swzdr/pojo/vo/RyXsVO.java

@@ -17,4 +17,10 @@ import java.io.Serial;
 public class RyXsVO extends RyXsEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
+
+	private String deptName;
+
+	private String jh;
+
+	private String name;
 }

blade-service/blade-bzdz/src/main/java/org/springblade/modules/controller/BzdzController.java

@@ -4,7 +4,6 @@ import com.alibaba.cloud.commons.lang.StringUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.modules.entity.*;
 import org.springblade.modules.feign.*;
 import org.springblade.modules.service.BzdzService;
@@ -14,7 +13,10 @@ import org.springblade.modules.vo.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @AllArgsConstructor

blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java

@@ -1,8 +1,8 @@
 package org.springblade.desk.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;

blade-service/blade-desk/src/main/java/org/springblade/desk/controller/LeaveController.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.controller;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -34,7 +35,6 @@ import org.springblade.desk.entity.ProcessLeave;
 import org.springblade.desk.service.ILeaveService;
 import org.springblade.system.cache.UserCache;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.v3.oas.annotations.Hidden;
 
 /**
  * 控制器

blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java

@@ -28,11 +28,11 @@ package org.springblade.desk.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.Parameter;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.BladePage;
@@ -41,10 +41,10 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.TenantDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.pojo.entity.Notice;
 import org.springblade.desk.feign.INoticeClient;
-import org.springblade.desk.service.INoticeService;
+import org.springblade.desk.pojo.entity.Notice;
 import org.springblade.desk.pojo.vo.NoticeVO;
+import org.springblade.desk.service.INoticeService;
 import org.springblade.desk.wrapper.NoticeWrapper;
 import org.springframework.web.bind.annotation.*;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java

@@ -26,6 +26,7 @@
 package org.springblade.desk.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -35,7 +36,6 @@ import org.springblade.desk.pojo.entity.Notice;
 import org.springblade.desk.service.INoticeService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 /**
  * Notice Feign

blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java

@@ -38,8 +38,8 @@ import org.springblade.desk.entity.ProcessLeave;
 import org.springblade.desk.mapper.LeaveMapper;
 import org.springblade.desk.service.ILeaveService;
 import org.springblade.flow.core.constant.ProcessConstant;
-import org.springblade.flow.core.pojo.entity.BladeFlow;
 import org.springblade.flow.core.feign.IFlowClient;
+import org.springblade.flow.core.pojo.entity.BladeFlow;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.utils.TaskUtil;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/NoticeServiceImpl.java

@@ -28,10 +28,10 @@ package org.springblade.desk.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.desk.pojo.entity.Notice;
 import org.springblade.desk.mapper.NoticeMapper;
-import org.springblade.desk.service.INoticeService;
+import org.springblade.desk.pojo.entity.Notice;
 import org.springblade.desk.pojo.vo.NoticeVO;
+import org.springblade.desk.service.INoticeService;
 import org.springframework.stereotype.Service;
 
 /**

blade-service/blade-rkxx/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 8105
+  port: 8300
 
 #数据源配置
 spring:

blade-service/blade-rkxx/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 8105
+  port: 8300
 
 #数据源配置
 spring:

blade-service/blade-sydw/src/main/java/org/springblade/modules/mapper/CyryMapper.java

@@ -1,7 +1,6 @@
 package org.springblade.modules.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.entity.CyryEntity;
 
 import java.util.List;

blade-service/blade-sydw/src/main/java/org/springblade/modules/service/impl/CyryServiceImpl.java

@@ -1,6 +1,5 @@
 package org.springblade.modules.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.modules.entity.CyryEntity;
 import org.springblade.modules.mapper.CyryMapper;

blade-service/blade-syfw/src/main/java/org/springblade/modules/controller/SyfwController.java

@@ -1,17 +1,14 @@
 package org.springblade.modules.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.modules.entity.*;
@@ -22,10 +19,8 @@ import org.springblade.modules.feign.RhzfRyLsFeign;
 import org.springblade.modules.service.SyfwService;
 import org.springblade.modules.vo.FzLsVO;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.mp.support.Query;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

blade-service/blade-syry/src/main/java/org/springblade/modules/controller/SyryController.java

@@ -7,7 +7,6 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.modules.entity.*;
 import org.springblade.modules.feign.*;
 import org.springblade.modules.service.SyryService;
@@ -16,7 +15,10 @@ import org.springblade.modules.vo.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @RestController

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -88,6 +88,18 @@ public class DeptController extends BladeController {
 	}
 
 	/**
+	 * 根据名称搜索部门
+	 */
+	@GetMapping("/getDeptByName")
+	public R getDeptByName(String deptName) {
+		QueryWrapper queryWrapper = new QueryWrapper<>();
+		queryWrapper.like("dept_name", deptName);
+		queryWrapper.eq("is_deleted", 0);
+		List<Dept> dept = deptService.list(queryWrapper);
+		return R.data(dept);
+	}
+
+	/**
 	 * 列表
 	 */
 	@GetMapping("/list")

blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java

@@ -46,12 +46,11 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.system.pojo.entity.DictBiz;
+import org.springblade.system.pojo.vo.DictBizVO;
 import org.springblade.system.pojo.vo.RhzfZdVO;
 import org.springblade.system.pojo.vo.ZdVO;
 import org.springblade.system.service.IDictBizService;
-import org.springblade.system.pojo.vo.DictBizVO;
 import org.springblade.system.wrapper.DictBizWrapper;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -326,6 +325,13 @@ public class DictBizController extends BladeController {
 		code = "jyfs"; // 经营方式
 		List<ZdVO> jyfs = dictService.getDictList(code);
 		data.setJyfs(jyfs);
+
+		code = "djclqk"; // 涉稳重点人--打击处理情况
+		List<ZdVO> djclqk = dictService.getDictList(code);
+		data.setClqk(djclqk);
+		code = "djjg"; // 涉稳重点人--打击结果
+		List<ZdVO> djjg = dictService.getDictList(code);
+		data.setDjjg(djjg);
 		return R.data(data);
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java

@@ -56,12 +56,15 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.system.pojo.entity.User;
 import org.springblade.system.excel.UserExcel;
 import org.springblade.system.excel.UserImporter;
+import org.springblade.system.pojo.entity.Dept;
+import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.vo.SyVO;
-import org.springblade.system.service.IUserService;
+import org.springblade.system.pojo.vo.UserInfoVO;
 import org.springblade.system.pojo.vo.UserVO;
+import org.springblade.system.service.IDeptService;
+import org.springblade.system.service.IUserService;
 import org.springblade.system.wrapper.UserWrapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -85,6 +88,7 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 public class UserController {
 
 	private final IUserService userService;
+	private final IDeptService deptService;
 	private final BladeRedis bladeRedis;
 
 	/**
@@ -331,6 +335,29 @@ public class UserController {
 	}
 
 	/**
+	 * 获取用户信息(所属派出所、姓名、联系电话)
+	 */
+	@GetMapping("/getUserInfo")
+	public R getUserInfo(Long userId) {
+		UserInfoVO user = userService.getUserInfo(userId);
+		String[] deptIds = user.getDeptId().split(",");
+		for (String deptId : deptIds) {
+			Dept dept = deptService.getById(Long.valueOf(deptId));
+			user.getDeptList().add(dept);
+		}
+		return R.data(user);
+	}
+
+	/**
+	 * 根据deptId获取用户
+	 */
+	@GetMapping("/getUserByDeptId")
+	public R getUserByDeptId(@RequestParam Map<String, Object> params) {
+		List<User> userList = userService.getUserByDeptId(params);
+		return R.data(userList);
+	}
+
+	/**
 	 * 首页数据
 	 */
 	@GetMapping("sysj")

blade-service/blade-system/src/main/java/org/springblade/system/feign/ApiScopeClient.java

@@ -25,13 +25,13 @@
  */
 package org.springblade.system.feign;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 import java.util.ArrayList;
 import java.util.Collections;

blade-service/blade-system/src/main/java/org/springblade/system/feign/DataScopeClient.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.system.feign;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.datascope.constant.DataScopeConstant;
 import org.springblade.core.datascope.model.DataScopeModel;
@@ -35,7 +36,6 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 import java.util.ArrayList;
 import java.util.Collections;

blade-service/blade-system/src/main/java/org/springblade/system/feign/DictBizClient.java

@@ -26,6 +26,7 @@
 package org.springblade.system.feign;
 
 
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -33,7 +34,6 @@ import org.springblade.system.pojo.entity.DictBiz;
 import org.springblade.system.service.IDictBizService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 import java.util.List;
 

blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java

@@ -26,6 +26,7 @@
 package org.springblade.system.feign;
 
 
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -33,7 +34,6 @@ import org.springblade.system.pojo.entity.Dict;
 import org.springblade.system.service.IDictService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 import java.util.List;
 

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.system.feign;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -32,7 +33,6 @@ import org.springblade.system.pojo.entity.*;
 import org.springblade.system.service.*;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 import java.util.List;
 
@@ -200,5 +200,4 @@ public class SysClient implements ISysClient {
 		return R.data(regionService.getById(code));
 	}
 
-
 }

blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java

@@ -26,6 +26,7 @@
 package org.springblade.system.feign;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -39,7 +40,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 /**
  * 用户服务Feign实现类

blade-service/blade-system/src/main/java/org/springblade/system/feign/UserSearchClient.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.system.feign;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -33,7 +34,6 @@ import org.springblade.system.pojo.entity.User;
 import org.springblade.system.service.IUserSearchService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.v3.oas.annotations.Hidden;
 
 import java.util.List;
 

blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.java

@@ -28,8 +28,8 @@ package org.springblade.system.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.system.pojo.entity.Region;
 import org.springblade.system.excel.RegionExcel;
+import org.springblade.system.pojo.entity.Region;
 import org.springblade.system.pojo.vo.RegionVO;
 
 import java.util.List;

blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.java

@@ -29,11 +29,13 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.system.pojo.entity.User;
 import org.springblade.system.excel.UserExcel;
+import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.vo.SyVO;
+import org.springblade.system.pojo.vo.UserInfoVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -83,4 +85,8 @@ public interface UserMapper extends BaseMapper<User> {
 	SyVO selectXfyh(String deptId);
 
 	SyVO selectMdjf(String deptId);
+
+    UserInfoVO getUserInfo(Long userId);
+
+	List<User> getUserByDeptId(@Param("params") Map<String, Object> params);
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml

@@ -148,4 +148,31 @@
     <select id="selectMdjf" resultType="org.springblade.system.pojo.vo.SyVO">
         select count(0) as mdjf from jdrh.mdjf_dj mdjf left join jdrh.blade_dept bd on bd.id = mdjf.jfsssq where mdjf.is_deleted = '0' and ((#{deptId} LIKE '%' || bd.id || '%') OR (bd.ancestors LIKE '%' || #{deptId} || '%'))
     </select>
+
+    <select id="getUserInfo" resultType="org.springblade.system.pojo.vo.UserInfoVO">
+        SELECT
+            bu.id,
+            bu.name,
+            bu.phone,
+            bu.dept_id,
+            parent.id AS parentId,
+            parent.dept_name AS parentName
+        FROM
+            blade_user bu
+        LEFT JOIN blade_dept dept ON dept.id = SPLIT_PART( bu.dept_id, ',', 1 ) :: int8
+	    LEFT JOIN blade_dept parent ON parent.id = dept.parent_id
+        WHERE
+            bu.id = #{userId}
+          AND bu.is_deleted = 0
+    </select>
+
+    <select id="getUserByDeptId" resultType="org.springblade.system.pojo.entity.User">
+        SELECT
+            *
+        FROM
+            blade_user
+        WHERE
+            is_deleted = 0
+          AND dept_id ILIKE '%' || #{params.deptId} || '%';
+    </select>
 </mapper>

blade-service/blade-system/src/main/java/org/springblade/system/rule/TenantRoleMenuRule.java

@@ -28,9 +28,9 @@ package org.springblade.system.rule;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
-import org.springblade.system.cache.ParamCache;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.cache.ParamCache;
 import org.springblade.system.pojo.entity.Menu;
 import org.springblade.system.pojo.entity.RoleMenu;
 import org.springblade.system.service.IMenuService;

blade-service/blade-system/src/main/java/org/springblade/system/rule/TenantRule.java

@@ -28,10 +28,10 @@ package org.springblade.system.rule;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
-import org.springblade.system.cache.ParamCache;
 import org.springblade.core.tenant.TenantId;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.cache.ParamCache;
 import org.springblade.system.pojo.entity.Tenant;
 import org.springblade.system.service.ITenantService;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java

@@ -27,10 +27,10 @@ package org.springblade.system.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.constraints.NotEmpty;
 import org.springblade.system.pojo.entity.Role;
 import org.springblade.system.pojo.vo.RoleVO;
 
-import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**

blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java

@@ -30,15 +30,17 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
+import org.springblade.system.excel.UserExcel;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springblade.system.pojo.entity.UserOauth;
 import org.springblade.system.pojo.enums.UserType;
-import org.springblade.system.excel.UserExcel;
 import org.springblade.system.pojo.vo.SyVO;
+import org.springblade.system.pojo.vo.UserInfoVO;
 import org.springblade.system.pojo.vo.UserVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -246,4 +248,8 @@ public interface IUserService extends BaseService<User> {
 	SyVO selectXfyh(String deptId);
 
 	SyVO selectMdjf(String deptId);
+
+    UserInfoVO getUserInfo(Long userId);
+
+	List<User> getUserByDeptId(Map<String, Object> params);
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ApiScopeServiceImpl.java

@@ -26,8 +26,8 @@
 package org.springblade.system.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.system.pojo.entity.ApiScope;
 import org.springblade.system.mapper.ApiScopeMapper;
+import org.springblade.system.pojo.entity.ApiScope;
 import org.springblade.system.service.IApiScopeService;
 import org.springframework.stereotype.Service;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/AuthClientServiceImpl.java

@@ -26,8 +26,8 @@
 package org.springblade.system.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.system.pojo.entity.AuthClient;
 import org.springblade.system.mapper.AuthClientMapper;
+import org.springblade.system.pojo.entity.AuthClient;
 import org.springblade.system.service.IAuthClientService;
 import org.springframework.stereotype.Service;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DataScopeServiceImpl.java

@@ -26,8 +26,8 @@
 package org.springblade.system.service.impl;
 
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.system.pojo.entity.DataScope;
 import org.springblade.system.mapper.DataScopeMapper;
+import org.springblade.system.pojo.entity.DataScope;
 import org.springblade.system.service.IDataScopeService;
 import org.springframework.stereotype.Service;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -35,10 +35,10 @@ import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.system.cache.SysCache;
-import org.springblade.system.pojo.entity.Dept;
 import org.springblade.system.mapper.DeptMapper;
-import org.springblade.system.service.IDeptService;
+import org.springblade.system.pojo.entity.Dept;
 import org.springblade.system.pojo.vo.DeptVO;
+import org.springblade.system.service.IDeptService;
 import org.springblade.system.wrapper.DeptWrapper;
 import org.springframework.stereotype.Service;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java

@@ -39,11 +39,11 @@ import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.system.cache.DictBizCache;
-import org.springblade.system.pojo.entity.DictBiz;
 import org.springblade.system.mapper.DictBizMapper;
+import org.springblade.system.pojo.entity.DictBiz;
+import org.springblade.system.pojo.vo.DictBizVO;
 import org.springblade.system.pojo.vo.ZdVO;
 import org.springblade.system.service.IDictBizService;
-import org.springblade.system.pojo.vo.DictBizVO;
 import org.springblade.system.wrapper.DictBizWrapper;
 import org.springframework.stereotype.Service;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java

@@ -39,10 +39,10 @@ import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.system.cache.DictCache;
-import org.springblade.system.pojo.entity.Dict;
 import org.springblade.system.mapper.DictMapper;
-import org.springblade.system.service.IDictService;
+import org.springblade.system.pojo.entity.Dict;
 import org.springblade.system.pojo.vo.DictVO;
+import org.springblade.system.service.IDictService;
 import org.springblade.system.wrapper.DictWrapper;
 import org.springframework.stereotype.Service;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -39,14 +39,14 @@ import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.SysCache;
-import org.springblade.system.pojo.dto.MenuDTO;
 import org.springblade.system.mapper.MenuMapper;
+import org.springblade.system.pojo.dto.MenuDTO;
 import org.springblade.system.pojo.entity.*;
+import org.springblade.system.pojo.vo.MenuVO;
 import org.springblade.system.service.IMenuService;
 import org.springblade.system.service.IRoleMenuService;
 import org.springblade.system.service.IRoleScopeService;
 import org.springblade.system.service.ITopMenuSettingService;
-import org.springblade.system.pojo.vo.MenuVO;
 import org.springblade.system.wrapper.MenuWrapper;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ParamServiceImpl.java

@@ -27,8 +27,8 @@ package org.springblade.system.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.system.pojo.entity.Param;
 import org.springblade.system.mapper.ParamMapper;
+import org.springblade.system.pojo.entity.Param;
 import org.springblade.system.service.IParamService;
 import org.springframework.stereotype.Service;
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PostServiceImpl.java

@@ -30,10 +30,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.pojo.entity.Post;
 import org.springblade.system.mapper.PostMapper;
-import org.springblade.system.service.IPostService;
+import org.springblade.system.pojo.entity.Post;
 import org.springblade.system.pojo.vo.PostVO;
+import org.springblade.system.service.IPostService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java

@@ -33,11 +33,11 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.system.pojo.entity.Region;
 import org.springblade.system.excel.RegionExcel;
 import org.springblade.system.mapper.RegionMapper;
-import org.springblade.system.service.IRegionService;
+import org.springblade.system.pojo.entity.Region;
 import org.springblade.system.pojo.vo.RegionVO;
+import org.springblade.system.service.IRegionService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleMenuServiceImpl.java

@@ -26,8 +26,8 @@
 package org.springblade.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.system.pojo.entity.RoleMenu;
 import org.springblade.system.mapper.RoleMenuMapper;
+import org.springblade.system.pojo.entity.RoleMenu;
 import org.springblade.system.service.IRoleMenuService;
 import org.springframework.stereotype.Service;