Bläddra i källkod

feat(basicData): 更新自主上报文档模板名称

- 将下载模板的默认文件名从"怀化高新区企业信用综合评价材料清单"更改为"企业自主上报模版"
- 在安全配置中为新接口"/crmHighTechZoneEnterprises/ratedLevelDReason"添加了公共访问权限
nahida 4 månader sedan
förälder
incheckning
e82d034ea5

+ 28 - 8
zksy-admin/src/main/java/com/zksy/web/controller/basicData/CrmNewsReleaseController.java

@@ -16,7 +16,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 新闻发布Controller
@@ -56,15 +60,31 @@ public class CrmNewsReleaseController extends BaseController {
 
     @GetMapping("/getList")
     @ApiOperation(value = "新闻发布查询所有")
-    public AjaxResult getList(String conditionJson) throws Exception {
-        List<CrmNewsRelease> list = service.list(SearchUtil.parseWhereSql(conditionJson));
-        for(CrmNewsRelease entity : list){
-            List<CrmFile> crmFile = crmFileService.selectByFid(entity.getId());
-            if(crmFile != null) {
-                entity.setFiles(crmFile);
-            }
+    public AjaxResult getList(@RequestParam(required = false) String conditionJson) throws Exception {
+        // 解析查询条件
+        List<CrmNewsRelease> newsList = service.list(SearchUtil.parseWhereSql(conditionJson));
+
+        if (newsList.isEmpty()) {
+            return AjaxResult.success(Collections.emptyList());
         }
-        return AjaxResult.success(list);
+
+        // 收集所有新闻ID
+        List<String> ids = newsList.stream()
+                .map(CrmNewsRelease::getId)
+                .map(String::valueOf)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+
+        // 一次性查询所有附件
+        Map<Long, List<CrmFile>> fileMap = crmFileService.selectByFids(ids).stream()
+                .collect(Collectors.groupingBy(CrmFile::getFid));
+
+        // 将附件分配回对应新闻
+        newsList.forEach(news ->
+                news.setFiles(fileMap.getOrDefault(news.getId(), Collections.emptyList()))
+        );
+
+        return AjaxResult.success(newsList);
     }
 
     /**

+ 6 - 6
zksy-admin/src/main/resources/application-druid.yml

@@ -33,9 +33,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.110.30:3307/credit_rating_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://47.107.107.47:3307/credit_rating_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123
+        password: 3EZ8TYbzCjiMjsn7@.
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -85,13 +85,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.110.30
+    host: 47.107.107.47
     # 端口,默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    #password:
+    password: Ei304IIYHDhfeg3EZ8TYbzCjiMjsn7@.
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -106,9 +106,9 @@ spring:
         max-wait: -1ms
   redisson:
     # 单机
-    address: 192.168.110.30:6379
+    address: 47.107.107.47:6379
     database: 10
-    #password:
+    password: Ei304IIYHDhfeg3EZ8TYbzCjiMjsn7@.