新闻功能bug修改

src/main/java/cn/com/tenlion/xzszwhy/news/service/newscontent/impl/NewsContentServiceImpl.java

@@ -432,7 +432,7 @@ public class NewsContentServiceImpl extends DefaultBaseService implements INewsC
          */
 
         PageHelper.startPage(page.getPage(), page.getRows());
-        List<NewsContentAppDTO> newsContentDTOs = newsContentDao.listNewsContentToApp(page.getParams());
+        List<NewsContentAppDTO> newsContentDTOs = newsContentDao.listNewsContentToApp(params);
         if (newsContentDTOs.isEmpty()) {
             return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
         }

src/main/resources/application-test.yml

@@ -0,0 +1,162 @@
+server:
+  port: 8081
+  ip: 127.0.0.1
+  url: http://${server.ip}:8081/xzszwhy
+  system-title: 日喀则群众艺术馆3.0
+  system-sub-title: 公共文化数字云平台
+  #default-index-page: route/custom/index
+  servlet:
+    context-path: /xzszwhy
+  init:
+    table: true
+    menu: true
+    user: true
+
+
+spring:
+  login-url: /oauth/login
+  login-failure: /oauth/login?error
+  login-process: /userlogin
+  assets-matchers: /assets/**
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    mode: HTML5
+    encoding: UTF-8
+    cache: false
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 1GB
+      max-request-size: 1GB
+  datasource:
+    druid:
+      url: jdbc:mysql://121.36.71.250:58003/db_xz_szwhy?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+      db-type: mysql
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: root
+      password: root
+      initial-size: 2
+      min-idle: 2
+      max-active: 5
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 10
+      filter:
+        commons-log:
+          connection-logger-name: stat,wall,log4j
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      use-global-data-source-stat: true
+
+# ????
+sms:
+  active: true
+  type: default #custom
+  default-sms:
+    account: xd001382
+    password: xd001382136
+    sign: 【测试系统】
+    template:
+      verification-code: '{sign} 您的验证码为 {content}, 有效时间为120秒，若非本人操作，请忽略。'
+
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+access-control:
+  role-permission: false
+
+swagger:
+  base-package-list: ink.wgink,cn.com.tenlion
+
+file:
+  upload-path: D:\CF_work\ideaWorkSpace\uploadFiles
+  image-types: png,jpg,jpeg,gif,blob
+  video-types: mp4,rmvb
+  audio-types: mp3,wmv,amr
+  file-types: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+  max-file-count: 6
+  image-output-quality: 0.4
+  # ??minIo
+  use-min-io: false
+
+# appToken
+app-token:
+  has-department: false
+  has-role: false
+  has-position: false
+  has-group: false
+
+logging:
+  # enable-api-log: true
+  file:
+    name: D:\CF_work\ideaWorkSpace\uploadFiles\logs\usercenter-logs.log
+  level:
+    root: error
+    org.apache.kafka: error
+    org.springframework.data.mongodb: info
+    org.springframework.boot.autoconfigure.security.servlet: debug
+    ink.wgink: debug
+
+
+# 新闻系统-智慧网闸配置
+net-management:
+  config-path: D:\\net_manager_libs\\
+  so-path: D:\\net_manager_libs\\
+
+freemarker-template:
+  nginx-address: http://127.0.0.1:8089/
+
+news:
+  nginxAddress: http://127.0.0.1:8089/ # Nginx地址
+  mainServerAddress:  # 门户服务器地址
+  serverAddress: http://127.0.0.1:8084/news/ # 新闻服务器地址
+
+
+live:
+  # 直播服务器IP，用于录像开启关闭使用
+  port: 8085
+  # 直播服务器地址，用于录像开启关闭使用
+  liveIp: 127.0.0.1
+  # FFmpeg的路径， 用于生成录像封面， 解析录像时长使用
+  ffmpegPath: H:\FFmpeg\ffmpeg-20191016-29dac29-win64-static\bin\ffmpeg
+  # Nginx路径，用于文件保存的时候使用
+  # liveFilePath: H:\Nginx\nginx\
+  liveFilePath: G:\DevelopmentSoftware\Nginx\nginx-tenshi\
+  # 录像模式 auto 自动 | 手动 manual
+  recordMode: auto
+  # Nginx地址|访问录像文件与录像文件预览图使用
+  liveAddress: http://192.168.0.115:8085/
+  # 录像临界值(Double值范围), 存储空间在该值以下的时候 , 不允许再进行直播计划的发布 , 单位 G
+  criticalValue: 100.0
+  # 录像文件保存格式 .mp4或.flv
+  saveFileType: .mp4
+  # 百度API路径
+  baiDuUrl: http://api.map.baidu.com/
+
+# 小程序
+open-platform:
+  wechat:
+    mini-app:
+      # 激活状态
+      active: true
+      api-url: https://api.weixin.qq.com
+      authorize-url: ${open-platform.wechat.mini-app.api-url}/sns/jscode2session
+      grantType: authorization_code
+      appKey: wxa5c5246b283713de
+      appSecret: e5b761f20841f81dd73a6d4aad2f8060
+
+# 系统角色ID
+role-id:
+  news-role-id : d9a602c0-8843-489a-bced-2bb56039b5a8
+

src/main/resources/application.yml

@@ -102,7 +102,7 @@ logging:
   file:
     name: D:\CF_work\ideaWorkSpace\uploadFiles\logs\usercenter-logs.log
   level:
-    root: error
+    root: debug
     org.apache.kafka: error
     org.springframework.data.mongodb: info
     org.springframework.boot.autoconfigure.security.servlet: debug

src/main/resources/mybatis/mapper/news/newscontent/newscontent-mapper.xml

@@ -380,7 +380,8 @@
             WHERE
             t1.is_delete = 0 AND t1.news_content_publish_status = '1' AND t1.news_content_check_status = '2' AND
             (t4.news_config_status IS NULL OR t4.news_config_status = 1)
-                <if test="queryCollect != null and queryCollect != ''">AND t1.news_content_id IN (SELECT temp.news_content_id
+                <if test="queryCollect != null and queryCollect != ''">
+                  AND t1.news_content_id IN (SELECT temp.news_content_id
                     FROM gen_news_content_collect temp WHERE temp.
                     is_delete = 0 AND temp.creator = #{creator})
                 </if>
@@ -389,7 +390,7 @@
                 </if>
                 <if test="newsDirectoriesParentId != null and newsDirectoriesParentId != ''">
                     AND (
-                            t1.news_directories_id = #{newsDirectoriesId}
+                            t1.news_directories_id = #{newsDirectoriesParentId}
                           or
                             t5.directories_parent_id = #{newsDirectoriesParentId}
                         )