diff --git a/pom.xml b/pom.xml index 9f41f23..9673603 100644 --- a/pom.xml +++ b/pom.xml @@ -870,7 +870,7 @@ org.example - wflow-server1 + wflow-server 1.0-SNAPSHOT system ${basedir}/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar diff --git a/src/main/java/com/zhgd/config/DataSourceOneConfig.java b/src/main/java/com/zhgd/config/DataSourceOneConfig.java index c034633..565e177 100644 --- a/src/main/java/com/zhgd/config/DataSourceOneConfig.java +++ b/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(); diff --git a/src/main/java/com/zhgd/config/DataSourceTwoConfig.java b/src/main/java/com/zhgd/config/DataSourceTwoConfig.java index 5bc4ab2..dc31126 100644 --- a/src/main/java/com/zhgd/config/DataSourceTwoConfig.java +++ b/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(); diff --git a/src/main/java/com/zhgd/magic/MagicInterceptor.java b/src/main/java/com/zhgd/magic/MagicInterceptor.java index 43c00a8..6892a94 100644 --- a/src/main/java/com/zhgd/magic/MagicInterceptor.java +++ b/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; diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index fd89b5c..2e5d3bf 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/config/OperLogAspect.java b/src/main/java/com/zhgd/xmgl/config/OperLogAspect.java index d1b0c5b..3bb69d7 100644 --- a/src/main/java/com/zhgd/xmgl/config/OperLogAspect.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/api/camera/CameraPreview.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/api/camera/CameraPreview.java index 28c7ead..0d9becd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/api/camera/CameraPreview.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java index 3077d33..2ffccfa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java index 3376c1a..e7508c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/VideoOpController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/VideoOpController.java index d016a51..ca684c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/VideoOpController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java index 575c3e6..3fea642 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java index aa3446c..6a0a5a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemUserController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java index e91d2f5..5324369 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java index f52cdbf..def9441 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java index a72aae5..15d5c9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java index f2a1167..0c74885 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AttendanceDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AttendanceDevController.java index a0734a9..e52b818 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AttendanceDevController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CompanyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CompanyController.java index dbfc19a..7e35db4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CompanyController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java index 9b265a3..d78b800 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java index cf8bed3..ac31dee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java index db2335c..6d3beac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java index 70763b9..4cd92b2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/SystemUserController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TeamInfoController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TeamInfoController.java index 627bf57..a219933 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TeamInfoController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerInfoController.java index b1ed510..c8b5589 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerInfoController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerTypeController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerTypeController.java index e69b003..ddc7d66 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerTypeController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java index 67608e3..a84f9e1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseActionServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index fa077ec..d42f181 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java index 95cbb44..15f61d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index b0baca6..c31551b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java index c1215f3..4f049b8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java index f2d5dfe..02817a6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java index d3ee1d5..1be0ca0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java index c351b9f..1b188e3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemDeptServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java index af9558e..be2f89a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index d2a6c38..5bed0d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/CommonFileController.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/CommonFileController.java index f0a6f2d..71509bc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/CommonFileController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FilesController.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FilesController.java index 407d305..85a62d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FilesController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java index ce39353..fd46ed8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/RecoveryFileController.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/RecoveryFileController.java index 04dd3cd..16b36fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/RecoveryFileController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/ShareController.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/ShareController.java index 5ea9447..26fbffe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/ShareController.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java index 59fc843..7709e3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java index ee0af68..b298fd2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java index 324df94..81f167d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectLibraryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectLibraryServiceImpl.java index 044d72b..71d9ddf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectLibraryServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java index 58f3e45..70d373a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java index b7ae100..095a799 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java index 514691a..499f9db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java index 60ea715..9a9b32c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java index ea44c47..d13cccf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/security/MyUserDetailsImpl.java b/src/main/java/com/zhgd/xmgl/security/MyUserDetailsImpl.java index accad09..3920b63 100644 --- a/src/main/java/com/zhgd/xmgl/security/MyUserDetailsImpl.java +++ b/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; diff --git a/src/main/java/com/zhgd/xmgl/security/SecurityUser.java b/src/main/java/com/zhgd/xmgl/security/SecurityUser.java new file mode 100644 index 0000000..fe66503 --- /dev/null +++ b/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 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; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/security/SecurityUtil.java b/src/main/java/com/zhgd/xmgl/security/SecurityUtil.java index 3c2710e..31a2995 100644 --- a/src/main/java/com/zhgd/xmgl/security/SecurityUtil.java +++ b/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 + *

+ */ + 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); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 144c26c..cb647a9 100644 --- a/src/main/resources/application.properties +++ b/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