查看我的投稿接口

43309bbe · 阳浪 · 9e4dacf8 · 43309bbe · 43309bbe · 43309bbe
Commit 43309bbe authored Jan 02, 2025 by 阳浪
4 changed files
--- a/cloud-site-service/src/main/java/com/yizhi/site/application/SiteApplication.java
+++ b/cloud-site-service/src/main/java/com/yizhi/site/application/SiteApplication.java
 package com.yizhi.site.application;
-import com.yizhi.core.application.security.config.SpringSecurityConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
@@ -18,9 +15,5 @@ public class SiteApplication {
    public static void main(String[] args) {
        SpringApplication.run(SiteApplication.class, args);
    }
-    @Bean
-    public SpringSecurityConfig springSecurityConfig(){
-        return new SpringSecurityConfig();
-    }
 }
--- a/cloud-site-service/src/main/java/com/yizhi/site/application/mapper/InformationMapper.java
+++ b/cloud-site-service/src/main/java/com/yizhi/site/application/mapper/InformationMapper.java
@@ -25,6 +25,8 @@ public interface InformationMapper extends BaseMapper<Information> {
    List<Information> informationTwoList(InfomationParamVO vo, Page<Information> page);
+    List<Information>  informationThreeList(InfomationParamVO vo, Page<Information> page);
    List<AnnouncementVO> selectAnnouncement(Page<AnnouncementVO> page, Map<String, Object> map);
    List<InformationStudentVO> informationPageList(@Param("typeName") String typeName, @Param("siteId") Long siteId, @Param("typeOne") Long typeOne, Page<InformationStudentVO> page);

--- a/cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/InformationServiceImpl.java
+++ b/cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/InformationServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 //import com.yizhi.application.job.remote.vo.VmyJobVO;
+import com.google.common.collect.Lists;
 import com.yizhi.site.application.domain.DataClassification;
 import com.yizhi.site.application.domain.Information;
 import com.yizhi.site.application.domain.ProtalPlate;
@@ -919,8 +920,22 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
        BeanUtils.copyProperties(vo,infomationParamVO);
        infomationParamVO.setState(2);
        Page<Information> page = new Page<Information>(vo.getPageNo(), vo.getPageSize());
-        List<Information> list = informationMapper.informationFirstList(infomationParamVO, page);
+        List<Information> list = Lists.newArrayList();
+        if (selectById == null) {
+            return null;
+        }
+        if (selectById.getName().equals(SiteConstant.ANNOUNCEMENT) && selectById.getParentId() == 0) {  //公告
+            list = informationMapper.informationFirstList(infomationParamVO, page);
+        } else if (selectById.getParentId() == 0) {//新闻所有列表
+            list = informationMapper.informationFirstList(infomationParamVO, page);
+        } else {
+            DataClassification selectByParentId = dataClassificationService.selectById(selectById.getParentId());
+            if(selectByParentId==null || selectById.getParentId() == 0){
+                list = informationMapper.informationTwoList(infomationParamVO, page);//新闻分类列表
+            }else{
+                list = informationMapper.informationThreeList(infomationParamVO, page);//新闻分类列表
+            }
+        }
        if (list.size() > 0 && list != null) {
            for (Information info : list) {
                if (info.getTypeOne() != null && info.getTypeOne() != 0) {
@@ -979,7 +994,12 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
        } else if (selectById.getParentId() == 0) {//新闻所有列表
            list = informationMapper.informationFirstList(vo, page);
        } else {
+            DataClassification selectByParentId = dataClassificationService.selectById(selectById.getParentId());
+            if(selectByParentId==null || selectById.getParentId() == 0){
                list = informationMapper.informationTwoList(vo, page);//新闻分类列表
+            }else{
+                list = informationMapper.informationThreeList(vo, page);//新闻分类列表
+            }
        }
        if (list.size() > 0 && list != null) {
            for (Information info : list) {

--- a/cloud-site-service/src/main/resources/mapper/InformationMapper.xml
+++ b/cloud-site-service/src/main/resources/mapper/InformationMapper.xml
@@ -52,22 +52,16 @@
        <if test="end != null">
            and #{end} >= a.release_time
        </if>
-        <if test="null != typeTwoId">
-            and a.type_two = #{typeTwoId}
-        </if>
-        <if test="null != typeThreeId">
-            and a.type_three = #{typeThreeId}
-        </if>
        <if test="null != state">
            and a.state = #{state}
        </if>
        order by a.is_top desc, a.create_time desc
    </select>
-    <select id="informationTwoList" resultType="com.yizhi.site.application.domain.Information">
+    <select id="informationThreeList" resultType="com.yizhi.site.application.domain.Information">
        <!-- select a.* from information a left join data_classification b on a.type_two=b.id
        where 1=1 and a.site_id=#{siteId} and b.site_id=#{siteId} and b.name=#{name}  -->
-        select a.* from information a where 1=1 and a.site_id=#{siteId} and a.type_two=#{typeId}
+        select a.* from information a where 1=1 and a.site_id=#{siteId} and a.type_three=#{typeId}
        <if test="fileName != null and fileName != ''">
            and (a.file_name like CONCAT('%', '${fileName}', '%' ) or a.key_words like CONCAT('%', '${fileName}', '%' ) )
        </if>
@@ -83,6 +77,25 @@
        order by a.is_top desc, a.create_time desc
    </select>
+    <select id="informationTwoList" resultType="com.yizhi.site.application.domain.Information">
+        <!-- select a.* from information a left join data_classification b on a.type_two=b.id
+        where 1=1 and a.site_id=#{siteId} and b.site_id=#{siteId} and b.name=#{name}  -->
+        select a.* from information a where 1=1 and a.site_id=#{siteId} and a.type_two=#{typeId}
+        <if test="fileName != null and fileName != ''">
+            and (a.file_name like CONCAT('%', '${fileName}', '%' ) or a.key_words like CONCAT('%', '${fileName}', '%' ) )
+        </if>
+        <!--        <if test="keyWords != null and keyWords != ''">-->
+        <!--            and a.key_words like CONCAT('%', '${keyWords}', '%' )-->
+        <!--        </if>-->
+        <if test="start != null">
+            and a.release_time >= #{start}
+        </if>
+        <if test="end != null">
+            and #{end} >= a.release_time
+        </if>
+        order by a.is_top desc, a.create_time desc
+    </select>
    <select id="informationPageList" resultType="com.yizhi.site.application.vo.site.InformationStudentVO">
            SELECT