From 85f06999b8be06bcab7ae54d2f307f8262788889 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Thu, 29 Aug 2024 15:59:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codeConfig/CodeConfigController.java      |  6 ++-
 .../com/ruoyi/platform/domain/CodeConfig.java | 37 +++++++++----------
 .../CodeConfigDaoMapper.xml                   |  6 +--
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java
index 6a599028..44bc217b 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/codeConfig/CodeConfigController.java
@@ -28,8 +28,12 @@ public class CodeConfigController extends BaseController {
      * @return 查询结果
      */
     @GetMapping
-    public GenericsAjaxResult<Page<CodeConfig>> queryByPage(CodeConfig codeConfig, int page, int size) {
+    public GenericsAjaxResult<Page<CodeConfig>> queryByPage( @RequestParam("page")int page,
+                                                             @RequestParam("size") int size,
+                                                             @RequestParam(value = "code_repo_name") String codeRepoName) {
         PageRequest pageRequest = PageRequest.of(page,size);
+        CodeConfig codeConfig = new CodeConfig();
+        codeConfig.setCodeRepoName(codeRepoName);
         return genericsSuccess(this.codeConfigService.queryByPage(codeConfig, pageRequest));
     }
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java
index 67d55334..e5a0c680 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java
@@ -15,46 +15,43 @@ public class CodeConfig implements Serializable {
 
     private Long id;
 
-    @ApiModelProperty(value = "代码仓库名称")
+    @ApiModelProperty(name = "code_repo_name",value = "代码仓库名称")
     private String codeRepoName;
 
-    @ApiModelProperty(value = "代码仓库可见性(1-公开，0-私有)")
+    @ApiModelProperty(name = "code_repo_vis", value = "代码仓库可见性(1-公开，0-私有)")
     private Integer codeRepoVis;
 
-    @ApiModelProperty(value = "Git地址")
+    @ApiModelProperty(name = "git_url", value = "Git地址")
     private String gitUrl;
 
-    @ApiModelProperty(value = "代码分支/Tag")
+    @ApiModelProperty(name = "git_branch", value = "代码分支/Tag")
     private String gitBranch;
 
-    @ApiModelProperty(value = "验证方式(0-用户名密码，1-SSH-Key)")
+    @ApiModelProperty(name = "verify_mode", value = "验证方式(0-用户名密码，1-SSH-Key)")
     private Integer verifyMode;
 
-    @ApiModelProperty(value = "Git用户名")
+    @ApiModelProperty(name = "git_user_name", value = "Git用户名")
     private String gitUserName;
 
-    @ApiModelProperty(value = "Git密码")
+    @ApiModelProperty(name = "git_password", value = "Git密码")
     private String gitPassword;
 
-    @ApiModelProperty(value = "SSH Key")
+    @ApiModelProperty(name = "ssh_key",value = "SSH Key")
     private String sshKey;
 
+    @ApiModelProperty(name = "create_by", value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
+
+    @ApiModelProperty(name = "create_time", value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
+
+    @ApiModelProperty(name = "update_by", value = "更新者")
     private String updateBy;
-    /**
-     * 更新时间
-     */
+
+    @ApiModelProperty(name = "update_time", value = "更新时间")
     private Date updateTime;
-    /**
-     * 状态，0失效1生效
-     */
+
+    @ApiModelProperty(name = "state", value = "状态，0失效1生效")
     private Integer state;
 
 }
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml
index 815e0ac7..f714f9e7 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml
@@ -44,12 +44,10 @@
             <if test="codeConfig.updateBy != null and codeConfig.updateBy != ''">
                 update_by = #{codeConfig.updateBy},
             </if>
-            <if test="codeConfig.updateTime != null">
-                update_time = #{codeConfig.updateTime},
-            </if>
             <if test="codeConfig.state != null">
                 state = #{codeConfig.state},
             </if>
+            update_time = sysdate()
         </set>
         where id = #{codeConfig.id}
     </update>
@@ -81,7 +79,7 @@
                 and id = #{codeConfig.id}
             </if>
             <if test="codeConfig.codeRepoName != null and codeConfig.codeRepoName != ''">
-                and code_repo_name = #{codeConfig.codeRepoName}
+                and code_repo_name LIKE CONCAT('%', #{codeConfig.codeRepoName}, '%')
             </if>
             <if test="codeConfig.codeRepoVis != null">
                 and code_repo_vis = #{codeConfig.codeRepoVis}