获取 菜单和链接

kqapi/.idea/.gitignore

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

kqapi/.idea/checkstyle-idea.xml

@@ -0,0 +1,14 @@
+<?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>

kqapi/.idea/compiler.xml

@@ -0,0 +1,14 @@
+<?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>

kqapi/.idea/eclipseCodeFormatter.xml

@@ -0,0 +1,12 @@
+<?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>

kqapi/.idea/encodings.xml

@@ -0,0 +1,8 @@
+<?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>

kqapi/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,10 @@
+<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>

kqapi/.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?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>

kqapi/.idea/misc.xml

@@ -0,0 +1,12 @@
+<?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>

kqapi/.idea/sonarlint/issuestore/0/0/002597a7f172f343a6cffcd273be74aa895d74b3

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

kqapi/.idea/sonarlint/issuestore/0/2/02999ca52b20720a6dba73a2ea57a018dba90084

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

kqapi/.idea/sonarlint/issuestore/7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5

@@ -0,0 +1,95 @@
+
+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.(³ŽàÜøÿÿÿÿ

kqapi/.idea/sonarlint/issuestore/8/c/8c928fdb02a7d0f06b9a34c0b545a00ddf44aab7

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

kqapi/.idea/sonarlint/issuestore/9/2/92bb80058f98a2589a95655e976c4c3b31905e3f

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

kqapi/.idea/sonarlint/issuestore/a/9/a90097c62f2d5eef81300bceaa14afa9559ec829

@@ -0,0 +1,5 @@
+
+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

kqapi/.idea/sonarlint/issuestore/d/3/d39b8ec842398247637f12ea4caf897c9a0a8463

@@ -0,0 +1,15 @@
+
+\
+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

kqapi/.idea/sonarlint/issuestore/d/7/d7146276b7a0a780dc7631a29b70c58f9c37fac3

@@ -0,0 +1,72 @@
+
+\	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.(ˆòóµùÿÿÿÿ

kqapi/.idea/sonarlint/issuestore/e/c/ecd8157d3ccb289d327361f90fcef4d14eddb335

@@ -0,0 +1,5 @@
+
+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".(©¶üÈúÿÿÿÿ

kqapi/.idea/sonarlint/issuestore/f/1/f1ece2c596126c2753f07e9c33ac1dee153eca7c

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

kqapi/.idea/sonarlint/issuestore/index.pb

@@ -0,0 +1,31 @@
+
+{
+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

kqapi/.idea/vcs.xml

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

kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java

@@ -16,7 +16,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
  * @Version 1.0
  **/
 @RestControllerAdvice(basePackages = {
-        "com.ningdatech.kqapi.zzsfw.controller"
+
 })
 public class GlobalResponseHandler implements ResponseBodyAdvice<Object> {
 

kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java

@@ -1,6 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.controller;
 
 
+import com.ningdatech.basic.model.ApiResponse;
 import com.ningdatech.kqapi.zzsfw.entity.vo.MattersVO;
 import com.ningdatech.kqapi.zzsfw.entity.vo.ZoneVO;
 import com.ningdatech.kqapi.zzsfw.manage.MatterManage;
@@ -36,7 +37,7 @@ public class NdKqZzsfwMenuController {
 
     @ApiOperation(value = "获取政务事项数据列表", notes = "获取政务事项数据列表")
     @GetMapping("/matters")
-    public List<ZoneVO> getMatters() {
-        return matterManage.getMatters();
+    public ApiResponse<List<ZoneVO>> getMatters() {
+        return ApiResponse.ofSuccess(matterManage.getMatters());
     }
 }

kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java

@@ -1,14 +1,13 @@
 package com.ningdatech.kqapi.zzsfw.manage;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.StopWatch;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.common.enumeration.CommonEnum;
 import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
 import com.ningdatech.kqapi.zzsfw.entity.vo.MattersVO;
 import com.ningdatech.kqapi.zzsfw.entity.vo.WindowVO;
 import com.ningdatech.kqapi.zzsfw.entity.vo.ZoneVO;
-import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,24 +35,25 @@ public class MatterManage {
 
     public List<ZoneVO> getMatters() {
         List<NdKqZzsfwMenu> matters = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class)
-                .eq(NdKqZzsfwMenu::getHasUrl,1)
+                .eq(NdKqZzsfwMenu::getHasUrl, CommonEnum.YES.getCode())
                 .orderByAsc(NdKqZzsfwMenu::getSort));
-
         if(CollUtil.isEmpty(matters)){
             return Collections.emptyList();
         }
 
         Set<String> zoneSet = new HashSet<>();
-        return matters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> {
+        List<ZoneVO> res = matters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> {
             ZoneVO zone = new ZoneVO();
             zone.setZoneName(m.getZoneName());
-            zone.setWindows(generateWindows(m,matters));
+            zone.setWindows(generateWindows(m, matters));
             return zone;
         }).collect(Collectors.toList());
+        return res;
     }
 
     private List<WindowVO> generateWindows(NdKqZzsfwMenu menu, List<NdKqZzsfwMenu> matters) {
-        return matters.stream().filter(m -> StringUtils.isNotBlank(m.getZoneName()) && m.getZoneName().equals(menu.getZoneName()))
+        Set<String> windowSet = new HashSet<>();
+        return matters.stream().filter(m -> windowSet.add(m.getWindow()) && StringUtils.isNotBlank(m.getZoneName()) && m.getZoneName().equals(menu.getZoneName()))
                 .map(m -> {
                     WindowVO window = new WindowVO();
                     window.setWindowName(m.getWindow());