工作流

pom.xml

@@ -870,7 +870,7 @@
 
         <dependency>
             <groupId>org.example</groupId>
-            <artifactId>wflow-server1</artifactId>
+            <artifactId>wflow-server</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>system</scope>
             <systemPath>${basedir}/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar</systemPath>

src/main/java/com/zhgd/config/DataSourceOneConfig.java

@@ -2,6 +2,7 @@ package com.zhgd.config;
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.logging.stdout.StdOutImpl;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
@@ -35,6 +36,7 @@ public class DataSourceOneConfig {
         //开启驼峰
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setMapUnderscoreToCamelCase(true);
+        configuration.setLogImpl(StdOutImpl.class);
         bean.setConfiguration(configuration);
         bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:com/zhgd/xmgl/**/*.xml"));
         return bean.getObject();

src/main/java/com/zhgd/config/DataSourceTwoConfig.java

@@ -2,6 +2,7 @@ package com.zhgd.config;
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.logging.stdout.StdOutImpl;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
@@ -35,6 +36,7 @@ public class DataSourceTwoConfig {
         //开启驼峰
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setMapUnderscoreToCamelCase(true);
+        configuration.setLogImpl(StdOutImpl.class);
         bean.setConfiguration(configuration);
         bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mapper/*.xml"));
         return bean.getObject();

src/main/java/com/zhgd/magic/MagicInterceptor.java

@@ -1,6 +1,6 @@
 package com.zhgd.magic;
 
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.basicdata.service.IProjectService;
 import com.zhgd.xmgl.security.SecurityUtil;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zhgd/mybatis/DataScopeHandler.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUserDataScope;
 import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService;

src/main/java/com/zhgd/xmgl/config/OperLogAspect.java

@@ -3,7 +3,7 @@ package com.zhgd.xmgl.config;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.xmgl.modules.basicdata.entity.OperationLog;
 import com.zhgd.xmgl.modules.basicdata.service.IOperationLogService;

src/main/java/com/zhgd/xmgl/modules/basicdata/api/camera/CameraPreview.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.basicdata.entity.GovernmentConfig;
 import com.zhgd.xmgl.modules.basicdata.entity.VideoConfig;
 import com.zhgd.xmgl.modules.basicdata.service.IGovernmentConfigService;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java

@@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.basicdata.controller.admin;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qiwenshare.common.result.RestResult;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.constant.CommonConstant;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.gexin.fastjson.JSON;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/VideoOpController.java

@@ -4,7 +4,7 @@ import cn.xuyanwu.spring.file.storage.FileInfo;
 import cn.xuyanwu.spring.file.storage.FileStorageService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.util.PageUtil;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java

@@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java

@@ -1,7 +1,7 @@
 package com.zhgd.xmgl.modules.basicdata.controller.government;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java

@@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.basicdata.controller.government;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 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.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AttendanceDevController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.wisdom.entity.AttendanceDev;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CompanyController.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java

@@ -1,7 +1,7 @@
 package com.zhgd.xmgl.modules.basicdata.controller.project;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java

@@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.controller.project;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TeamInfoController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerInfoController.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.basicdata.api.arcsoft_face.FaceApi;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerTypeController.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.basicdata.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.basicdata.entity.BaseAction;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.basicdata.dto.MenuTreeDto;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.basicdata.entity.*;
 import com.zhgd.xmgl.modules.basicdata.mapper.BaseActionMapper;
 import com.zhgd.xmgl.modules.basicdata.mapper.BaseMenuMapper;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.async.AsyncEmail;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.async.AsyncAiAnalyse;
 import com.zhgd.xmgl.handler.exception.CustomException;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.async.AsyncAiAnalyse;
 import com.zhgd.xmgl.modules.basicdata.dto.PolicyDto;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.mybatis.Aes;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemDept;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.handler.exception.CustomException;

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.mybatis.Aes;

src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/CommonFileController.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.quality.qiwen.api.ICommonFileService;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IFilePermissionService;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IUserFileService;

src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FilesController.java

@@ -10,7 +10,7 @@ import com.qiwenshare.common.util.DateUtil;
 import com.qiwenshare.ufop.factory.UFOPFactory;
 import com.qiwenshare.ufop.operation.copy.Copier;
 import com.qiwenshare.ufop.operation.copy.domain.CopyFile;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IFileService;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IUserFileService;
 import com.zhgd.xmgl.modules.quality.qiwen.component.FileDealComp;

src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java

@@ -8,7 +8,7 @@ import com.qiwenshare.ufop.operation.download.Downloader;
 import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
 import com.qiwenshare.ufop.operation.download.domain.Range;
 import com.qiwenshare.ufop.util.UFOPUtils;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IFileService;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IFiletransferService;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IUserFileService;

src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/RecoveryFileController.java

@@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.quality.qiwen.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IRecoveryFileService;
 import com.zhgd.xmgl.modules.quality.qiwen.component.AsyncTaskComp;
 import com.zhgd.xmgl.modules.quality.qiwen.domain.RecoveryFile;

src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/ShareController.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.common.util.DateUtil;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IShareFileService;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IShareService;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IUserFileService;

src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qiwenshare.common.constant.FileConstant;
 import com.qiwenshare.common.util.DateUtil;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.quality.qiwen.api.IUserFileService;
 import com.zhgd.xmgl.modules.quality.qiwen.component.FileDealComp;
 import com.zhgd.xmgl.modules.quality.qiwen.domain.RecoveryFile;

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
 import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain;

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto;
 import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto;

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectLibraryServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.safety.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.safety.entity.InspectLibrary;
 import com.zhgd.xmgl.modules.safety.entity.InspectLibraryDetail;

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
 import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain;

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile;
 import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
 import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto;

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService;
 import com.zhgd.xmgl.modules.basicdata.service.IProjectService;

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService;
 import com.zhgd.xmgl.modules.basicdata.service.IProjectService;

src/main/java/com/zhgd/xmgl/security/MyUserDetailsImpl.java

@@ -2,7 +2,7 @@ package com.zhgd.xmgl.security;
 
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.wflow.utils.SecurityUser;
+import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole;
 import com.zhgd.xmgl.modules.basicdata.mapper.BaseActionMapper;

src/main/java/com/zhgd/xmgl/security/SecurityUser.java

@@ -0,0 +1,90 @@
+package com.zhgd.xmgl.security;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.SpringSecurityCoreVersion;
+import org.springframework.security.core.userdetails.User;
+
+import java.util.Collection;
+
+/**
+ * @author peng
+ * @date 扩展用户信息
+ */
+public class SecurityUser extends User {
+
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+
+	/**
+	 * 用户ID
+	 */
+	@Getter
+	@Setter
+	private String userId;
+
+	/**
+	 * 真实姓名
+	 */
+	@Getter
+	@Setter
+	private String realName;
+
+	/**
+	 * 手机号
+	 */
+	@Getter
+	@Setter
+	private String userTel;
+
+	/**
+	 * 账号类型，1系统管理员，2.政务;3.企业;4.项目
+	 */
+	@Getter
+	@Setter
+	private Integer accountType;
+
+	/**
+	 *  政务、企业或项目sn
+	 */
+	@Getter
+	@Setter
+	private String sn;
+
+	/**
+	 *  是否为管理员账号
+	 */
+	@Getter
+	@Setter
+	private boolean isManager;
+
+	/**
+	 *  是否为工程账号
+	 */
+//	@Getter
+//	@Setter
+//	private String engineeringSn;
+
+	@JsonCreator
+	public SecurityUser(@JsonProperty("userId") String userId, @JsonProperty("account") String account,
+                        @JsonProperty("realName")String realName, @JsonProperty("userTel") String userTel,
+						@JsonProperty("accountType") Integer accountType, @JsonProperty("sn") String sn,
+						@JsonProperty("isManager") boolean isManager, /*@JsonProperty("engineeringSn") String engineeringSn,*/
+						@JsonProperty("password") String password, @JsonProperty("enabled") boolean enabled,
+                        @JsonProperty("accountNonExpired") boolean accountNonExpired,
+                        @JsonProperty("credentialsNonExpired") boolean credentialsNonExpired,
+                        @JsonProperty("accountNonLocked") boolean accountNonLocked,
+                        @JsonProperty("authorities") Collection<? extends GrantedAuthority> authorities) {
+		super(account, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
+		this.userId = userId;
+		this.realName = realName;
+		this.userTel = userTel;
+		this.accountType = accountType;
+		this.sn = sn;
+		this.isManager = isManager;
+//		this.engineeringSn = engineeringSn;
+	}
+
+}

src/main/java/com/zhgd/xmgl/security/SecurityUtil.java

@@ -1,14 +1,36 @@
 package com.zhgd.xmgl.security;
 
-import com.wflow.utils.SecurityUser;
 import lombok.experimental.UtilityClass;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 @UtilityClass
 public class SecurityUtil {
 
+    /**
+     * 获取Authentication
+     */
+    public Authentication getAuthentication() {
+        return SecurityContextHolder.getContext().getAuthentication();
+    }
+
+    /**
+     * 获取用户
+     * @param authentication
+     * <p>
+     */
+    private SecurityUser getUser(Authentication authentication) {
+        Object principal = authentication.getPrincipal();
+        if (principal instanceof SecurityUser) {
+            return (SecurityUser) principal;
+        }
+        return null;
+    }
+
     /**
      * 获取用户
      */
     public SecurityUser getUser() {
-        return com.wflow.utils.SecurityUtil.getUser();
+        Authentication authentication = getAuthentication();
+        return authentication == null ? null : getUser(authentication);
     }
 }

src/main/resources/application.properties

@@ -30,8 +30,7 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 # mybatis 配置
 #mybatis-plus.mapper-locations=classpath*:com/zhgd/xmgl/**/*.xml,classpath*:com/zhwl/zw/**/*.xml
-mybatis-plus.mapper-locations=classpath*:mapper/*.xml
+#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 # mvc 视图对象配置
 spring.mvc.view.prefix=/
 spring.mvc.view.suffix=.html