From 5a65680e316ae1787a10d8784399f3f8665cfa50 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Tue, 22 Aug 2023 16:59:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E5=86=85=E6=B3=95=E8=A7=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/component/SearchComponent.java     | 13 +++++++++++++
 .../service/impl/LawsBasicInfoServiceImpl.java      | 12 +++++++-----
 .../src/main/resources/application-dev.yml          |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 jero-boot-modules/src/main/java/com/jero/modules/laws/component/SearchComponent.java

diff --git a/jero-boot-modules/src/main/java/com/jero/modules/laws/component/SearchComponent.java b/jero-boot-modules/src/main/java/com/jero/modules/laws/component/SearchComponent.java
new file mode 100644
index 00000000..ba058d76
--- /dev/null
+++ b/jero-boot-modules/src/main/java/com/jero/modules/laws/component/SearchComponent.java
@@ -0,0 +1,13 @@
+package com.jero.modules.laws.component;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: liao
+ * @Date: 2023/8/22 16:25
+ * @Description: 查询组件
+ */
+@Component
+public class SearchComponent {
+
+}
diff --git a/jero-boot-modules/src/main/java/com/jero/modules/laws/regulation/service/impl/LawsBasicInfoServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/laws/regulation/service/impl/LawsBasicInfoServiceImpl.java
index 582e20d4..03cfc6ef 100644
--- a/jero-boot-modules/src/main/java/com/jero/modules/laws/regulation/service/impl/LawsBasicInfoServiceImpl.java
+++ b/jero-boot-modules/src/main/java/com/jero/modules/laws/regulation/service/impl/LawsBasicInfoServiceImpl.java
@@ -73,7 +73,7 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
 		List<LawsTag> fieldList = getFieldList(FileTableIdEnum.DOMESTIC_REGULATIONS.getValue());
 		// 获取查询返回字段集合
 		List<String> selectField = getSelectField(fieldList);
-		//封装查询条件(包含高级搜索)
+		// 封装查询条件(包含高级搜索)
 		String condition = getConditionStr(parameter);
 		int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
 		int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
@@ -82,7 +82,7 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
 		IPage<Map<String,Object>> page = new Page<>(pageNo, pageSize);
 		IPage<Map<String,Object>> infoPage = lawsTagMapper.getInfoPage(page, " " + StringUtils.join(selectField, ","), condition);
 
-		//树形数据字典
+		// 树形数据字典（标签内容管理数据，相关表sys_category、sys_dict）
 		List<SysCategory> categoryList = sysCategoryService.list();
 
 		//过滤出树形字段
@@ -93,11 +93,12 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
 		List<LawsTag> lawsTagFileList = fieldList.stream()
 				.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
 				.collect(Collectors.toList());
-
+		// 文件类型字段名集合
 		List<String> fileList = lawsTagFileList.stream().map(LawsTag::getDbFieldName).collect(Collectors.toList());
+		// 查询返回结果集合
 		List<Map<String,Object>> records = infoPage.getRecords();
 
-		//数据字典
+		//数据字典（框架原来的数据字典）
 		List<SysDictItem> sysDictItems = sysDictItemService.selectItemsAll();
 
 		//下拉选处理数据字典
@@ -108,6 +109,7 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
 			idList.add((String) record1.get("id"));
 			for (Map.Entry<String, Object> entry : record1.entrySet()) {
 				//下拉选处理数据字典
+				// sysDictItems框架原来的数据字典全部配置项数据、entry单独的一条国内法规数据、cut中英文、fieldList国内法规表的全部字段
 				dictItem(sysDictItems, entry, cut, fieldList,null);
 				treeDictItem(categoryList, entry, treeFieldList, cut,null);
 				if(fileList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())){
@@ -136,7 +138,7 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
 			}
 		}
 
-		return null;
+		return infoPage;
 	}
 
 	/**
diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml
index 94949566..9d9498cf 100644
--- a/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -163,7 +163,7 @@ spring:
   #redis 配置
   redis:
     database: 11
-    host: localhost
+    host: 10.10.10.45
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -171,7 +171,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password:
+    password: hzwlsoft.com
     port: 6379
   #rabbitmq 配置
   rabbitmq: