From 266dbaaac88584e005b5c2b75149501a2e258011 Mon Sep 17 00:00:00 2001
From: thomas <thomastangweixin@163.com>
Date: Sat, 29 Oct 2022 17:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8A=A8=E6=80=81sql=EF=BC=8C=E5=85=8D=E5=8E=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1=E6=8E=A5=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E9=BA=BB=E7=83=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/maku/system/dao/SysDictDataDao.java    |  8 ++++++++
 .../net/maku/system/entity/SysDictTypeEntity.java   |  8 ++++++++
 .../system/service/impl/SysDictTypeServiceImpl.java | 13 +++++++++++++
 .../main/java/net/maku/system/vo/SysDictTypeVO.java |  6 ++++++
 4 files changed, 35 insertions(+)

diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java
index 8b889f4..e8922af 100644
--- a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java
+++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java
@@ -2,7 +2,12 @@ package net.maku.system.dao;
 
 import net.maku.framework.common.dao.BaseDao;
 import net.maku.system.entity.SysDictDataEntity;
+import net.maku.system.vo.SysDictVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 字典数据
@@ -12,4 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
 
+    @Select("${sql}")
+    List<SysDictVO.DictData> selectListForSql(@Param("sql") String sql);
+
 }
diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java
index 471b021..fa3b88e 100644
--- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java
+++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java
@@ -30,4 +30,12 @@ public class SysDictTypeEntity extends BaseEntity {
 	 * 排序
 	 */
 	private Integer sort;
+	/**
+	 * 类型：1 静态常量 2 动态SQL
+	 */
+	private Integer type;
+	/**
+	 * 动态sql
+	 */
+	private String sourceSql;
 }
\ No newline at end of file
diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
index 3fe0723..44e4fe3 100644
--- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
+++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
@@ -18,6 +18,7 @@ import net.maku.system.service.SysDictTypeService;
 import net.maku.system.vo.SysDictVO;
 import net.maku.system.query.SysDictTypeQuery;
 import net.maku.system.vo.SysDictTypeVO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -92,6 +93,18 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
                 }
             }
 
+            if(type.getType() == 2){
+                // 增加动态列表
+                String sql = type.getSourceSql();
+                if(StringUtils.isNotBlank(sql)){
+                    try {
+                        dict.setDataList(sysDictDataDao.selectListForSql(sql));
+                    } catch (Exception e) {
+                        log.error("增加动态字典异常: type=" + type, e);
+                    }
+                }
+            }
+
             dictList.add(dict);
         }
 
diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
index c4dcea0..13cb4f4 100644
--- a/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
+++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
@@ -45,4 +45,10 @@ public class SysDictTypeVO implements Serializable {
 	@Schema(description = "更新时间")
 	@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
 	private Date updateTime;
+
+	@Schema(description = "类型：1 静态常量 2 动态SQL")
+	private Integer type;
+
+	@Schema(description = "动态sql")
+	private String sourceSql;
 }
\ No newline at end of file
-- 
Gitee