Merge remote-tracking branch 'origin/master'

config/application-dev-conf.yml

@@ -2,7 +2,7 @@
 cy_redis:
   ip: 127.0.0.1
   port: 6379
-  password: 123456
+  password:
   database: 7
 
 # 2. rabbitMq
@@ -103,10 +103,7 @@ cy:
           - "/office/getFile"
           - "/office/callback"
           - "/app/open/**"
-          - "/app/cmsActivity/**"
-          - "/app/cmsBanner/**"
-          - "/app/cmsNotice/**"
-          - "/app/opmTopic/**"
+          - "/app/wxMiniApp/**"
         permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css","/swagger-ui/*" ]
         logoutSuccessUrl: "/login"
         loginPage: "/login"

src/main/java/org/rcisoft/app/appActivity/controller/AppActivityController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2024年3月25日 下午1:42:40
  */
 @RestController
-@RequestMapping("/app/cmsActivity")
+@RequestMapping("/app")
 public class AppActivityController extends CyPaginationController<CmsActivity> {
 
 
@@ -40,7 +40,7 @@ public class AppActivityController extends CyPaginationController<CmsActivity> {
     @CyOpeLogAnno(title = "system-活动管理-查询活动", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "查询单一活动", description = "查询单一活动")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @GetMapping("/detail/{businessId:\\w+}")
+    @GetMapping("/open/cmsActivity/detail/{businessId:\\w+}")
     public CyResult detail(@PathVariable Integer businessId) {
         return CyResultGenUtil.builder(new CyPersistModel(1),
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
@@ -54,7 +54,7 @@ public class AppActivityController extends CyPaginationController<CmsActivity> {
     @PreAuthorize("@cyPerm.hasPerm('app:activity:query')")
     @CyOpeLogAnno(title = "system-活动管理-查询活动", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "分页查询活动集合", description = "分页查询活动集合")
-    @GetMapping(value = "/queryCmsActivityByPagination")
+    @GetMapping(value = "/open/cmsActivity/queryCmsActivityByPagination")
     public CyGridModel listByPagination(CmsActivity cmsActivity) {
         cmsActivityServiceImpl.findAllByPagination(getPaginationUtility(), cmsActivity);
         return getGridModelResponse();

src/main/java/org/rcisoft/app/appArticle/controller/AppOpmArticleController.java

+package org.rcisoft.app.appArticle.controller;
+
+
+/*固定导入*/
+
+import io.swagger.v3.oas.annotations.Operation;
+import org.rcisoft.business.opmArticle.entity.OpmArticle;
+import org.rcisoft.business.opmArticle.service.OpmArticleService;
+import org.rcisoft.core.anno.CyOpeLogAnno;
+import org.rcisoft.core.controller.CyPaginationController;
+import org.rcisoft.core.model.CyGridModel;
+import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+/**
+* Created by cy on 2024年3月30日 下午1:51:15.
+*/
+@RestController
+@RequestMapping("/app")
+public class AppOpmArticleController extends CyPaginationController<OpmArticle> {
+
+
+    @Autowired
+    private OpmArticleService opmArticleServiceImpl;
+
+    /**
+     * 动态-动态列表
+     */
+    @PreAuthorize("@cyPerm.hasPerm('app:article:list')")
+    @CyOpeLogAnno(title = "system-动态管理-查询动态列表", businessType = CyLogTypeEnum.QUERY)
+    @Operation(summary="分页查询动态列表集合", description="分页查询动态列表集合")
+    @GetMapping(value = "/open/opmArticle/queryArticleByPagination")
+    public CyGridModel listByPagination(OpmArticle opmArticle) {
+        opmArticleServiceImpl.findAllByPagination(getPaginationUtility(), opmArticle);
+        return getGridModelResponse();
+    }
+
+}

src/main/java/org/rcisoft/app/appBanner/controller/AppBannerController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 * Created by cy on 2024年3月30日 下午1:51:15.
 */
 @RestController
-@RequestMapping("/app/cmsbanner")
+@RequestMapping("/app")
 public class AppBannerController extends CyPaginationController<CmsBanner> {
 
 
@@ -32,7 +32,7 @@ public class AppBannerController extends CyPaginationController<CmsBanner> {
     @PreAuthorize("@cyPerm.hasPerm('app:banner:query')")
     @CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary="分页查询banner管理集合", description="分页查询banner管理集合")
-    @GetMapping(value = "/queryCmsBannerByPagination")
+    @GetMapping(value = "/open/cmsBanner/queryCmsBannerByPagination")
     public CyGridModel listByPagination(CmsBanner cmsBanner) {
         cmsBannerServiceImpl.findAllByPagination(getPaginationUtility(), cmsBanner);
         return getGridModelResponse();

src/main/java/org/rcisoft/app/appNotice/controller/AppNoticeController.java

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2024年3月25日 下午1:42:40
  */
 @RestController
-@RequestMapping("/app/cmsNotice")
+@RequestMapping("/app")
 public class AppNoticeController extends CyPaginationController<CmsNotice> {
 
 
@@ -39,7 +39,7 @@ public class AppNoticeController extends CyPaginationController<CmsNotice> {
     @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "查询单一公告", description = "查询单一公告")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @GetMapping("/detail/{businessId:\\w+}")
+    @GetMapping("/open/cmsNotice/detail/{businessId:\\w+}")
     public CyResult detail(@PathVariable Integer businessId) {
         return CyResultGenUtil.builder(new CyPersistModel(1),
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
@@ -54,7 +54,7 @@ public class AppNoticeController extends CyPaginationController<CmsNotice> {
     @PreAuthorize("@cyPerm.hasPerm('app:notice:query')")
     @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "分页查询公告集合", description = "分页查询公告集合")
-    @GetMapping(value = "/queryCmsNoticeByPagination")
+    @GetMapping(value = "/open/cmsNotice/queryCmsNoticeByPagination")
     public CyGridModel listByPagination(CmsNotice cmsNotice) {
         cmsNoticeServiceImpl.findAllByPagination(getPaginationUtility(), cmsNotice);
         return getGridModelResponse();

src/main/java/org/rcisoft/app/appOpmTopic/controller/AppOpmTopicController.java

@@ -4,14 +4,11 @@ package org.rcisoft.app.appOpmTopic.controller;
 /*固定导入*/
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import org.rcisoft.business.opmTopic.entity.OpmTopic;
 import org.rcisoft.business.opmTopic.service.OpmTopicService;
 import org.rcisoft.core.anno.CyOpeLogAnno;
 import org.rcisoft.core.constant.CyMessCons;
 import org.rcisoft.core.controller.CyPaginationController;
-import org.rcisoft.core.model.CyGridModel;
 import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.core.result.CyResult;
@@ -20,30 +17,26 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+/**
+ * @author cy
+ * @date 2024年3月25日 下午1:42:40
+ */
 @RestController
-@RequestMapping("/app/opmTopic")
+@RequestMapping("/app")
 public class AppOpmTopicController extends CyPaginationController<OpmTopic> {
+
     @Autowired
     private OpmTopicService opmTopicServiceImpl;
 
-    @PreAuthorize("@cyPerm.hasPerm('app:topic:detial')")
-    @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "查询单一公告", description = "查询单一公告")
-    @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
-    @GetMapping("/detail/{businessId:\\w+}")
-    public CyResult detail(@PathVariable Integer businessId) {
-        return CyResultGenUtil.builder(new CyPersistModel(1),
-                CyMessCons.MESSAGE_ALERT_SUCCESS,
-                CyMessCons.MESSAGE_ALERT_ERROR,
-                opmTopicServiceImpl.findById(businessId));
-    }
 
     @PreAuthorize("@cyPerm.hasPerm('app:topic:query')")
     @CyOpeLogAnno(title = "system-话题管理-查询话题", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "分页查询话题集合", description = "分页查询话题集合")
-    @GetMapping(value = "/queryOpmTopicByPagination")
-    public CyGridModel listByPagination(OpmTopic opmTopic) {
-        opmTopicServiceImpl.findAllByPagination(getPaginationUtility(), opmTopic);
-        return getGridModelResponse();
+    @Operation(summary = "查询话题集合", description = "查询话题集合")
+    @GetMapping(value = "/open/opmTopic/queryAllOpmTopic")
+    public CyResult queryAllTopicList(OpmTopic opmTopic) {
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                opmTopicServiceImpl.findAll(opmTopic));
     }
 }

src/main/java/org/rcisoft/business/opmTopic/controller/OpmTopicController.java

@@ -78,8 +78,8 @@ public class OpmTopicController extends CyPaginationController<OpmTopic> {
     }
 
 //    @PreAuthorize("@cyPerm.hasPerm('opm:notice:singleSearch')")
-    @CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary = "查询单一公告", description = "查询单一公告")
+    @CyOpeLogAnno(title = "system-话题管理-查询话题", businessType = CyLogTypeEnum.QUERY)
+    @Operation(summary = "查询单一话题", description = "查询单一话题")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
     @GetMapping("/detail/{businessId:\\w+}")
     public CyResult detail(@PathVariable Integer businessId) {
@@ -92,9 +92,8 @@ public class OpmTopicController extends CyPaginationController<OpmTopic> {
     //@PreAuthorize("@cyPerm.hasPerm('sys:contentNewsInformation:list')")
     @CyOpeLogAnno(title = "system-话题管理-查询话题", businessType = CyLogTypeEnum.QUERY)
     @Operation(summary = "查询话题集合", description = "查询话题集合")
-
-    @GetMapping(value = "/queryOpmTopic")
-    public CyResult querySysContentNewsInformations(OpmTopic opmTopic) {
+    @GetMapping(value = "/queryAllOpmTopic")
+    public CyResult queryAllTopicList(OpmTopic opmTopic) {
         return CyResultGenUtil.builder(new CyPersistModel(1),
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
                 CyMessCons.MESSAGE_ALERT_ERROR,
@@ -153,7 +152,7 @@ public class OpmTopicController extends CyPaginationController<OpmTopic> {
     @CyOpeLogAnno(title = "system-话题管理-查询话题", businessType = CyLogTypeEnum.EXPORT)
     @Operation(summary = "导出话题信息", description = "导出话题信息")
     @GetMapping(value = "/export")
-    public void outSysContentNewsInformation(HttpServletResponse response, OpmTopic opmTopic, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
+    public void outTopicInformation(HttpServletResponse response, OpmTopic opmTopic, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
         String excelName = "";
         switch (excelId) {
             case "0":

src/main/resources/mapper/business/opmTopic.mapper/OpmTopicMapper.xml

@@ -17,34 +17,49 @@
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryOpmTopic" resultMap="BaseResultMap">
-        select * from opm_topic
-        where 1=1
-            <if test="entity.createBy !=null and entity.createBy != '' ">
-                and create_by like concat('%',#{entity.createBy},'%')
-            </if>
-            <if test="entity.beginTime !=null and entity.beginTime != '' ">
-                and create_date &gt;=  #{entity.beginTime}
-            </if>
-            <if test="entity.endTime !=null and entity.endTime != '' ">
-                and create_date &lt;=  #{entity.endTime}
-            </if>
-            <if test="entity.updateBy !=null and entity.updateBy != '' ">
-                and update_by like concat('%',#{entity.updateBy},'%')
-            </if>
-            <if test="entity.beginTime !=null and entity.beginTime != '' ">
-                and update_date &gt;=  #{entity.beginTime}
-            </if>
-            <if test="entity.endTime !=null and entity.endTime != '' ">
-                and update_date &lt;=  #{entity.endTime}
-            </if>
-            <if test="entity.topicName !=null and entity.topicName != '' ">
-                and topic_name like concat('%',#{entity.topicName},'%')
-            </if>
+        SELECT cn.business_id,
+        cn.create_by,
+        cn.create_date,
+        cn.update_by,
+        cn.del_flag,
+        cn.flag,
+        cn.topic_name,
+        cn.exam_status,
+        cn.weight,
+        cn.article_count,
+        su.nick_name as nickName
+        FROM opm_topic cn
+        LEFT JOIN sys_user su on su.business_id = cn.create_by
+        where cn.del_flag='0'
+        <if test="entity.flag!=null and entity.flag != '' ">
+            and cn.flag = #{entity.flag}
+        </if>
+        <if test="entity.examStatus!=null and entity.examStatus != '' ">
+            and cn.exam_status = #{entity.examStatus}
+        </if>
+        <if test="entity.createBy !=null and entity.createBy != '' ">
+            and create_by like concat('%',#{entity.createBy},'%')
+        </if>
+        <if test="entity.beginTime !=null ">
+            and cn.create_Date &gt;=  #{entity.beginTime}
+        </if>
+        <if test="entity.endTime !=null ">
+            and cn.create_Date &lt;=  #{entity.endTime}
+        </if>
+        <if test="entity.updateBy !=null and entity.updateBy != '' ">
+            and update_by like concat('%',#{entity.updateBy},'%')
+        </if>
+        <if test="entity.weight !=null and entity.weight != '' ">
+            and weight like concat('%',#{entity.weight},'%')
+        </if>
 
-            <if test="entity.weight !=null and entity.weight != '' ">
-                and weight like concat('%',#{entity.weight},'%')
-            </if>
-        ORDER BY business_id DESC
+        <if test="entity.articleCount !=null and entity.articleCount != '' ">
+            and article_count like concat('%',#{entity.articleCount},'%')
+        </if>
+        <if test="entity.topicName !=null and entity.topicName != '' ">
+            and topic_name like concat('%',#{entity.topicName},'%')
+        </if>
+        ORDER BY cn.exam_status,cn.weight,cn.business_id DESC
     </select>
 
     <select id="queryOpmTopicPaged" resultMap="BaseResultMap">