From d84dc920559086fd8cfe880cd23c16f39677b9a0 Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Wed, 11 Aug 2021 10:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=8A=A8=E6=8E=92=E7=89=88=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BF=9D=E5=AD=98=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templateconfig/templateconfig-mapper.xml  | 18 ++++++++++---
 .../templaterecord/templaterecord-mapper.xml  |  3 +++
 .../templateconfig/list-templateconfig.html   | 25 ++++++++++++++++++-
 .../templaterecord/list-templaterecord.html   | 25 ++++++++++++++++++-
 .../templateconfig/TemplateConfigDTO.java     | 10 ++++++++
 .../vos/templateconfig/TemplateConfigVO.java  | 12 +++++++++
 6 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml b/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml
index 8d01de5..c61ba17 100644
--- a/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml
+++ b/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml
@@ -14,6 +14,7 @@
         <result column="template_all_generate" property="templateAllGenerate"/>
         <result column="template_file_type" property="templateFileType"/>
         <result column="template_mode" property="templateMode"/>
+        <result column="template_project" property="templateProject"/>
     </resultMap>
 
     <insert id="saveTemplateConfig" parameterType="map">
@@ -29,6 +30,7 @@
             template_all_generate,
             template_file_type,
             template_mode,
+            template_project,
             creator,
             gmt_create,
             modifier,
@@ -46,6 +48,7 @@
             #{templateAllGenerate},
             #{templateFileType},
             #{templateMode},
+            #{templateProject},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -114,6 +117,9 @@
         </if>
         <if test="templateMode != null and templateMode != ''">
             template_mode = #{templateMode},
+        </if>
+        <if test="templateProject != null and templateProject != ''">
+            template_project = #{templateProject},
         </if>
             modifier = #{modifier},
             gmt_modified = #{gmtModified}
@@ -133,7 +139,8 @@
             t1.template_file,
             t1.template_all_generate,
             t1.template_file_type,
-            t1.template_mode
+            t1.template_mode,
+            t1.template_project
         FROM
             m_template_config t1
         WHERE
@@ -152,7 +159,8 @@
             t1.template_file,
             t1.template_all_generate,
             t1.template_file_type,
-            t1.template_mode
+            t1.template_mode,
+            t1.template_project
         FROM
             m_template_config t1
         WHERE
@@ -175,7 +183,8 @@
             t1.template_file,
             t1.template_all_generate,
             t1.template_file_type,
-            t1.template_mode
+            t1.template_mode,
+            t1.template_project
         FROM
             m_template_config t1
         WHERE
@@ -186,6 +195,9 @@
                 t1.template_name LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
+        <if test="templateProject != null and templateProject != ''">
+            AND t1.template_project = #{templateProject}
+        </if>
         <if test="startTime != null and startTime != ''">
         AND
             LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
diff --git a/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml b/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml
index 0ab96be..bb91476 100644
--- a/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml
+++ b/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml
@@ -153,6 +153,9 @@
             t1.template_record_id LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
+        <if test="templateProject != null and templateProject != ''">
+            AND t2.template_project = #{templateProject}
+        </if>
         <if test="startTime != null and startTime != ''">
         AND
             LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
diff --git a/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html b/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html
index 8969445..9252e98 100644
--- a/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html
+++ b/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html
@@ -26,6 +26,7 @@
                         <div class="layui-inline">
                             <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
                         </div>
+                        <div class="layui-inline layui-form search-item-200px" id="templateProjectSelectTemplateBox" lay-filter="templateProjectSelectTemplateBox"></div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
@@ -50,6 +51,14 @@
         </div>
     </div>
 </div>
+<script id="templateProjectSelectTemplate" type="text/html">
+    <select id="templateProject" name="templateProject">
+        <option value="">请选择所属项目</option>
+        {{# for(var i = 0, item; item = d[i++];) { }}
+        <option value="{{item.dataId}}">{{item.dataName}}</option>
+        {{# } }}
+    </select>
+</script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
 <script>
@@ -67,6 +76,19 @@
         var resizeTimeout = null;
         var tableUrl = 'api/templateconfig/listpagetemplateconfig';
 
+        // 初始化项目
+        function initTemplateProject(templateProject) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/8b321dfb-3bb3-4ec4-8d42-fa764c0a086f', []), {}, null, function(code, data, args) {
+                laytpl(document.getElementById('templateProjectSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('templateProjectSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'templateProjectSelectTemplateBox');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initTemplateProject();
+
         // 初始化表格
         function initTable() {
             table.render({
@@ -166,7 +188,8 @@
                 where: {
                     keywords: $('#keywords').val(),
                     startTime: $('#startTime').val(),
-                    endTime: $('#endTime').val()
+                    endTime: $('#endTime').val(),
+                    templateProject: $('#templateProject').val()
                 },
                 page: {
                     curr: currentPage
diff --git a/module-freemarker/src/main/resources/templates/templaterecord/list-templaterecord.html b/module-freemarker/src/main/resources/templates/templaterecord/list-templaterecord.html
index df98a06..1cbf89e 100644
--- a/module-freemarker/src/main/resources/templates/templaterecord/list-templaterecord.html
+++ b/module-freemarker/src/main/resources/templates/templaterecord/list-templaterecord.html
@@ -26,6 +26,7 @@
                         <div class="layui-inline">
                             <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
                         </div>
+                        <div class="layui-inline layui-form search-item-200px" id="templateProjectSelectTemplateBox" lay-filter="templateProjectSelectTemplateBox"></div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
@@ -50,6 +51,14 @@
         </div>
     </div>
 </div>
+<script id="templateProjectSelectTemplate" type="text/html">
+    <select id="templateProject" name="templateProject">
+        <option value="">请选择所属项目</option>
+        {{# for(var i = 0, item; item = d[i++];) { }}
+        <option value="{{item.dataId}}">{{item.dataName}}</option>
+        {{# } }}
+    </select>
+</script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
 <script>
@@ -67,6 +76,19 @@
         var resizeTimeout = null;
         var tableUrl = 'api/templaterecord/listpagetemplaterecord';
 
+        // 初始化项目
+        function initTemplateProject(templateProject) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/8b321dfb-3bb3-4ec4-8d42-fa764c0a086f', []), {}, null, function(code, data, args) {
+                laytpl(document.getElementById('templateProjectSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('templateProjectSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'templateProjectSelectTemplateBox');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initTemplateProject();
+
         // 初始化表格
         function initTable() {
             table.render({
@@ -175,7 +197,8 @@
                 where: {
                     keywords: $('#keywords').val(),
                     startTime: $('#startTime').val(),
-                    endTime: $('#endTime').val()
+                    endTime: $('#endTime').val(),
+                    templateProject: $('#templateProject').val()
                 },
                 page: {
                     curr: currentPage
diff --git a/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/dtos/templateconfig/TemplateConfigDTO.java b/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/dtos/templateconfig/TemplateConfigDTO.java
index 0901b0a..961c109 100644
--- a/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/dtos/templateconfig/TemplateConfigDTO.java
+++ b/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/dtos/templateconfig/TemplateConfigDTO.java
@@ -39,6 +39,16 @@ public class TemplateConfigDTO {
     private String templateFileType;
     @ApiModelProperty(name = "templateMode", value = "访问方式1:Nginx静态访问,2:系统接口访问")
     private String templateMode;
+    @ApiModelProperty(name = "templateProject", value = "模板项目")
+    private String templateProject;
+
+    public String getTemplateProject() {
+        return templateProject == null ? "" : templateProject;
+    }
+
+    public void setTemplateProject(String templateProject) {
+        this.templateProject = templateProject;
+    }
 
     public String getTemplateMode() {
         return templateMode == null ? "" : templateMode;
diff --git a/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/vos/templateconfig/TemplateConfigVO.java b/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/vos/templateconfig/TemplateConfigVO.java
index 607d9d9..f9e0793 100644
--- a/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/vos/templateconfig/TemplateConfigVO.java
+++ b/pojo-freemarker/src/main/java/cn/com/tenlion/freemarker/pojo/vos/templateconfig/TemplateConfigVO.java
@@ -41,7 +41,19 @@ public class TemplateConfigVO {
     @CheckEmptyAnnotation(name = "生成文件类型")
     private String templateFileType;
     @ApiModelProperty(name = "templateMode", value = "访问方式1:Nginx静态访问,2:系统接口访问")
+    @CheckEmptyAnnotation(name = "访问方式")
     private String templateMode;
+    @ApiModelProperty(name = "templateMode", value = "模板项目")
+    @CheckEmptyAnnotation(name = "模板类型")
+    private String templateProject;
+
+    public String getTemplateProject() {
+        return templateProject == null ? "" : templateProject;
+    }
+
+    public void setTemplateProject(String templateProject) {
+        this.templateProject = templateProject;
+    }
 
     public String getTemplateMode() {
         return templateMode == null ? "" : templateMode;