删除无用代码

hz-pm-api/pom.xml

@@ -262,117 +262,6 @@
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-base</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.agent</groupId>
-            <artifactId>agent-boot</artifactId>
-            <version>1.3.22</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/agent-boot-1.3.22.0215.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.agent</groupId>
-            <artifactId>agent-boot</artifactId>
-            <version>1.3.22</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/agent-boot-1.3.22.0215.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.suwell</groupId>
-            <artifactId>suwell-agent-http</artifactId>
-            <version>1.7</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/suwell-agent-http-1.7.220630.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.suwell</groupId>
-            <artifactId>suwell-agent-wrapper</artifactId>
-            <version>1.6</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/suwell-agent-wrapper-1.6.221208.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.29</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/slf4j-api-1.7.29.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.httpclient</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/httpclient-4.5.13.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.httpcore</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.13</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/httpcore-4.4.13.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.httpmime</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5.13</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/httpmime-4.5.13.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.jbArchivesTools</groupId>
-            <artifactId>jbArchivesTools</artifactId>
-            <version>1.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/jbArchivesTools-1.0-SNAPSHOT.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.suwell</groupId>
-            <artifactId>suwell-convert-base</artifactId>
-            <version>1.5.19</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/suwell-convert-base-1.5.19.0408.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/gson-2.8.0.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.suwell</groupId>
-            <artifactId>suwell-rpc-manager-client</artifactId>
-            <version>2.7</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/suwell-rpc-manager-client-2.7.211125.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.suwell</groupId>
-            <artifactId>suwell-packet-wrapper</artifactId>
-            <version>1.21</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/suwell-packet-wrapper-1.21.230306.jar</systemPath>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.0.2</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/dom4j-2.0.2.jar</systemPath>
-        </dependency>
     </dependencies>
     <!-- 打包 -->
     <!--配置环境的profile-->
@@ -385,18 +274,6 @@
             </properties>
         </profile>
         <profile>
-            <id>test</id>
-            <properties>
-                <environment>test</environment>
-            </properties>
-        </profile>
-        <profile>
-            <id>pre</id>
-            <properties>
-                <environment>pre</environment>
-            </properties>
-        </profile>
-        <profile>
             <id>prod</id>
             <properties>
                 <environment>prod</environment>

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/UserInfoHelper.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.common.helper;
 
 import com.hz.pm.api.user.entity.UserInfo;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 
 import java.util.Collection;
 import java.util.List;

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/UserInfoHelperImpl.java

@@ -18,7 +18,7 @@ import com.hz.pm.api.sys.service.IUserRoleService;
 import com.hz.pm.api.user.constant.UserAvailableEnum;
 import com.hz.pm.api.user.entity.UserInfo;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.service.IUserInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/EarlyWarningStatisticsManage.java

@@ -17,7 +17,7 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.entity.WflowEarlyWarningRecords;
 import com.hz.pm.api.sys.service.IEarlyWarningRecordsService;
 import com.hz.pm.api.sys.utils.EarlyWarningUtil;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.enums.WarningNoticeTypeEnum;
 import com.wflow.enums.WarningRuleTypeEnum;
@@ -31,7 +31,6 @@ import org.flowable.task.api.Task;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/DashboardUserDataScopeProviderImpl.java

@@ -5,7 +5,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertAdminDataScopeProviderImpl.java

@@ -7,8 +7,8 @@ import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.sys.model.dto.RegionDTO;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertDataScopeProviderImpl.java

@@ -6,7 +6,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/HigherUserDataScopeProviderImpl.java

@@ -8,7 +8,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrdinaryUserDataScopeProviderImpl.java

@@ -5,7 +5,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrgAdminDataScopeProviderImpl.java

@@ -4,7 +4,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/RegionAdminDataScopeProviderImpl.java

@@ -8,7 +8,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/SuperAdminDataScopeProviderImpl.java

@@ -6,7 +6,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/VisitoyDataScopeProviderImpl.java

@@ -4,7 +4,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeProvider;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/datascope/utils/DataScopeUtil.java

@@ -2,8 +2,8 @@ package com.hz.pm.api.datascope.utils;
 
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.provider.DataScopeContext;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 
 import java.util.Objects;

hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertUserInfoAssembler.java

@@ -384,6 +384,7 @@ public class ExpertUserInfoAssembler {
             item.setExpertType(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_TYPE.getKey())));
             item.setExpertSpecialty(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_SPECIALTY.getKey())));
             item.setExpertSource(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_SOURCE.getKey())));
+            item.setExpertLibrary(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_LIBRARY.getKey())));
         }
         // 以下数据为专家excel导出使用
         item.setGender(eui.getGender());

hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java

@@ -1,9 +1,6 @@
 package com.hz.pm.api.expert.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,8 +27,10 @@ public class ExpertUserFullInfo implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createOn;
 
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateOn;
 
     /**

hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/PermissionCheckHelper.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.expert.helper;
 
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

hz-pm-api/src/main/java/com/hz/pm/api/expert/service/impl/ExpertAdminManageServiceImpl.java

@@ -82,10 +82,6 @@ public class ExpertAdminManageServiceImpl implements ExpertAdminManageService {
             Map<Long, List<ExpertDictionary>> expertDictMap = CollUtils.group(expertDictionaryList, ExpertDictionary::getUserId);
 
             // 获取专家标签数据
-            LambdaQueryWrapper<ExpertTag> tagIn = Wrappers.lambdaQuery(ExpertTag.class)
-                    .in(ExpertTag::getUserId, userIdList);
-            List<ExpertTag> expertTagList = iExpertTagService.list(tagIn);
-            Map<Long, List<ExpertTag>> expertTagMap = CollUtils.group(expertTagList, ExpertTag::getUserId);
             for (ExpertUserFullInfo expertUserFullInfo : expertUserList) {
                 ExpertAdminExpertListDTO expertAdminExpertManageListDTO = ExpertUserInfoAssembler.convert(expertUserFullInfo, expertDictMap);
                 recordList.add(expertAdminExpertManageListDTO);

hz-pm-api/src/main/java/com/hz/pm/api/expert/service/impl/ExpertInfoServiceImpl.java

@@ -38,7 +38,7 @@ import com.hz.pm.api.sys.service.IUserRoleService;
 import com.hz.pm.api.user.constant.UserAvailableEnum;
 import com.hz.pm.api.user.entity.UserInfo;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;

hz-pm-api/src/main/java/com/hz/pm/api/external/MhAuthClient.java

@@ -0,0 +1,53 @@
+package com.hz.pm.api.external;
+
+import cn.hutool.core.lang.TypeReference;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
+import com.hz.pm.api.external.model.dto.MhRetDTO;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * MhAuthClient
+ * </p>
+ *
+ * @author WendyYang
+ * @since 10:11 2023/12/28
+ */
+@Component
+public class MhAuthClient {
+
+    @Value("${mh.sso.client-id:}")
+    private String clientId;
+
+    @Value("${mh.sso.client-secret:}")
+    private String clientSecret;
+
+    @Value("${mh.api-host:}")
+    private String apiHost;
+
+    private static final TypeReference<MhRetDTO<String>> TYPE = new TypeReference<MhRetDTO<String>>() {
+    };
+
+    public MhRetDTO<String> getMhUserIdByAuthCode(String authCode) {
+        String url = apiHost + "/single/login";
+        HttpRequest request = HttpUtil.createPost(url);
+        Map<String, Object> param = new HashMap<>(8);
+        param.put("code", authCode);
+        param.put("clientId", clientId);
+        param.put("clientSecret", clientSecret);
+        param.put("grantType", "authorization_code");
+        request.body(JSONUtil.toJsonStr(param));
+        try (HttpResponse execute = request.execute()) {
+            String body = execute.body();
+            return JSONUtil.toBean(body, TYPE, false);
+        }
+    }
+
+}

hz-pm-api/src/main/java/com/hz/pm/api/filemanage/manage/DocumentationManage.java

@@ -13,7 +13,7 @@ import com.hz.pm.api.filemanage.model.vo.DocumentationGroupVO;
 import com.hz.pm.api.filemanage.model.vo.DocumentationVO;
 import com.hz.pm.api.filemanage.service.IDocumentationGroupService;
 import com.hz.pm.api.filemanage.service.IDocumentationService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/filemanage/manage/ProjectFileManage.java

@@ -56,7 +56,7 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.todocenter.constant.WorkNoticeConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.bean.entity.WflowModels;
 import com.wflow.contants.HisProInsEndActId;

hz-pm-api/src/main/java/com/hz/pm/api/gov/manage/GovProjectCollectionManage.java

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -36,16 +34,14 @@ import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
 import com.hz.pm.api.projectlib.model.entity.*;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.service.*;
-import com.hz.pm.api.provincial.manage.ProvincialManage;
 import com.hz.pm.api.safety.model.entity.PersonSafetyInfo;
 import com.hz.pm.api.safety.model.entity.SupplierSafetyQualification;
 import com.hz.pm.api.safety.service.IPersonSafetyInfoService;
 import com.hz.pm.api.safety.service.ISupplierSafetyQualificationService;
 import com.hz.pm.api.staging.model.entity.ProjectStaging;
 import com.hz.pm.api.staging.service.IProjectStagingService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
-import com.hz.pm.api.wps.manage.WpsConvertManage;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;
@@ -56,7 +52,6 @@ import com.wflow.service.WflowCcTasksService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.util.IOUtils;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.RuntimeService;
 import org.springframework.beans.factory.annotation.Value;
@@ -69,7 +64,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -113,8 +111,6 @@ public class GovProjectCollectionManage {
 
     private final RestTemplate restTemplate;
 
-    private final WpsConvertManage wpsConvertManage;
-
     private final ThreadPoolTaskScheduler threadPoolTaskScheduler;
 
     private final FileService fileService;
@@ -1723,45 +1719,7 @@ public class GovProjectCollectionManage {
     }
 
     public StringJoiner convertAndUpload(String baseProjBasisFile) {
-        String[] baseProjBasisFileArr = baseProjBasisFile.split("；");
-        StringJoiner sj = new StringJoiner("；");
-        for (String bpb : baseProjBasisFileArr) {
-            try {
-                JSONArray fileArray = JSON.parseArray(bpb);
-                fileArray.forEach(j -> {
-                    JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(j));
-                    String suffix = jsonObject.getString("suffix");
-                    //如果已经是PDF 就不用转换了
-                    byte[] btyes = null;
-                    String originalFileName = jsonObject.getString("originalFileName");
-                    if (StringUtils.isNotBlank(suffix) && suffix.equals("pdf")) {
-                        com.ningdatech.file.entity.File file = fileService.getById(jsonObject.getLong("id"));
-                        if (Objects.isNull(file)) {
-                            throw new RuntimeException("转换PDF文件失败:" + originalFileName);
-                        }
-                        InputStream inputStream = fileService.getFileInputStream(file);
-                        try {
-                            btyes = IOUtils.toByteArray(inputStream);
-                        } catch (IOException e) {
-                            throw new RuntimeException("转换PDF文件失败:" + originalFileName, e);
-                        }
-                    } else {
-                        btyes = wpsConvertManage.downloadToPdfStream(jsonObject.getLong("id"));
-                    }
-
-                    if (!BizConst.DEV.equals(active)) {
-                        originalFileName = originalFileName.replace(StrPool.DOT + suffix, ".pdf");
-                    }
-//                upload(btyes,"/temp",originalFileName);
-                    String oss = ProvincialManage.uploadToOss(btyes, originalFileName);
-                    sj.add(oss);
-                });
-            } catch (Exception e) {
-                log.error("解析文件出错!" + e);
-            }
-
-        }
-        return sj;
+        throw BizException.wrap("pdf转换无效");
     }
 
     private Boolean checkFieldNotPdf(String field, Object record, String fieldName) {

hz-pm-api/src/main/java/com/hz/pm/api/irs/manage/IrsProjectManage.java

@@ -12,7 +12,7 @@ import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/req/MeetingExpertJudgeReq.java

@@ -29,10 +29,10 @@ public class MeetingExpertJudgeReq {
     @NotNull(message = "会议专家ID不能为空", groups = Basic.class)
     private Long meetingExpertId;
 
-    @ApiModelProperty("评分（1~10）")
+    @ApiModelProperty("评分（0~5）")
     @NotNull(message = "评分不能为空", groups = Basic.class)
-    @Range(min = 1, max = 10, message = "评分范围为：1~10")
-    private Integer score;
+    @Range(min = 0, max = 5, message = "评分范围为：0~5")
+    private Double score;
 
     /**
      * @see ExpertJudgeEnum.AttendStatus

hz-pm-api/src/main/java/com/hz/pm/api/meeting/helper/MeetingDataScopeHelper.java

@@ -5,7 +5,7 @@ import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.model.entity.ViewRegionDTO;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;

hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java

@@ -41,7 +41,7 @@ import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.dto.RegionDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.model.IdVo;

hz-pm-api/src/main/java/com/hz/pm/api/meeting/service/IMeetingExpertJudgeService.java

@@ -49,7 +49,7 @@ public interface IMeetingExpertJudgeService extends IService<MeetingExpertJudge>
 
     default List<MeetingExpertJudge> listByMeetingExpertIds(Collection<Long> meetingExpertIds) {
         LambdaQueryWrapper<MeetingExpertJudge> query = Wrappers.lambdaQuery(MeetingExpertJudge.class)
-                .in(MeetingExpertJudge::getMeetingId, meetingExpertIds);
+                .in(MeetingExpertJudge::getMeetingExpertId, meetingExpertIds);
         return list(query);
     }
 

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/AppAppraisalManage.java

@@ -30,7 +30,7 @@ import com.hz.pm.api.performance.model.req.PerformanceAppraisalListReq;
 import com.hz.pm.api.performance.service.*;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.service.IRoleService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 
 import cn.hutool.core.bean.BeanUtil;

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/IndicatorConfigManage.java

@@ -32,7 +32,7 @@ import com.hz.pm.api.performance.service.IPerformanceAppraisalAppIndicatorServic
 import com.hz.pm.api.performance.service.IPerformanceAppraisalProjectIndicatorService;
 import com.hz.pm.api.performance.service.IPerformanceIndicatorProjectTemplateDetailService;
 import com.hz.pm.api.performance.service.IPerformanceIndicatorProjectTemplateService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/OrgSelfAppraisalManage.java

@@ -30,14 +30,13 @@ import com.hz.pm.api.performance.util.MultiColumnMergeStrategy;
 import com.hz.pm.api.portrait.model.entity.ProjectTag;
 import com.hz.pm.api.portrait.service.IProjectTagService;
 import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum;
 import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/PerformanceAppraisalPlanManage.java

@@ -7,13 +7,10 @@ import java.util.stream.Collectors;
 import com.hz.pm.api.performance.model.entity.*;
 import com.hz.pm.api.performance.service.*;
 import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
-import com.hz.pm.api.projectlib.helper.ProjectHelper;
 import com.hz.pm.api.projectlib.manage.ProjectLibManage;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectApplicationVO;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
-import com.wflow.workflow.bean.vo.ProcessTaskVo;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,7 +41,6 @@ import com.hz.pm.api.performance.model.vo.PerformanceAppraisalProjectVO;
 import com.hz.pm.api.performance.model.vo.PerformanceAppraisalVO;
 import com.hz.pm.api.projectlib.enumeration.InstTypeEnum;
 import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
 import com.hz.pm.api.projectlib.model.entity.ProjectInst;
@@ -52,8 +48,8 @@ import com.hz.pm.api.projectlib.service.IProjectApplicationService;
 import com.hz.pm.api.projectlib.service.IProjectInstService;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.todocenter.utils.BuildUserUtils;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.workflow.bean.process.ProgressNode;
 import com.wflow.workflow.bean.vo.ProcessProgressVo;

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/ReAppraisalManage.java

@@ -30,7 +30,7 @@ import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.service.IRoleService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/RectifyAuditManage.java

@@ -7,7 +7,6 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.text.StrPool;
 import com.google.common.collect.Lists;
-import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.performance.enumration.AppraisalTypeEnum;
 import com.hz.pm.api.performance.enumration.RectifyAuditEnum;
 import com.hz.pm.api.performance.model.dto.ProjectAppraisalInfoDTO;
@@ -15,7 +14,6 @@ import com.hz.pm.api.performance.model.entity.*;
 import com.hz.pm.api.performance.service.*;
 import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,15 +29,12 @@ import com.hz.pm.api.performance.model.dto.ProjectAppraisalDTO;
 import com.hz.pm.api.performance.model.req.PerformanceAppraisalListReq;
 import com.hz.pm.api.performance.model.vo.PerformanceAppraisalProjectVO;
 import com.hz.pm.api.performance.model.vo.PerformanceAppraisalVO;
-import com.hz.pm.api.performance.model.vo.RectifyDetailVO;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 
 import cn.hutool.core.bean.BeanUtil;

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/RectifyManage.java

@@ -23,8 +23,8 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/VerifyManage.java

@@ -32,7 +32,7 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.service.IRoleService;
 import com.hz.pm.api.user.entity.enumeration.RoleEnum;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/performance/model/vo/PerformanceAppraisalProjectGroupVO.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.performance.model.vo;
 
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

hz-pm-api/src/main/java/com/hz/pm/api/performance/model/vo/PerformanceAppraisalProjectVO.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.performance.model.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

hz-pm-api/src/main/java/com/hz/pm/api/performance/model/vo/RectifyDetailVO.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.performance.model.vo;
 
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

hz-pm-api/src/main/java/com/hz/pm/api/portrait/manage/TagManage.java

@@ -24,7 +24,7 @@ import com.hz.pm.api.portrait.service.ITagService;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.sys.model.dto.RegionDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java

@@ -32,7 +32,7 @@ import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionPlanManage.java

@@ -36,7 +36,7 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.todocenter.constant.WorkNoticeConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DeclaredProjectManage.java

@@ -44,8 +44,8 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.todocenter.constant.WorkNoticeConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.bean.entity.WflowModels;
 import com.wflow.exception.BusinessException;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DefaultDeclaredProjectManage.java

@@ -8,7 +8,6 @@ import com.ningdatech.basic.function.VUtils;
 import com.hz.pm.api.common.constant.BizConst;
 import com.hz.pm.api.common.constant.RegionConst;
 import com.hz.pm.api.common.enumeration.CommonEnum;
-import com.hz.pm.api.common.enumeration.ProjectProcessStageEnum;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.projectdeclared.model.dto.DefaultDeclaredDTO;
 import com.hz.pm.api.projectdeclared.model.dto.ProjectConditionDTO;
@@ -17,9 +16,7 @@ import com.hz.pm.api.projectdeclared.service.IDeclaredStatisticsService;
 import com.hz.pm.api.projectlib.model.dto.ProjectDTO;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
-import com.hz.pm.api.user.util.LoginUserUtil;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.wflow.bean.entity.WflowModels;
 import com.wflow.bean.entity.WflowOrgModels;
 import com.wflow.enums.OrgTypeEnum;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DelayedApplyManage.java

@@ -21,7 +21,6 @@ import com.hz.pm.api.projectdeclared.model.dto.DelayedApplyDTO;
 import com.hz.pm.api.projectdeclared.model.vo.DelayedApplyVO;
 import com.hz.pm.api.projectlib.enumeration.InstTypeEnum;
 import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum;
 import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
 import com.hz.pm.api.projectlib.helper.ProjectHelper;
 import com.hz.pm.api.projectlib.manage.ProjectLibManage;
@@ -36,7 +35,7 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.todocenter.constant.WorkNoticeConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.bean.entity.WflowModels;
 import com.wflow.contants.HisProInsEndActId;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java

@@ -27,7 +27,7 @@ import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.todocenter.constant.WorkNoticeConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;
@@ -47,7 +47,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/OperationManage.java

@@ -12,7 +12,7 @@ import com.hz.pm.api.projectdeclared.service.IOperationService;
 import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PrequalificationDeclaredProjectManage.java

@@ -19,7 +19,6 @@ import com.hz.pm.api.projectdeclared.model.dto.DefaultDeclaredDTO;
 import com.hz.pm.api.projectdeclared.model.dto.PretrialDeclaredExportDTO;
 import com.hz.pm.api.projectdeclared.model.req.PrequalificationDeclaredListReq;
 import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum;
 import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
 import com.hz.pm.api.projectlib.helper.ProjectHelper;
 import com.hz.pm.api.projectlib.manage.ProjectLibManage;
@@ -35,7 +34,7 @@ import com.hz.pm.api.staging.service.IProjectStagingService;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.todocenter.constant.TodoCenterConstant;
 import com.hz.pm.api.todocenter.constant.WorkNoticeConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.bean.entity.WflowModels;
 import com.wflow.exception.BusinessException;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectAdjustmentManage.java

@@ -23,7 +23,7 @@ import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.service.IProjectApplicationService;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java

@@ -21,14 +21,13 @@ import com.hz.pm.api.projectdeclared.model.entity.Purchase;
 import com.hz.pm.api.projectdeclared.model.vo.PurchaseVO;
 import com.hz.pm.api.projectdeclared.service.IPurchaseService;
 import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum;
 import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
 import com.hz.pm.api.projectlib.helper.ProjectHelper;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ReviewChecklistManage.java

@@ -24,8 +24,8 @@ import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectReviewCheckListItemVO;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/controller/ProjectLibController.java

@@ -11,7 +11,7 @@ import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectApplicationVO;
 import com.hz.pm.api.projectlib.model.vo.ProjectDetailVO;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.workflow.bean.vo.ProcessDetailVO;
 import io.swagger.annotations.Api;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/controller/ProjectRenewalFundDeclarationController.java

@@ -7,12 +7,11 @@ import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.common.util.ExcelDownUtil;
 import com.hz.pm.api.projectlib.manage.ProjectRenewalFundManage;
 import com.hz.pm.api.projectlib.model.dto.ProjectRenewalFundDeclarationDTO;
-import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.req.ProjectRenewalAuditReq;
 import com.hz.pm.api.projectlib.model.req.ProjectRenewalListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.model.vo.ProjectRenewalFundDeclarationVO;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/AnnualPlanLibManage.java

@@ -39,7 +39,7 @@ import com.hz.pm.api.projectlib.service.IProjectApplicationService;
 import com.hz.pm.api.projectlib.service.IProjectRenewalFundDeclarationService;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.todocenter.constant.TodoCenterConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.model.PageVo;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ApplicationManage.java

@@ -22,7 +22,7 @@ import com.hz.pm.api.projectlib.model.vo.ProjectApplicationVO;
 import com.hz.pm.api.projectlib.model.vo.ProjectDetailVO;
 import com.hz.pm.api.projectlib.service.IProjectApplicationService;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectCollectionManage.java

@@ -15,7 +15,7 @@ import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectCollectionVO;
 import com.hz.pm.api.projectlib.service.IProjectCollectionService;
 import com.hz.pm.api.sys.model.dto.RegionDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java

@@ -78,9 +78,8 @@ import com.hz.pm.api.safety.service.IPersonSafetyInfoService;
 import com.hz.pm.api.safety.service.ISupplierSafetyQualificationService;
 import com.hz.pm.api.todocenter.model.req.ProcessDetailReq;
 import com.hz.pm.api.todocenter.service.ITodoService;
-import com.hz.pm.api.user.entity.UserInfo;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.exception.BusinessException;
 import com.wflow.workflow.bean.vo.ProcessDetailVO;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectRenewalFundManage.java

@@ -48,7 +48,7 @@ import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.model.vo.ProjectRenewalFundDeclarationVO;
 import com.hz.pm.api.projectlib.service.IProjectRenewalFundDeclarationService;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.wflow.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectLibListItemVO.java

@@ -6,12 +6,9 @@ import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.portrait.model.vo.TagVO;
 import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeEnum;
 import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
-import com.hz.pm.api.projectlib.model.entity.ProjectRenewalFundDeclaration;
-import com.hz.pm.api.user.entity.UserInfo;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +17,6 @@ import lombok.Data;
 import lombok.experimental.Tolerate;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;

hz-pm-api/src/main/java/com/hz/pm/api/safety/manage/SafetyRiskManage.java

@@ -20,7 +20,7 @@ import com.hz.pm.api.safety.model.entity.SupplierSafetyQualification;
 import com.hz.pm.api.safety.model.vo.*;
 import com.hz.pm.api.safety.service.IPersonSafetyInfoService;
 import com.hz.pm.api.safety.service.ISupplierSafetyQualificationService;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/CcTaskListener.java

@@ -10,7 +10,7 @@ import com.hz.pm.api.projectlib.service.IProjectInstService;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.sys.manage.NoticeManage;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.ningdatech.cache.model.cache.CacheKey;
 import com.ningdatech.cache.repository.CachePlusOps;
 import com.wflow.bean.entity.WflowCcTasks;

hz-pm-api/src/main/java/com/hz/pm/api/sys/controller/UserGuidanceController.java

@@ -2,7 +2,7 @@ package com.hz.pm.api.sys.controller;
 
 import com.hz.pm.api.sys.manage.UserGuidanceManage;
 import com.hz.pm.api.sys.model.vo.UserGuidanceVO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

hz-pm-api/src/main/java/com/hz/pm/api/sys/manage/EarlyWarningManage.java

@@ -14,7 +14,7 @@ import com.hz.pm.api.sys.model.entity.WflowEarlyWarningRecords;
 import com.hz.pm.api.sys.service.IEarlyWarningRecordsService;
 import com.hz.pm.api.sys.service.INotifyService;
 import com.hz.pm.api.todocenter.bean.entity.WorkNoticeInfo;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.ningdatech.yxt.model.cmd.SendSmsCmd;
 import com.wflow.enums.WarningNoticeTypeEnum;
 import com.wflow.enums.WarningRuleTypeEnum;

hz-pm-api/src/main/java/com/hz/pm/api/sys/manage/NoticeManage.java

@@ -37,8 +37,8 @@ import com.hz.pm.api.sys.service.INotifyService;
 import com.hz.pm.api.todocenter.bean.entity.WorkNoticeInfo;
 import com.hz.pm.api.todocenter.model.dto.ProjectAuditMsgExtraDTO;
 import com.hz.pm.api.user.entity.UserInfo;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import lombok.RequiredArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/sys/manage/UserGuidanceManage.java

@@ -16,7 +16,7 @@ import com.hz.pm.api.sys.model.vo.UserGuidanceVO;
 import com.hz.pm.api.sys.service.IUserRoleService;
 import com.hz.pm.api.user.entity.UserAuth;
 import com.hz.pm.api.user.entity.UserInfo;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.service.IUserAuthService;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.wflow.bean.entity.WflowOrgModels;

hz-pm-api/src/main/java/com/hz/pm/api/sys/utils/EarlyWarningUtil.java

@@ -3,8 +3,8 @@ package com.hz.pm.api.sys.utils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.sys.model.entity.WflowEarlyWarningRecords;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 
 /**
  * @Classname EarlyWarningUtil

hz-pm-api/src/main/java/com/hz/pm/api/todocenter/handle/WithDrawHandle.java

@@ -7,8 +7,8 @@ import com.hz.pm.api.projectlib.enumeration.InstTypeEnum;
 import com.hz.pm.api.projectlib.model.entity.ProjectInst;
 import com.hz.pm.api.projectlib.service.IProjectInstService;
 import com.hz.pm.api.todocenter.constant.TodoCenterConstant;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.contants.HisProInsEndActId;
 import com.wflow.workflow.bean.dto.ReqProcessHandlerDTO;

hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java

@@ -56,8 +56,8 @@ import com.hz.pm.api.todocenter.service.ITodoService;
 import com.hz.pm.api.todocenter.service.StatisticsService;
 import com.hz.pm.api.todocenter.utils.BuildUserUtils;
 import com.hz.pm.api.todocenter.utils.PdfUtils;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;

hz-pm-api/src/main/java/com/hz/pm/api/todocenter/service/impl/TodoServiceImpl.java

@@ -14,8 +14,8 @@ import com.hz.pm.api.todocenter.model.req.ProcessDetailReq;
 import com.hz.pm.api.todocenter.model.vo.ProcessProgressDetailVO;
 import com.hz.pm.api.todocenter.service.ITodoService;
 import com.hz.pm.api.todocenter.utils.BuildUserUtils;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.wflow.workflow.bean.process.ProgressNode;
 import com.wflow.workflow.bean.process.enums.NodeTypeEnum;

hz-pm-api/src/main/java/com/hz/pm/api/user/convert/UserInfoConvertor.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.user.convert;
 
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 
 /**
  * <p>
@@ -17,7 +17,7 @@ public class UserInfoConvertor {
 
     }
 
-    public static UserInfoDetails toUserInfoDetails(UserFullInfoDTO userFullInfo) {
+    public static UserInfoDetails convert(UserFullInfoDTO userFullInfo) {
         UserInfoDetails userInfoDetails = new UserInfoDetails();
         userInfoDetails.setUserId(userFullInfo.getUserId());
         userInfoDetails.setUsername(userFullInfo.getUsername());
@@ -36,4 +36,6 @@ public class UserInfoConvertor {
         return userInfoDetails;
     }
 
+
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java

@@ -152,6 +152,25 @@ public class SyncMhUserOrgManage {
         }
     }
 
+    public void saveExperts(MhRetDTO<MhExpertDTO> mhRet) {
+        if (mhRet.isOk()) {
+            MhExpertDTO data = mhRet.getData();
+            if (data == null) {
+                return;
+            }
+            List<MhReviewExpertDTO> reviewExperts = data.getReviewExpertVOList();
+            if (CollUtil.isNotEmpty(reviewExperts)) {
+                saveReviewExperts(reviewExperts);
+            }
+            List<MhTechExpertDTO> techExperts = data.getTechnicalExpertVOList();
+            if (CollUtil.isNotEmpty(techExperts)) {
+                saveTechExperts(techExperts);
+            }
+        } else {
+            log.error("同步专家信息失败：{}", JSONUtil.toJsonStr(mhRet));
+        }
+    }
+
     private void saveReviewExperts(List<MhReviewExpertDTO> reviewExperts) {
         List<String> expertNos = CollUtils.fieldList(reviewExperts, MhReviewExpertDTO::getExpertNo);
         Map<String, ExpertUserFullInfo> expertMap = getExpertsMapMhExpertNo(expertNos);
@@ -199,6 +218,9 @@ public class SyncMhUserOrgManage {
             expertUserFullInfoService.saveOrUpdate(eui);
             String expertLevel = expert.getExpertLevel();
             List<ExpertDictionary> dicts = new ArrayList<>();
+            Optional<DictionaryDTO> typeDict = dictionaryCache.getByCode("300000");
+            typeDict.ifPresent(dict -> dicts.add(getExpertDictionary(eui.getUserId(), dict)));
+
             Optional<DictionaryDTO> levelDict = dictionaryCache.getByDictTypeAndName(EXPERT_LEVEL.getKey(), expertLevel);
             levelDict.ifPresent(dict -> dicts.add(getExpertDictionary(eui.getUserId(), dict)));
 
@@ -274,6 +296,8 @@ public class SyncMhUserOrgManage {
             }
             expertUserFullInfoService.saveOrUpdate(eui);
             List<ExpertDictionary> dicts = new ArrayList<>();
+            Optional<DictionaryDTO> typeDict = dictionaryCache.getByCode("300001");
+            typeDict.ifPresent(dict -> dicts.add(getExpertDictionary(eui.getUserId(), dict)));
             // 专家级别
             String expertLevel = expert.getExpertLevel();
             Optional<DictionaryDTO> levelDict = dictionaryCache.getByDictTypeAndName(EXPERT_LEVEL.getKey(), expertLevel);

hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserAuthManage.java

@@ -3,8 +3,8 @@ package com.hz.pm.api.user.manage;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.user.convert.UserInfoConvertor;
 import com.hz.pm.api.user.security.auth.credential.CredentialAuthToken;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.session.Session;
@@ -41,7 +41,7 @@ public class UserAuthManage {
             return;
         }
         SessionRepository sessionRepository = redisSessionRepository;
-        UserInfoDetails details = UserInfoConvertor.toUserInfoDetails(userFullInfo);
+        UserInfoDetails details = UserInfoConvertor.convert(userFullInfo);
         CredentialAuthToken cat = new CredentialAuthToken(details, details.getPassword(), details.getAuthorities());
         sessionIds.forEach(sessionId -> {
             Session session = redisSessionRepository.findById(sessionId);

hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java

@@ -31,7 +31,7 @@ import com.hz.pm.api.user.model.po.ReqUserInfoListPO;
 import com.hz.pm.api.user.model.vo.ResUserDetailVO;
 import com.hz.pm.api.user.model.vo.ResUserInfoListVO;
 import com.hz.pm.api.user.model.vo.UserRoleVO;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.zwdd.ZwddIntegrationProperties;

hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/agent/AgentAuthFilter.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.user.security.auth.agent;
 
-import com.hz.pm.api.user.security.auth.model.WebRequestDetails;
+import com.hz.pm.api.user.security.model.WebRequestDetails;
 import com.ningdatech.basic.exception.BizException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpMethod;
@@ -16,17 +16,17 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @Author LiuXinXin
- * @Date 2020/8/3 8:46 下午
- * @Version 1.0
- **/
+ * <p>
+ * AgentAuthFilter
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:25 2023/12/28
+ */
 public class AgentAuthFilter extends AbstractAuthenticationProcessingFilter {
 
-    private boolean postOnly = true;
-
     private static final String USER_ID_PARAMETER = "userId";
 
-    // ~ Constructors
     // ===================================================================================================
 
     public AgentAuthFilter(String processingUrl) {
@@ -38,7 +38,7 @@ public class AgentAuthFilter extends AbstractAuthenticationProcessingFilter {
     @Override
     public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
             throws AuthenticationException {
-        if (postOnly && !request.getMethod().equals(HttpMethod.POST.name())) {
+        if (request.getMethod().equals(HttpMethod.POST.name())) {
             throw new AuthenticationServiceException("请求方法错误");
         }
         String userId = request.getParameter(USER_ID_PARAMETER);

hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/agent/AgentAuthSecurityConfig.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.user.security.auth.agent;
 
-import com.hz.pm.api.user.security.auth.AuthProperties;
+import com.hz.pm.api.user.security.config.AuthProperties;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;

hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/agent/AgentLoginUserDetailService.java

@@ -3,9 +3,10 @@ package com.hz.pm.api.user.security.auth.agent;
 
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.user.constant.UserAvailableEnum;
-import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO;
-import com.hz.pm.api.user.security.auth.model.UserInfoDetails;
-import com.hz.pm.api.user.security.auth.validate.CommonLoginException;
+import com.hz.pm.api.user.convert.UserInfoConvertor;
+import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
+import com.hz.pm.api.user.security.validate.CommonLoginException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -26,32 +27,15 @@ public class AgentLoginUserDetailService implements UserDetailsService {
 
     @Override
     public UserInfoDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-
-        final Long userId = Long.parseLong(username);
-
-        UserFullInfoDTO userFullInfoDTO = userInfoHelper.getUserFullInfo(userId);
-
-        if (Objects.isNull(userFullInfoDTO)) {
-            throw new UsernameNotFoundException(String.format("%s user not exist", username));
+        Long userId = Long.parseLong(username);
+        UserFullInfoDTO ufi = userInfoHelper.getUserFullInfo(userId);
+        if (Objects.isNull(ufi)) {
+            throw new UsernameNotFoundException("用户不存在");
         }
-        if (UserAvailableEnum.DISABLE.equals(userFullInfoDTO.getAvailable())) {
-            throw new CommonLoginException("该账号已被禁用");
+        if (UserAvailableEnum.DISABLE.equals(ufi.getAvailable())) {
+            throw new CommonLoginException("账号已禁用");
         }
-
-        UserInfoDetails userInfoDetails = new UserInfoDetails();
-        userInfoDetails.setUserId(userFullInfoDTO.getUserId());
-        userInfoDetails.setUsername(userFullInfoDTO.getUsername());
-        userInfoDetails.setRealName(userFullInfoDTO.getRealName());
-        userInfoDetails.setUserRoleList(userFullInfoDTO.getUserRoleList());
-        userInfoDetails.setRegionCode(userFullInfoDTO.getRegionCode());
-        userInfoDetails.setRegionLevel(userFullInfoDTO.getRegionLevel());
-        userInfoDetails.setIdentifier(userFullInfoDTO.getIdentifier());
-        userInfoDetails.setPassword(userFullInfoDTO.getCredential());
-        userInfoDetails.setEmployeeCode(userFullInfoDTO.getEmployeeCode());
-        userInfoDetails.setOrganizationCode(userFullInfoDTO.getOrganizationCode());
-        userInfoDetails.setOrganizationName(userFullInfoDTO.getOrganizationName());
-        userInfoDetails.setEmpPosUnitCode(userFullInfoDTO.getEmpPosUnitCode());
-        userInfoDetails.setEmpPosUnitName(userFullInfoDTO.getOrganizationName());
-        return userInfoDetails;
+        return UserInfoConvertor.convert(ufi);
     }
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/user/security/auth/common/CommonAuthFilter.java

@@ -1,77 +0,0 @@
-package com.hz.pm.api.user.security.auth.common;
-
-import com.ningdatech.basic.exception.BizException;
-import com.hz.pm.api.user.security.auth.model.WebRequestDetails;
-import com.hz.pm.api.user.security.auth.validate.CommonLoginException;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationServiceException;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.InternalAuthenticationServiceException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Author LiuXinXin
- * @Date 2020/8/3 8:46 下午
- * @Version 1.0
- **/
-public class CommonAuthFilter extends AbstractAuthenticationProcessingFilter {
-
-    private boolean postOnly = true;
-
-    private static final String CREDENTIAL_PARAMETER = "credential";
-    private static final String PLATFORM_PARAMETER = "platform";
-
-    // ~ Constructors
-    // ===================================================================================================
-
-    public CommonAuthFilter(String processingUrl) {
-        super(new AntPathRequestMatcher(processingUrl, HttpMethod.POST.name()));
-    }
-
-    // ~ Methods
-    // ========================================================================================================
-
-    @Override
-    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
-            throws AuthenticationException {
-        if (postOnly && !request.getMethod().equals(HttpMethod.POST.name())) {
-            throw new AuthenticationServiceException("请求方法错误");
-        }
-        String credential = request.getParameter(CREDENTIAL_PARAMETER);
-        String platform = request.getParameter(PLATFORM_PARAMETER);
-        if (StringUtils.isBlank(credential)) {
-            throw new CommonLoginException("凭证 不能为空");
-        }
-        if (StringUtils.isBlank(platform)) {
-            throw new CommonLoginException("平台 不能为空");
-        }
-
-        platform = trim(platform);
-        credential = trim(credential);
-        try {
-            CommonAuthToken authRequest = new CommonAuthToken(platform, credential);
-            authRequest.setDetails(new WebRequestDetails(request));
-            return this.getAuthenticationManager().authenticate(authRequest);
-        } catch (AuthenticationException e) {
-            throw new BadCredentialsException("用户状态");
-        } catch (BizException e) {
-            throw new BadCredentialsException(e.getMessage());
-        } catch (Exception e) {
-            throw new InternalAuthenticationServiceException("授权失败：", e);
-        }
-    }
-
-    private String trim(String trimStr) {
-        if (StringUtils.isNotBlank(trimStr)) {
-            return trimStr.trim();
-        }
-        return null;
-    }
-}