作者：张哲

时间：2023/01/09
类型：优化
描述：修改Bug

.flattened-pom.xml

@@ -235,6 +235,16 @@
       <artifactId>gexin-rp-sdk-template</artifactId>
       <version>4.0.0.31</version>
     </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>2.7.0</version>
+    </dependency>
   </dependencies>
   <build>
     <finalName>${project.artifactId}</finalName>

src/main/java/com/redxun/config/Swagger2Config.java

@@ -29,21 +29,35 @@ import java.util.List;
 public class Swagger2Config {
 
     @Bean
-    public Docket adminApiConfig(){
+    public Docket knowledgeApiConfig(){
 
         return new Docket(DocumentationType.SWAGGER_2)
                 .groupName("知识管理系统")
-                .apiInfo(adminApiInfo())
+                .apiInfo(knowledgeApiInfo())
                 .select()
                 //只显示admin路径下的页面
-                .paths(Predicates.and(PathSelectors.regex("/api-knowledge/.*")))
+                .paths(Predicates.and(PathSelectors.regex("/api-knowledge/knowledge/.*")))
                 .build()
                 .securityContexts(Arrays.asList(securityContexts()))
                 .securitySchemes(unifiedAuth());
 
     }
 
-    private ApiInfo adminApiInfo(){
+    @Bean
+    public Docket searchApiConfig(){
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("搜索服务平台")
+                .apiInfo(knowledgeApiInfo())
+                .select()
+                //只显示admin路径下的页面
+                .paths(Predicates.and(PathSelectors.regex("/api-knowledge/search/.*")))
+                .build()
+                .securityContexts(Arrays.asList(securityContexts()))
+                .securitySchemes(unifiedAuth());
+
+    }
+
+    private ApiInfo knowledgeApiInfo(){
 
         return new ApiInfoBuilder()
                 .title("知识管理系统-API文档")

src/main/java/com/redxun/knowledge/service/KnowledgeServiceImpl.java

@@ -179,8 +179,13 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
                 approvalVo.setRemark(approve.getRemark());
                 // 审核状态 ：提交审核 审核通过 审核驳回
                 if (approve.getResult() == null && isFirstNoneApprove) {
-                    isFirstNoneApprove = false;
-                    approvalVo.setApprovalStatus("提交审核");
+                    if (knowledge.getApprovalStatus() == 2 || knowledge.getApprovalStatus() == 4){
+                        isFirstNoneApprove = false;
+                        approvalVo.setApprovalStatus("");
+                    } else {
+                        isFirstNoneApprove = false;
+                        approvalVo.setApprovalStatus("提交审核");
+                    }
                 } else {
                     if (approve.getResult() == null) {
                         approvalVo.setApprovalStatus("");

src/main/java/com/redxun/knowledge/utils/PageListUtils.java

@@ -31,7 +31,10 @@ public class PageListUtils {
         }
 
         // 求出最大页数，防止currentPage越界
-        long maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
+        long maxPage = 0;
+        if (pageSize != 0){
+            maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
+        }
 
         if(currentPage > maxPage) {
             currentPage = maxPage;

src/main/resources/mapper/knowledge/BannerMapper.xml

@@ -63,21 +63,14 @@
                 and CREATE_BY_ LIKE '%' || #{params.createBy} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
-                and CREATE_TIME_ &gt;= TO_DATE(#{params.beginTime}, 'YYYY-MM-DD')
+                and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.endTime)">
-                and CREATE_TIME_ &lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD')
+                and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.endTime}
             </if>
             and IS_DEL = 0
         </where>
         ORDER BY SORT ASC ,ENABLED DESC
-<!--        <if test="@rx.Ognl@isNotEmpty(w.orderBySql)">-->
-<!--            ,${w.orderBySql}-->
-<!--        </if>-->
-<!--        <if test="@rx.Ognl@isEmpty(w.orderBySql)">-->
-<!--            ,UPDATE_TIME_ DESC-->
-<!--        </if>-->
-
     </select>
 
     <delete id="deleteBanner">

src/main/resources/mapper/knowledge/KnowledgeApproveMapper.xml

@@ -70,10 +70,13 @@
                 and k.AUTHOR LIKE '%' || #{params.author} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
-                and ka.CREATE_TIME_ &gt;= TO_DATE(#{params.beginTime}, 'YYYY-MM-DD')
+                and TO_CHAR(ka.CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.endTime)">
-                and ka.CREATE_TIME_ &lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD')
+                and TO_CHAR(ka.CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.endTime}
+            </if>
+            <if test="@rx.Ognl@isNotEmpty(params.approvalStatus)">
+                and k.APPROVAL_STATUS = #{params.approvalStatus}
             </if>
             and k.IS_DEL = 0 and ka.IS_DEL = 0
         </where>

src/main/resources/mapper/knowledge/KnowledgeLabelMapper.xml

@@ -51,10 +51,10 @@
                 AND name like '%'||#{params.name}||'%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.createTimeBegin)">
-                AND CREATE_TIME_ &gt;= TO_DATE(#{params.createTimeBegin, jdbcType=DATE}, 'YYYY-MM-DD HH24:MI:SS')
+                AND TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.createTimeBegin}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.createTimeEnd)">
-                AND CREATE_TIME_ &lt;= TO_DATE(#{params.createTimeEnd, jdbcType=DATE}, 'YYYY-MM-DD HH24:MI:SS')
+                AND TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.createTimeEnd}
             </if>
         </where>
         ORDER BY SORT ASC

src/main/resources/mapper/knowledge/KnowledgeMapper.xml

@@ -74,10 +74,10 @@
             and AUTHOR LIKE '%' || #{params.author} || '%'
         </if>
         <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
-            and CREATE_TIME_ &gt;= TO_DATE(#{params.beginTime}, 'YYYY-MM-DD')
+            and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
         </if>
         <if test="@rx.Ognl@isNotEmpty(params.endTime)">
-            and CREATE_TIME_ &lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD')
+            and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.endTime}
         </if>
         <if test="@rx.Ognl@isNotEmpty(params.approvalStatus)">
             and APPROVAL_STATUS = 5
@@ -126,10 +126,13 @@
                 and k.AUTHOR LIKE '%' || #{params.author} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
-                and ka.CREATE_TIME_ &gt;= TO_DATE(#{params.beginTime}, 'YYYY-MM-DD')
+                and TO_CHAR(ka.CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.endTime)">
-                and ka.CREATE_TIME_ &lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD')
+                and TO_CHAR(ka.CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.endTime}
+            </if>
+            <if test="@rx.Ognl@isNotEmpty(params.approvalStatus)">
+                and k.APPROVAL_STATUS = #{params.approvalStatus}
             </if>
             and k.IS_DEL = 0 and (APPROVAL_STATUS = 1 OR APPROVAL_STATUS = 3)
         </where>

src/main/resources/mapper/knowledge/NewsMapper.xml

@@ -61,10 +61,10 @@
                 and AUTHOR LIKE '%' || #{params.author} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
-                and CREATE_TIME_ &gt;= TO_DATE(#{params.beginTime}, 'YYYY-MM-DD')
+                and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.endTime)">
-                and CREATE_TIME_ &lt;= TO_DATE(#{params.endTime}, 'YYYY-MM-DD')
+                and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.endTime}
             </if>
             and IS_DEL = 0
         </where>