From 61b22d29a4655aaf6437392feab933214c0d4ec3 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Thu, 1 Apr 2021 17:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=85=B7=E4=BD=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicCheckPersonActionController.java | 2 +- .../api/indexlib/IndexLibController.java | 3 -- .../BasicCheckPersonActionAppController.java | 2 +- ...icCheckPersonActionResourceController.java | 2 +- .../bos/indextemplate/IndexTemplateBO.java | 28 ++++++++-- .../dtos/indextemplate/IndexTemplateDTO.java | 33 +++++++++--- .../pos/indextemplate/IndexTemplatePO.java | 30 +++++++++-- .../vos/indextemplate/IndexTemplateVO.java | 33 +++++++++--- .../indexTemplate/indexTemplate-mapper.xml | 54 ++++++++++++++----- .../static/route/indexTemplate/list.html | 52 ++++++++++++++++-- .../static/route/indexTemplate/save.html | 16 +++++- .../static/route/indexTemplate/update.html | 16 +++++- 12 files changed, 221 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/tenlion/twoduty/controller/api/basiccheckpersonaction/BasicCheckPersonActionController.java b/src/main/java/com/tenlion/twoduty/controller/api/basiccheckpersonaction/BasicCheckPersonActionController.java index fccd048..6859582 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/basiccheckpersonaction/BasicCheckPersonActionController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/basiccheckpersonaction/BasicCheckPersonActionController.java @@ -26,7 +26,7 @@ import java.util.Map; * @Date: 2021-03-29 18:09:50 * @Version: 3.0 **/ -@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "接口") +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "基础纪检委员发挥作用平台模板接口") @RestController @RequestMapping(ISystemConstant.API_PREFIX + "/basiccheckpersonaction") public class BasicCheckPersonActionController extends DefaultBaseController { diff --git a/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java b/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java index cf1f92f..4d280a8 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java @@ -57,9 +57,6 @@ public class IndexLibController extends DefaultBaseController { - - - @ApiOperation(value = "指标库树形列表", notes = "指标库树形列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listztree") diff --git a/src/main/java/com/tenlion/twoduty/controller/app/api/basiccheckpersonaction/BasicCheckPersonActionAppController.java b/src/main/java/com/tenlion/twoduty/controller/app/api/basiccheckpersonaction/BasicCheckPersonActionAppController.java index 677afc1..ab8bff1 100644 --- a/src/main/java/com/tenlion/twoduty/controller/app/api/basiccheckpersonaction/BasicCheckPersonActionAppController.java +++ b/src/main/java/com/tenlion/twoduty/controller/app/api/basiccheckpersonaction/BasicCheckPersonActionAppController.java @@ -26,7 +26,7 @@ import java.util.Map; * @Date: 2021-03-29 18:09:50 * @Version: 3.0 **/ -@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "接口") +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "基础纪检委员发挥作用平台模板接口") @RestController @RequestMapping(ISystemConstant.APP_PREFIX + "/basiccheckpersonaction") public class BasicCheckPersonActionAppController extends DefaultBaseController { diff --git a/src/main/java/com/tenlion/twoduty/controller/resource/basiccheckpersonaction/BasicCheckPersonActionResourceController.java b/src/main/java/com/tenlion/twoduty/controller/resource/basiccheckpersonaction/BasicCheckPersonActionResourceController.java index 5f3bdc6..92e6170 100644 --- a/src/main/java/com/tenlion/twoduty/controller/resource/basiccheckpersonaction/BasicCheckPersonActionResourceController.java +++ b/src/main/java/com/tenlion/twoduty/controller/resource/basiccheckpersonaction/BasicCheckPersonActionResourceController.java @@ -26,7 +26,7 @@ import java.util.Map; * @Date: 2021-03-29 18:09:50 * @Version: 3.0 **/ -@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "接口") +@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "基础纪检委员发挥作用平台模板接口") @RestController @RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/basiccheckpersonaction") public class BasicCheckPersonActionResourceController extends DefaultBaseController { diff --git a/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java b/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java index 60dfab0..0807087 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java @@ -12,7 +12,9 @@ public class IndexTemplateBO { private String indexTemplateId; private String indexTemplateName; - private String indexTemplatePath; + private String indexTemplateSavePath; + private String indexTemplateUploadPath; + private String indexTemplateListPath; private String indexTemplateRemark; private Integer indexTemplateState; private String gmtCreate; @@ -37,12 +39,28 @@ public class IndexTemplateBO { this.indexTemplateName = indexTemplateName; } - public String getIndexTemplatePath() { - return indexTemplatePath; + public String getIndexTemplateSavePath() { + return indexTemplateSavePath; } - public void setIndexTemplatePath(String indexTemplatePath) { - this.indexTemplatePath = indexTemplatePath; + public void setIndexTemplateSavePath(String indexTemplateSavePath) { + this.indexTemplateSavePath = indexTemplateSavePath; + } + + public String getIndexTemplateUploadPath() { + return indexTemplateUploadPath; + } + + public void setIndexTemplateUploadPath(String indexTemplateUploadPath) { + this.indexTemplateUploadPath = indexTemplateUploadPath; + } + + public String getIndexTemplateListPath() { + return indexTemplateListPath; + } + + public void setIndexTemplateListPath(String indexTemplateListPath) { + this.indexTemplateListPath = indexTemplateListPath; } public String getGmtCreate() { diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java index 595ce4e..49367c5 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java @@ -21,8 +21,14 @@ public class IndexTemplateDTO { @ApiModelProperty(name = "indexTemplateName", value = "模板名称") private String indexTemplateName; - @ApiModelProperty(name = "indexTemplatePath", value = "模板路径") - private String indexTemplatePath; + + @ApiModelProperty(name = "indexTemplateSavePath", value = "保存路径") + private String indexTemplateSavePath; + @ApiModelProperty(name = "indexTemplateUploadPath", value = "修改路径") + private String indexTemplateUploadPath; + @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径") + private String indexTemplateListPath; + @ApiModelProperty(name = "indexTemplateRemark", value = "模板说明") private String indexTemplateRemark; @ApiModelProperty(name = "indexTemplateState", value = "模板状态") @@ -44,14 +50,29 @@ public class IndexTemplateDTO { this.indexTemplateName = indexTemplateName; } - public String getIndexTemplatePath() { - return indexTemplatePath == null ? "" : indexTemplatePath.trim(); + public String getIndexTemplateSavePath() { + return indexTemplateSavePath; } - public void setIndexTemplatePath(String indexTemplatePath) { - this.indexTemplatePath = indexTemplatePath; + public void setIndexTemplateSavePath(String indexTemplateSavePath) { + this.indexTemplateSavePath = indexTemplateSavePath; } + public String getIndexTemplateUploadPath() { + return indexTemplateUploadPath; + } + + public void setIndexTemplateUploadPath(String indexTemplateUploadPath) { + this.indexTemplateUploadPath = indexTemplateUploadPath; + } + + public String getIndexTemplateListPath() { + return indexTemplateListPath; + } + + public void setIndexTemplateListPath(String indexTemplateListPath) { + this.indexTemplateListPath = indexTemplateListPath; + } public String getIndexTemplateRemark() { return indexTemplateRemark; diff --git a/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java b/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java index af3468a..e0e7747 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java @@ -1,5 +1,7 @@ package com.tenlion.twoduty.pojo.pos.indextemplate; +import io.swagger.annotations.ApiModelProperty; + /** * * @ClassName: IndexTemplatePO @@ -12,7 +14,9 @@ public class IndexTemplatePO { private String indexTemplateId; private String indexTemplateName; - private String indexTemplatePath; + private String indexTemplateSavePath; + private String indexTemplateUploadPath; + private String indexTemplateListPath; private String indexTemplateRemark; private Integer indexTemplateState; private String gmtCreate; @@ -37,12 +41,28 @@ public class IndexTemplatePO { this.indexTemplateName = indexTemplateName; } - public String getIndexTemplatePath() { - return indexTemplatePath; + public String getIndexTemplateSavePath() { + return indexTemplateSavePath; } - public void setIndexTemplatePath(String indexTemplatePath) { - this.indexTemplatePath = indexTemplatePath; + public void setIndexTemplateSavePath(String indexTemplateSavePath) { + this.indexTemplateSavePath = indexTemplateSavePath; + } + + public String getIndexTemplateUploadPath() { + return indexTemplateUploadPath; + } + + public void setIndexTemplateUploadPath(String indexTemplateUploadPath) { + this.indexTemplateUploadPath = indexTemplateUploadPath; + } + + public String getIndexTemplateListPath() { + return indexTemplateListPath; + } + + public void setIndexTemplateListPath(String indexTemplateListPath) { + this.indexTemplateListPath = indexTemplateListPath; } public String getGmtCreate() { diff --git a/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java b/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java index ea2f6e2..a49bde1 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java @@ -19,9 +19,12 @@ public class IndexTemplateVO { @ApiModelProperty(name = "indexTemplateName", value = "模板名称") @CheckEmptyAnnotation(name="模板名称") private String indexTemplateName; - @ApiModelProperty(name = "indexTemplatePath", value = "模板路径") - @CheckEmptyAnnotation(name="模板路径") - private String indexTemplatePath; + @ApiModelProperty(name = "indexTemplateSavePath", value = "保存路径") + private String indexTemplateSavePath; + @ApiModelProperty(name = "indexTemplateUploadPath", value = "修改路径") + private String indexTemplateUploadPath; + @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径") + private String indexTemplateListPath; @ApiModelProperty(name = "indexTemplateRemark", value = "模板说明") private String indexTemplateRemark; @ApiModelProperty(name = "indexTemplateState", value = "模板状态") @@ -36,12 +39,28 @@ public class IndexTemplateVO { this.indexTemplateName = indexTemplateName; } - public String getIndexTemplatePath() { - return indexTemplatePath == null ? "" : indexTemplatePath.trim(); + public String getIndexTemplateSavePath() { + return indexTemplateSavePath; } - public void setIndexTemplatePath(String indexTemplatePath) { - this.indexTemplatePath = indexTemplatePath; + public void setIndexTemplateSavePath(String indexTemplateSavePath) { + this.indexTemplateSavePath = indexTemplateSavePath; + } + + public String getIndexTemplateUploadPath() { + return indexTemplateUploadPath; + } + + public void setIndexTemplateUploadPath(String indexTemplateUploadPath) { + this.indexTemplateUploadPath = indexTemplateUploadPath; + } + + public String getIndexTemplateListPath() { + return indexTemplateListPath; + } + + public void setIndexTemplateListPath(String indexTemplateListPath) { + this.indexTemplateListPath = indexTemplateListPath; } public String getIndexTemplateRemark() { diff --git a/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml b/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml index 64e3d3b..c3ab366 100644 --- a/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml +++ b/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml @@ -5,7 +5,9 @@ - + + + @@ -13,7 +15,9 @@ - + + + @@ -26,7 +30,9 @@ - + + + @@ -41,7 +47,9 @@ INSERT INTO duty_index_template( index_template_id, index_template_name, - index_template_path, + index_template_save_path, + index_template_upload_path, + index_template_list_path, index_template_remark, index_template_state, gmt_create, @@ -52,7 +60,9 @@ ) VALUES( #{indexTemplateId}, #{indexTemplateName}, - #{indexTemplatePath}, + #{indexTemplateSavePath}, + #{indexTemplateUploadPath}, + #{indexTemplateListPath}, #{indexTemplateRemark}, #{indexTemplateState}, #{gmtCreate}, @@ -100,8 +110,14 @@ index_template_name = #{indexTemplateName}, - - index_template_path = #{indexTemplatePath}, + + index_template_save_path = #{indexTemplateSavePath}, + + + index_template_upload_path = #{indexTemplateUploadPath}, + + + index_template_list_path = #{indexTemplateListPath}, index_template_remark = #{indexTemplateRemark}, @@ -119,7 +135,9 @@ + + + +
+ +
+ +
+
+
+ +
+
diff --git a/src/main/resources/static/route/indexTemplate/update.html b/src/main/resources/static/route/indexTemplate/update.html index a56ccd6..0a97ffe 100644 --- a/src/main/resources/static/route/indexTemplate/update.html +++ b/src/main/resources/static/route/indexTemplate/update.html @@ -29,9 +29,21 @@
- +
- + +
+
+
+ +
+ +
+
+
+ +
+