Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	hz-pm-api/src/main/resources/application-dev.yml

hz-pm-api/.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

hz-pm-api/.idea/checkstyle-idea.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.5.0</checkstyleVersion>
-    <scanScope>JavaOnly</scanScope>
-    <copyLibs>true</copyLibs>
-    <option name="locations">
-      <list>
-        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
-        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
-      </list>
-    </option>
-  </component>
-</project>

hz-pm-api/.idea/compiler.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="pmapi" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>

hz-pm-api/.idea/eclipseCodeFormatter.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EclipseCodeFormatterProjectSettings">
-    <option name="projectSpecificProfile">
-      <ProjectSpecificProfile>
-        <option name="formatter" value="ECLIPSE" />
-        <option name="pathToConfigFileJava" value="D:/soft/formatter/eclipse-codestyle.xml" />
-        <option name="selectedJavaProfile" value="P3C-CodeStyle" />
-      </ProjectSpecificProfile>
-    </option>
-  </component>
-</project>

hz-pm-api/.idea/encodings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/lib" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

hz-pm-api/.idea/inspectionProfiles/Project_Default.xml

@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <Languages>
-        <language minSize="189" name="Java" />
-      </Languages>
-    </inspection_tool>
-  </profile>
-</component>

hz-pm-api/.idea/jarRepositories.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="aliyun" />
-      <option name="name" value="aliyun" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-  </component>
-</project>

hz-pm-api/.idea/misc.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>

hz-pm-api/.idea/sonarlint/issuestore/0/0/002597a7f172f343a6cffcd273be74aa895d74b3

@@ -1,3 +0,0 @@
-
-U
-java:S1118":Add a private constructor to hide the implicit public one.(áÛ«îýÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/0/2/02999ca52b20720a6dba73a2ea57a018dba90084

@@ -1,3 +0,0 @@
-
-U
-java:S1118":Add a private constructor to hide the implicit public one.(±ÎÞèýÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5

@@ -1,95 +0,0 @@
-
-o
-java:S1192„"SDefine a constant instead of duplicating this literal "Unexpected value: " 3 times.(¡þé£üÿÿÿÿ

-n
-java:S1192Ä"WDefine a constant instead of duplicating this literal "状æ€�机执行失败!" 3 times.(¨¾¦ø
-e
-java:S1192—"IDefine a constant instead of duplicating this literal "approve_" 5 times.(¢¡öñüÿÿÿÿ

-t	java:S135È"YReduce the total number of break and continue statements in this loop to use at most one.(ÃŽÍÎþÿÿÿÿ

-A
-java:S5411Å"*Use the primitive boolean expression here.(•„¹¾
-Z
-java:S2583Å"CChange this condition so that it does not always evaluate to "true"(•„¹¾
-W	java:S125ƒ
"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125ª
"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125Ù
"<This block of commented-out lines of code should be removed.(­“¸»ûÿÿÿÿ

-R	java:S125Û
"<This block of commented-out lines of code should be removed.(�³Ÿˆ
-Q
-java:S6213–":Rename this variable to not match a restricted identifier.(˜Š¡©

-b
-java:S3252œ"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-N
-java:S1135¢"2Complete the task associated to this TODO comment.(©†î¿ÿÿÿÿÿ

-[
-java:S1854ë"?Remove this useless assignment to local variable "projectName".(Ϥõ…ûÿÿÿÿ

-\
-java:S1854ç"ERemove this useless assignment to local variable "processInstanceId".(ËŽÿð
-M
-java:S1481ç"6Remove this unused "processInstanceId" local variable.(ËŽÿð
-L
-java:S1481ë"0Remove this unused "projectName" local variable.(Ϥõ…ûÿÿÿÿ

-Q
-java:S6213í":Rename this variable to not match a restricted identifier.(˜Š¡©

-b
-java:S3252ó"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-N
-java:S1135õ"2Complete the task associated to this TODO comment.(Ü™´æúÿÿÿÿ

-N
-java:S1135÷"2Complete the task associated to this TODO comment.(üʸßüÿÿÿÿ

-Q
-java:S6213‰":Rename this variable to not match a restricted identifier.(˜Š¡©

-b
-java:S3252�"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-N
-java:S1135©"2Complete the task associated to this TODO comment.(Ä‹µëûÿÿÿÿ

-N
-java:S1135Ò"2Complete the task associated to this TODO comment.(‘¢Èýÿÿÿÿ

-I
-java:S1135¬"2Complete the task associated to this TODO comment.(•Øþ�
-I
-java:S1135Ï"2Complete the task associated to this TODO comment.(•Øþ�
-k
-java:S3252ç"OUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isNotBlank".(¥‚°€ýÿÿÿÿ

-[
-java:S1854€"?Remove this useless assignment to local variable "projectName".(Ϥõ…ûÿÿÿÿ

-]
-java:S1854¸"ARemove this useless assignment to local variable "currentUserId".(þÅøÜùÿÿÿÿ

-\
-java:S1854¶"@Remove this useless assignment to local variable "beforeUserId".(©ï¿‹ýÿÿÿÿ

-L
-java:S1481€"0Remove this unused "projectName" local variable.(Ϥõ…ûÿÿÿÿ

-I
-java:S1135Œ"2Complete the task associated to this TODO comment.(¥ÿ¬¾
-M
-java:S1481¶"1Remove this unused "beforeUserId" local variable.(©ï¿‹ýÿÿÿÿ

-N
-java:S1481¸"2Remove this unused "currentUserId" local variable.(þÅøÜùÿÿÿÿ

-W	java:S125¹"<This block of commented-out lines of code should be removed.(ï–õ‡þÿÿÿÿ

-I
-java:S1135Ã"2Complete the task associated to this TODO comment.(®–˜ˆ
-b
-java:S3252�"FUse static access with "com.alibaba.fastjson.JSON" for "toJSONString".(ÖÔÿ‹øÿÿÿÿ

-I
-java:S1135¢"2Complete the task associated to this TODO comment.(æ·â®

-W	java:S125Ð"<This block of commented-out lines of code should be removed.(åÔÙÍýÿÿÿÿ

-N
-java:S1135Ù"2Complete the task associated to this TODO comment.(«­¾Òýÿÿÿÿ

-W	java:S125õ"<This block of commented-out lines of code should be removed.(˜€ÔÑýÿÿÿÿ

-I
-java:S2201‘"+The return value of "collect" must be used.(Ú¿±ì8œß²úæ0
-?
-java:S3864‘"!Remove this use of "Stream.peek".(Ú¿±ì8�ß²úæ0
-\
-java:S3252µ"EUse static access with "com.alibaba.fastjson.JSON" for "parseObject".(ÿ�€Ú
-N
-java:S2201Ù"+The return value of "collect" must be used.(ÔûÙøúÿÿÿÿ
8²ß²úæ0
-D
-java:S3864Ù"!Remove this use of "Stream.peek".(ÔûÙøúÿÿÿÿ
8³ß²úæ0
-M
-java:S1172Þ"1Remove this unused method parameter "instanceId".(™ÃÉþÿÿÿÿ

-W	java:S125ì"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125”"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-R	java:S125É"<This block of commented-out lines of code should be removed.(ÝÎÞÁ
-W	java:S125ð"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

-W	java:S125£	"<This block of commented-out lines of code should be removed.(­“¸»ûÿÿÿÿ

-W	java:S125Ë	"<This block of commented-out lines of code should be removed.(³ŽàÜøÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/8/c/8c928fdb02a7d0f06b9a34c0b545a00ddf44aab7

@@ -1,3 +0,0 @@
-
-\
-java:S1128"ARemove this unused import 'javax.validation.constraints.NotNull'.(áç¥ãüÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/9/2/92bb80058f98a2589a95655e976c4c3b31905e3f

@@ -1,5 +0,0 @@
-
-B
-java:S1602s",Remove useless curly braces around statement(Ƙ¸ƒ
-O
-java:S1128"-Remove this unused import 'java.util.Arrays'.(î–˜Éüÿÿÿÿ
8¼�¨ùæ0

hz-pm-api/.idea/sonarlint/issuestore/a/9/a90097c62f2d5eef81300bceaa14afa9559ec829

@@ -1,5 +0,0 @@
-
-f
-java:S1128"IRemove this unused import 'com.wflow.workflow.bean.vo.ProcessInstanceVo'.(†å˜¯
8¬ûøæ0
-b
-java:S1128"ERemove this unused import 'com.wflow.workflow.bean.vo.ProcessTaskVo'.(�ÑÇù8¬ûøæ0

hz-pm-api/.idea/sonarlint/issuestore/d/3/d39b8ec842398247637f12ea4caf897c9a0a8463

@@ -1,15 +0,0 @@
-
-\
-java:S1118(":Add a private constructor to hide the implicit public one.(¬º‹×ûÿÿÿÿ
8Ý´ûãæ0
-h
-java:S3776R"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(§°¯î
-^
-java:S3252\"HUse static access with "com.alibaba.excel.EasyExcelFactory" for "write".( òŸ€
-c
-java:S3252^"HUse static access with "com.alibaba.excel.EasyExcelFactory" for "write".(µû•Ðÿÿÿÿÿ

-d
-java:S3252n"NUse static access with "com.alibaba.excel.EasyExcelFactory" for "writerSheet".(ìç±Ú

-”

-java:S1130…
"}Remove the declaration of thrown exception 'java.io.UnsupportedEncodingException', as it cannot be thrown from method's body.(±®ðÚ
-]
-java:S6213”
":Rename this variable to not match a restricted identifier.(ÿ‚Î×þÿÿÿÿ
8�õøãæ0

hz-pm-api/.idea/sonarlint/issuestore/d/7/d7146276b7a0a780dc7631a29b70c58f9c37fac3

@@ -1,72 +0,0 @@
-
-\	java:S112•
"FDefine and throw a dedicated exception instead of using a generic one.( ÐÇï
-a	java:S112§
"FDefine and throw a dedicated exception instead of using a generic one.(ˆòóµùÿÿÿÿ

-a	java:S112Æ"FDefine and throw a dedicated exception instead of using a generic one.(ËÿÜÎÿÿÿÿÿ

-a
-java:S1192c"KDefine a constant instead of duplicating this literal "HmacSHA256" 4 times.(öüõî
-a
-java:S1192n"FDefine a constant instead of duplicating this literal "UTF-8" 5 times.(»”ýªüÿÿÿÿ

-k	java:S117?"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(³×ߢúÿÿÿÿ

-K
-java:S1191"5Use classes from the Java API instead of Sun classes.(—øÛÖ
-]
-java:S2259ý
"AA "NullPointerException" could be thrown; "fin" is nullable here.(µö¹šúÿÿÿÿ

-m
-java:S2095ê
"QUse try-with-resources or close this "BufferedInputStream" in a "finally" clause.(ˆ£Þðþÿÿÿÿ

-j
-java:S2095ž"NUse try-with-resources or close this "FileOutputStream" in a "finally" clause.(ÖŽ“¯úÿÿÿÿ

-n
-java:S2095Ÿ"RUse try-with-resources or close this "BufferedOutputStream" in a "finally" clause.(㨿®þÿÿÿÿ

-j
-java:S3008("TRename this field "ProjectID" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Šõö·
-n
-java:S3008)"XRename this field "ProjectSecret" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ôØÚ¬
-Q	java:S125""<This block of commented-out lines of code should be removed.(¹ä¶¢
-‡

-java:S1130/"lRemove the declaration of thrown exception 'java.lang.Exception', as it cannot be thrown from method's body.(ÙؤÞýÿÿÿÿ

-\
-java:S1075@"ARefactor your code to get this URI from a customizable parameter.(«é¥™øÿÿÿÿ

-Q	java:S125H"<This block of commented-out lines of code should be removed.(ÅøúÈ
-P	java:S125h"<This block of commented-out lines of code should be removed.(…‘ïs
-N	java:S106m"9Replace this use of System.out or System.err by a logger.(àÙø¼
-T
-java:S4719n"9Replace charset name argument with StandardCharsets.UTF_8(»”ýªüÿÿÿÿ

-Q	java:S125q"<This block of commented-out lines of code should be removed.(իз
-O	java:S106‡
"9Replace this use of System.out or System.err by a logger.(…¢üÔ
-O	java:S106‰
"9Replace this use of System.out or System.err by a logger.(…¢üÔ
-P
-java:S4719�
"9Replace charset name argument with StandardCharsets.UTF_8(ÄÌ ¯
-O	java:S106�
"9Replace this use of System.out or System.err by a logger.(µ³õ’

-P
-java:S4719š
"9Replace charset name argument with StandardCharsets.UTF_8(Å¡Ö°
-U
-java:S4719¬
"9Replace charset name argument with StandardCharsets.UTF_8(÷�‚ßþÿÿÿÿ

-A
-java:S1197º
"*Move the array designators [] to the type.(ˆö�ì
-i	java:S100â
"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(åñÜ­ýÿÿÿÿ

-H
-java:S1481ã
",Remove this unused "encoder" local variable.(Ã�‰˜üÿÿÿÿ

-W	java:S125÷
"<This block of commented-out lines of code should be removed.(óºõŒýÿÿÿÿ

-F
-java:S2093è
"*Change this "try" to a try-with-resources.(¡»¢üùÿÿÿÿ

-R	java:S125«"<This block of commented-out lines of code should be removed.(›�ÎŒ
-F
-java:S2093•"*Change this "try" to a try-with-resources.(¡»¢üùÿÿÿÿ

-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-_
-java:S5361Ã"HReplace this call to "replaceAll()" by a call to the "replace()" method.(ç†ö»
-F
-java:S1144§
"*Remove this unused private "sign1" method.(ˆòóµùÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/e/c/ecd8157d3ccb289d327361f90fcef4d14eddb335

@@ -1,5 +0,0 @@
-
-t
-java:S1488u"^Immediately return this expression instead of assigning it to the temporary variable "result".(뙩Ý
-z
-java:S1488�
"^Immediately return this expression instead of assigning it to the temporary variable "result".(©¶üÈúÿÿÿÿ

hz-pm-api/.idea/sonarlint/issuestore/f/1/f1ece2c596126c2753f07e9c33ac1dee153eca7c

@@ -1,3 +0,0 @@
-
-X
-java:S1214"CMove constants defined in this interfaces to another class or enum.(Ôô•

hz-pm-api/.idea/sonarlint/issuestore/index.pb

@@ -1,31 +0,0 @@
-
-{
-Ksrc/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java,4\d\4d181ee0ef35161a71fa355047c13e9ab5aa4793
-…

-Usrc/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ReqProcessHandlerDTO.java,3\a\3a29a241dcf97a75f4de88a48dacd988a7193f67
-€

-Psrc/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java,0\3\032c44040c9d507864de35d7170661addf623095
-v
-Fsrc/main/java/com/ningdatech/pmapi/common/constant/CommonConstant.java,0\2\02999ca52b20720a6dba73a2ea57a018dba90084
-q
-Asrc/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java,d\3\d39b8ec842398247637f12ea4caf897c9a0a8463
-v
-Fsrc/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java,f\1\f1ece2c596126c2753f07e9c33ac1dee153eca7c
-}
-Msrc/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java,b\7\b7eec6c95fd743ceb0853f62f1870e78ac47fa1d
-u
-Esrc/main/java/com/ningdatech/pmapi/user/service/IUserInfoService.java,e\4\e427e2fbf9cff46a15e651e8759e4487828aaa90
-w
-Gsrc/main/java/com/ningdatech/pmapi/projectlib/helper/ProjectHelper.java,0\0\002597a7f172f343a6cffcd273be74aa895d74b3
-z
-Jsrc/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java,9\2\92bb80058f98a2589a95655e976c4c3b31905e3f
-‚

-Rsrc/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java,e\c\ecd8157d3ccb289d327361f90fcef4d14eddb335
-�

-Qsrc/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ToBeProcessedReq.java,8\c\8c928fdb02a7d0f06b9a34c0b545a00ddf44aab7
-z
-Jsrc/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java,7\a\7a4df0ff8172ed96c29e54029f6ecac024700aa5
-‚

-Rsrc/main/java/com/ningdatech/pmapi/todocenter/model/dto/vo/ResToBeProcessedVO.java,a\9\a90097c62f2d5eef81300bceaa14afa9559ec829
-n
->src/main/java/com/ningdatech/pmapi/irs/sign/IRSAPIRequest.java,d\7\d7146276b7a0a780dc7631a29b70c58f9c37fac3

hz-pm-api/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

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/handler/BaseFieldFillHandler.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 
-import static com.hz.pm.api.common.constant.BaseFieldConst.*;
+import static com.hz.pm.api.common.model.constant.BaseFieldConst.*;
 
 /**
  * <p>

hz-pm-api/src/main/java/com/hz/pm/api/common/handler/GlobalResponseHandler.java

@@ -11,10 +11,13 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 /**
- * @Author liuxinxin
- * @Date 2021/7/21 11:26
- * @Version 1.0
- **/
+ * <p>
+ * GlobalResponseHandler
+ * </p>
+ *
+ * @author WendyYang
+ * @since 10:29 2023/12/29
+ */
 @RestControllerAdvice(basePackages = {
         "com.hz.pm.api.fiscal.controller",
         "com.hz.pm.api.organization.controller",
@@ -37,6 +40,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
         "com.hz.pm.api.gov.controller",
         "com.hz.pm.api.dashboard.controller",
         "com.hz.pm.api.wps.controller",
+        "com.hz.pm.api.external.controller",
         "com.hz.pm.api.gov.controller"
 })
 public class GlobalResponseHandler implements ResponseBodyAdvice<Object> {
@@ -52,16 +56,7 @@ public class GlobalResponseHandler implements ResponseBodyAdvice<Object> {
     public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType,
                                   Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest,
                                   ServerHttpResponse serverHttpResponse) {
-        ApiResponse<Object> apiResponse = ApiResponse.ofSuccess(o);
-        // 处理字符串时，遇到了类型转换的问题，debug一步一步跟踪，原来是对于字符串的ContentType是“text-plain”，
-        // ConverterType是StringHttpMessageConverter这个类型转换，
-        // 由于将结果封装成了自定义的ApiResponse类型，所以有ApiResponse转换成String报错
-        // 所以需要对String类型的返回值单独进行处理
-//        if (o instanceof String) {
-//            return JSONUtil.toJsonStr(apiResponse);
-//        }
         return ApiResponse.ofSuccess(o);
-//        return o;
     }
 
     private Boolean filter(MethodParameter methodParameter) {

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/basic/AbstractRegionLimitHelper.java

@@ -2,15 +2,11 @@ package com.hz.pm.api.common.helper.basic;
 
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.RegionLimitHelper;
-import com.hz.pm.api.expert.entity.ExpertUserFullInfo;
 import com.hz.pm.api.expert.service.IExpertUserFullInfoService;
-import com.hz.pm.api.meta.model.ExpertRegionInfo;
 import com.hz.pm.api.sys.service.IRegionService;
 import com.hz.pm.api.user.service.IUserInfoService;
 import lombok.AllArgsConstructor;
 
-import java.util.Objects;
-
 /**
  * <p>
  * AbstractRegionLimitHelper
@@ -27,22 +23,4 @@ public abstract class AbstractRegionLimitHelper implements RegionLimitHelper {
     protected final IUserInfoService iUserInfoService;
     protected final IRegionService regionService;
 
-
-    /**
-     * 根据 专家用户id 获取专家层级
-     *
-     * @param expertUserId /
-     * @return /
-     */
-    protected ExpertRegionInfo getExpertRegionInfo(Long expertUserId) {
-        ExpertUserFullInfo userFullInfo = expertUserFullInfoService.getByUserId(expertUserId);
-        if (Objects.isNull(userFullInfo)) {
-            return new ExpertRegionInfo();
-        }
-        ExpertRegionInfo regionInfo = new ExpertRegionInfo();
-        regionInfo.setRegionCode(userFullInfo.getRegionCode());
-        regionInfo.setRegionLevel(userFullInfo.getRegionLevel());
-        return regionInfo;
-    }
-
 }

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

@@ -5,7 +5,7 @@ import cn.hutool.core.text.StrPool;
 import com.hz.pm.api.sys.service.IRegionService;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.util.CollUtils;
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.common.helper.basic.AbstractRegionCacheHelper;
 import com.hz.pm.api.common.model.RegionMapKey;

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

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hz.pm.api.common.constant.BizConst;
+import com.hz.pm.api.common.model.constant.BizConst;
 import com.hz.pm.api.common.helper.UserInfoHelper;
 import com.hz.pm.api.organization.model.entity.DingEmployeeInfo;
 import com.hz.pm.api.organization.model.entity.DingOrganization;
@@ -15,10 +15,10 @@ import com.hz.pm.api.sys.mapper.RoleMapper;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.sys.model.entity.UserRole;
 import com.hz.pm.api.sys.service.IUserRoleService;
-import com.hz.pm.api.user.constant.UserAvailableEnum;
+import com.hz.pm.api.user.model.enumeration.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.model.enumeration.RoleEnum;
+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/common/constant/BaseFieldConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * <p>

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BizConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 import com.ningdatech.basic.model.ApiResponse;
 

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BooleanBit.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * <p>

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/CommonConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/CommonConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * @description: 常量

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DefValConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DefValConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 
 import com.ningdatech.basic.util.StrPool;

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DingConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DingConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * 浙政钉常量

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/ProjectDeclareConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ProjectDeclareConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 import java.math.BigDecimal;
 

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/RegionConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 import com.google.common.collect.Lists;
 

hz-pm-api/src/main/java/com/hz/pm/api/common/constant/StateMachineConst.java → hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/StateMachineConst.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.constant;
+package com.hz.pm.api.common.model.constant;
 
 /**
  * @author CMM

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareChoiceAction.java

@@ -1,12 +1,12 @@
 package com.hz.pm.api.common.statemachine.action;
 
 import cn.hutool.core.collection.CollUtil;
-import com.hz.pm.api.common.constant.ProjectDeclareConst;
-import com.hz.pm.api.common.constant.StateMachineConst;
+import com.hz.pm.api.common.model.constant.ProjectDeclareConst;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
 import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.common.statemachine.util.StateMachineUtils;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +15,7 @@ import org.springframework.statemachine.action.Action;
 
 import java.util.List;
 
-import static com.hz.pm.api.common.constant.StateMachineConst.APPLICATION_DECLARE;
+import static com.hz.pm.api.common.model.constant.StateMachineConst.APPLICATION_DECLARE;
 
 /**
  * 项目申报状态机选择分支action类

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJNAction.java

@@ -1,10 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.builder.ProjectDeclareStateMachineBuilder;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJYAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareKFBAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLDAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLQAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQTAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQYAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSBJAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSCAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSYAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareYHAction.java

@@ -1,9 +1,9 @@
 package com.hz.pm.api.common.statemachine.action;
 
-import com.hz.pm.api.common.constant.StateMachineConst;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.statemachine.StateMachine;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java

@@ -1,10 +1,10 @@
 package com.hz.pm.api.common.statemachine.builder;
 
 import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
 import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contants/RegionContant.java → hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java

@@ -1,4 +1,4 @@
-package com.hz.pm.api.common.statemachine.contants;
+package com.hz.pm.api.common.statemachine.contant;
 
 /**
  * @Classname RegionContant

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/ProjectStatusChangeEvent.java

@@ -1,6 +1,6 @@
 package com.hz.pm.api.common.statemachine.event;
 
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/factory/ProjectDeclareGuardFactory.java

@@ -1,12 +1,12 @@
 package com.hz.pm.api.common.statemachine.factory;
 
 import cn.hutool.core.collection.CollUtil;
-import com.hz.pm.api.common.constant.ProjectDeclareConst;
-import com.hz.pm.api.common.constant.StateMachineConst;
+import com.hz.pm.api.common.model.constant.ProjectDeclareConst;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
 import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.common.statemachine.util.StateMachineUtils;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
 import org.springframework.statemachine.StateContext;
@@ -14,7 +14,7 @@ import org.springframework.statemachine.guard.Guard;
 
 import java.util.List;
 
-import static com.hz.pm.api.common.constant.StateMachineConst.APPLICATION_DECLARE;
+import static com.hz.pm.api.common.model.constant.StateMachineConst.APPLICATION_DECLARE;
 
 /**
  * 项目申报状态机guard集合类

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/MachineBuilderFounder.java

@@ -2,7 +2,7 @@ package com.hz.pm.api.common.statemachine.util;
 
 import com.google.common.collect.Maps;
 import com.hz.pm.api.common.statemachine.builder.*;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
+import com.hz.pm.api.common.statemachine.contant.RegionContant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/StateMachineUtils.java

@@ -2,14 +2,11 @@ package com.hz.pm.api.common.statemachine.util;
 
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;
-import com.hz.pm.api.common.constant.ProjectDeclareConst;
-import com.hz.pm.api.common.constant.RegionConst;
-import com.hz.pm.api.common.constant.StateMachineConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.StateMachineConst;
 import com.hz.pm.api.common.statemachine.builder.ProjectDeclareStateMachineBuilder;
-import com.hz.pm.api.common.statemachine.contants.RegionContant;
 import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent;
-import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.entity.ProjectStatusChange;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.service.INdProjectStatusChangeService;
@@ -23,7 +20,6 @@ import org.springframework.statemachine.StateMachine;
 import org.springframework.statemachine.persist.StateMachinePersister;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Objects;

hz-pm-api/src/main/java/com/hz/pm/api/common/util/BizUtils.java

@@ -3,7 +3,7 @@ package com.hz.pm.api.common.util;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectTypeNewEnum;
 import com.ningdatech.basic.util.StrPool;
 import com.ningdatech.file.entity.vo.result.FileResultVO;
 import org.apache.commons.lang3.StringUtils;

hz-pm-api/src/main/java/com/hz/pm/api/common/util/DictUtils.java

@@ -1,7 +1,7 @@
 package com.hz.pm.api.common.util;
 
 import cn.hutool.core.collection.CollUtil;
-import com.hz.pm.api.expert.model.DictionaryFieldInfo;
+import com.hz.pm.api.expert.model.DictFieldInfoDTO;
 
 import java.util.Comparator;
 import java.util.List;
@@ -15,7 +15,7 @@ public class DictUtils {
     private DictUtils() {
     }
 
-    public static Boolean isValueEquals(List<DictionaryFieldInfo> list1, List<DictionaryFieldInfo> list2) {
+    public static Boolean isValueEquals(List<DictFieldInfoDTO> list1, List<DictFieldInfoDTO> list2) {
         if (CollUtil.isEmpty(list1) && CollUtil.isEmpty(list2)) {
             return true;
         }
@@ -27,8 +27,8 @@ public class DictUtils {
         if (list1.size() != list2.size()) {
             return false;
         }
-        list1.sort(Comparator.comparing(DictionaryFieldInfo::getDictionaryFieldName).thenComparing(DictionaryFieldInfo::getDictionaryCode));
-        list2.sort(Comparator.comparing(DictionaryFieldInfo::getDictionaryFieldName).thenComparing(DictionaryFieldInfo::getDictionaryCode));
+        list1.sort(Comparator.comparing(DictFieldInfoDTO::getDictionaryFieldName).thenComparing(DictFieldInfoDTO::getDictionaryCode));
+        list2.sort(Comparator.comparing(DictFieldInfoDTO::getDictionaryFieldName).thenComparing(DictFieldInfoDTO::getDictionaryCode));
 
         for (int i = 0; i < list1.size(); i++) {
             if (!StrUtils.trimEquals(list1.get(i).getDictionaryFieldName(), list2.get(i).getDictionaryFieldName())

hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExcelDownUtil.java

@@ -13,7 +13,7 @@ import com.ningdatech.basic.model.ApiResponse;
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.basic.util.StrPool;
-import com.hz.pm.api.common.constant.CommonConst;
+import com.hz.pm.api.common.model.constant.CommonConst;
 import com.hz.pm.api.common.enumeration.ExportOptionEnum;
 import com.hz.pm.api.common.model.entity.ExcelExportWriter;
 import com.hz.pm.api.projectlib.model.entity.Project;

hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExpertRegisterUtil.java

@@ -15,7 +15,7 @@ import com.hz.pm.api.meta.constant.ExpertTagEnum;
 import com.hz.pm.api.meta.helper.DictionaryCache;
 import com.hz.pm.api.meta.helper.TagCache;
 import com.hz.pm.api.meta.model.ExpertRegionInfo;
-import com.hz.pm.api.meta.model.dto.DictDTO;
+import com.hz.pm.api.meta.model.dto.DictionaryDTO;
 import com.hz.pm.api.meta.model.dto.TagDTO;
 import com.hz.pm.api.organization.model.entity.DingOrganization;
 import com.hz.pm.api.organization.service.IDingOrganizationService;
@@ -62,12 +62,12 @@ public class ExpertRegisterUtil {
             // 政治面貌
             basic.setPolitical(new ArrayList<>());
             String political = MapUtil.getStr(w, "政治面貌");
-            List<DictDTO> politicalDicts = dictionaryCache.listDictByDictType(DictTypeEnum.POLITICAL.getKey());
+            List<DictionaryDTO> politicalDicts = dictionaryCache.listDictByDictType(DictTypeEnum.POLITICAL.getKey());
             if (!politicalDicts.isEmpty()) {
                 politicalDicts.stream()
                         .filter(dict -> dict.getName().equals(political))
                         .findFirst().ifPresent(dictionary -> {
-                            DictionaryFieldInfo dict = new DictionaryFieldInfo();
+                            DictFieldInfoDTO dict = new DictFieldInfoDTO();
                             dict.setDictionaryName(dictionary.getName());
                             dict.setDictionaryCode(dictionary.getDictionaryCode());
                             dict.setDictionaryFieldName(dictionary.getDictionaryType());
@@ -82,12 +82,12 @@ public class ExpertRegisterUtil {
             eduInfo.setDegree(new ArrayList<>());
             // 学历
             String eduStr = MapUtil.getStr(w, "学历");
-            List<DictDTO> eduDicts = dictionaryCache.listDictByDictType(DictTypeEnum.EDU.getKey());
+            List<DictionaryDTO> eduDicts = dictionaryCache.listDictByDictType(DictTypeEnum.EDU.getKey());
             if (!eduDicts.isEmpty()) {
                 eduDicts.stream()
                         .filter(dict -> dict.getName().equals(eduStr))
                         .findFirst().ifPresent(dictionary -> {
-                            DictionaryFieldInfo dict = new DictionaryFieldInfo();
+                            DictFieldInfoDTO dict = new DictFieldInfoDTO();
                             dict.setDictionaryName(dictionary.getName());
                             dict.setDictionaryCode(dictionary.getDictionaryCode());
                             dict.setDictionaryFieldName(dictionary.getDictionaryType());
@@ -96,12 +96,12 @@ public class ExpertRegisterUtil {
             }
             // 学位
             String degreeStr = MapUtil.getStr(w, "学位");
-            List<DictDTO> degreeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.DEGREE.getKey());
+            List<DictionaryDTO> degreeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.DEGREE.getKey());
             if (!degreeDicts.isEmpty()) {
                 degreeDicts.stream()
                         .filter(dict -> dict.getName().equals(degreeStr))
                         .findFirst().ifPresent(dictionary -> {
-                            DictionaryFieldInfo dict = new DictionaryFieldInfo();
+                            DictFieldInfoDTO dict = new DictFieldInfoDTO();
                             dict.setDictionaryName(dictionary.getName());
                             dict.setDictionaryCode(dictionary.getDictionaryCode());
                             dict.setDictionaryFieldName(dictionary.getDictionaryType());
@@ -139,12 +139,12 @@ public class ExpertRegisterUtil {
             jobInfo.setAdministrativeDuties(MapUtil.getStr(w, "行政职务"));
             jobInfo.setAdministrativeRank(new ArrayList<>());
             String administrativeRankStr = MapUtil.getStr(w, "行政职级");
-            List<DictDTO> administrativeRankDicts = dictionaryCache.listDictByDictType(DictTypeEnum.ADMINISTRATIVE_RANK.getKey());
+            List<DictionaryDTO> administrativeRankDicts = dictionaryCache.listDictByDictType(DictTypeEnum.ADMINISTRATIVE_RANK.getKey());
             if (!administrativeRankDicts.isEmpty()) {
                 administrativeRankDicts.stream()
                         .filter(dict -> dict.getName().equals(administrativeRankStr))
                         .findFirst().ifPresent(dictionary -> {
-                            DictionaryFieldInfo dict = new DictionaryFieldInfo();
+                            DictFieldInfoDTO dict = new DictFieldInfoDTO();
                             dict.setDictionaryName(dictionary.getName());
                             dict.setDictionaryCode(dictionary.getDictionaryCode());
                             dict.setDictionaryFieldName(dictionary.getDictionaryType());
@@ -153,12 +153,12 @@ public class ExpertRegisterUtil {
             }
             jobInfo.setCompanyAttribute(new ArrayList<>());
             String companyTypeStr = MapUtil.getStr(w, "*单位类型");
-            List<DictDTO> companyTypeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.COMPANY_ATTRIBUTE.getKey());
+            List<DictionaryDTO> companyTypeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.COMPANY_ATTRIBUTE.getKey());
             if (!companyTypeDicts.isEmpty()) {
                 companyTypeDicts.stream()
                         .filter(dict -> dict.getName().equals(companyTypeStr))
                         .findFirst().ifPresent(dictionary -> {
-                            DictionaryFieldInfo dict = new DictionaryFieldInfo();
+                            DictFieldInfoDTO dict = new DictFieldInfoDTO();
                             dict.setDictionaryName(dictionary.getName());
                             dict.setDictionaryCode(dictionary.getDictionaryCode());
                             dict.setDictionaryFieldName(dictionary.getDictionaryType());
@@ -170,7 +170,7 @@ public class ExpertRegisterUtil {
             professionalInfo.setAwards("暂无");
             professionalInfo.setIndustrySector(new ArrayList<>());
             professionalInfo.setOther(new ArrayList<>());
-            Map<String, TagDTO> tagMap = tagCache.getNameTagDtoMap();
+            Map<String, TagDTO> tagMap = tagCache.getNameTagMap();
             String otherTagStr = MapUtil.getStr(w, "其他标签");
             if (StrUtils.isNotBlank(otherTagStr)) {
                 for (String othTag : otherTagStr.split(SEPARATOR)) {
@@ -240,12 +240,12 @@ public class ExpertRegisterUtil {
             }
             professionalInfo.setTitleLevel(new ArrayList<>());
             String titleLevel = MapUtil.getStr(w, "*职称级别");
-            List<DictDTO> titleLevelDicts = dictionaryCache.listDictByDictType(DictTypeEnum.TITLE_LEVEL.getKey());
+            List<DictionaryDTO> titleLevelDicts = dictionaryCache.listDictByDictType(DictTypeEnum.TITLE_LEVEL.getKey());
             if (!titleLevelDicts.isEmpty()) {
                 titleLevelDicts.stream()
                         .filter(dict -> dict.getName().equals(titleLevel))
                         .findFirst().ifPresent(dictionary -> {
-                            DictionaryFieldInfo dict = new DictionaryFieldInfo();
+                            DictFieldInfoDTO dict = new DictFieldInfoDTO();
                             dict.setDictionaryName(dictionary.getName());
                             dict.setDictionaryCode(dictionary.getDictionaryCode());
                             dict.setDictionaryFieldName(dictionary.getDictionaryType());

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/controller/DashboardController.java

@@ -2,7 +2,6 @@ package com.hz.pm.api.dashboard.controller;
 
 import com.ningdatech.log.annotation.WebLog;
 import com.hz.pm.api.dashboard.manage.CockpitStatsManage;
-import com.hz.pm.api.dashboard.manage.DashboardExpertManage;
 import com.hz.pm.api.dashboard.manage.DashboardProjectManage;
 import com.hz.pm.api.dashboard.model.dto.CockpitStatsSaveDTO;
 import com.hz.pm.api.dashboard.model.po.QueryYearPO;
@@ -29,20 +28,12 @@ import java.util.List;
 @Api(value = "DashboardController", tags = "驾驶舱相关接口")
 public class DashboardController {
 
-    private final DashboardExpertManage dashboardExpertManage;
     private final DashboardProjectManage dashboardProjectManage;
 
     private final CockpitStatsManage cockpitStatsManage;
 
     private final CockpitStatsStatisticsTask cockpitStatsStatisticsTask;
 
-    @PostMapping("/expert-summary")
-    @ApiOperation("专家驾驶舱统计数据")
-    @WebLog("专家驾驶舱统计数据")
-    public ExpertDashboardSummaryVO getExpertDashboardSummary(@Valid @RequestBody QueryYearPO queryYearPO) {
-        return dashboardExpertManage.getExpertDashboardSummary(queryYearPO);
-    }
-
     @PostMapping("project-summary")
     @ApiOperation("驾驶舱项目总览")
     @WebLog("驾驶舱项目总览")

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/CockpitStatsHandler.java

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.hz.pm.api.common.constant.RegionConst;
+import com.hz.pm.api.common.model.constant.RegionConst;
 import com.hz.pm.api.common.helper.RegionCacheHelper;
 import com.hz.pm.api.dashboard.constant.DashboardConstant;
 import com.hz.pm.api.dashboard.enums.CockpitAppcationTypeEnum;