Merge remote-tracking branch 'origin/feat_file_compare_manger' into feat_wangshuo

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRepoController.java

@@ -76,7 +76,7 @@ public class SysRepoController extends BaseController
     {
         sysRepo.setCreateBy(getUsername());
         sysRepo.setUpdateBy(getUsername());
-        String filename = StringUtils.substringAfterLast(sysRepo.getUrl(), "\\");
+        String filename = StringUtils.substringAfterLast(sysRepo.getUrl(), "/");
         sysRepo.setFileName(filename);
         return toAjax(sysRepoService.insertSysRepo(sysRepo));
     }
@@ -87,23 +87,26 @@ public class SysRepoController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:repo:updateFile')")
     @Log(title = "更新文件版本", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/upload_file")
-    public AjaxResult upload_file(@RequestBody SysRepo sysRepo_new)
+    public AjaxResult upload_file(@RequestBody SysRepo sysRepo)
     {
-        if(sysRepo_new.getRepoId()==null || sysRepo_new.getUrl()==null ){
+        if(sysRepo.getRepoId()==null || sysRepo.getUrl()==null ){
             return AjaxResult.error("参数错误");
         }else{
-            Long repoId = sysRepo_new.getRepoId();
-            SysRepo sysRepo = sysRepoService.selectSysRepoByRepoId(repoId);
+            SysRepo  sysRepo_old = sysRepoService.selectSysRepoByRepoId(sysRepo.getRepoId());
+            sysRepo.setUpdateBy(getUsername());
+            String filename = StringUtils.substringAfterLast(sysRepo.getUrl(), "/");
+            sysRepo.setFileName(filename);
+            sysRepo.setVersion("v1.1.1");
             SysRepoHistory sysRepoHistory = new SysRepoHistory();
-            sysRepoHistory.setRepoId(sysRepo.getRepoId());
-            sysRepoHistory.setUrl(sysRepo.getUrl());
-            sysRepoHistory.setUploadBy(sysRepo.getUpdateBy());
-            sysRepoHistory.setVersion("v0.0.1");
+            sysRepoHistory.setRepoId(sysRepo_old.getRepoId());
+            sysRepoHistory.setUrl(sysRepo_old.getUrl());
+            sysRepoHistory.setUploadBy(sysRepo_old.getUpdateBy());
+            sysRepoHistory.setFileName(sysRepo_old.getFileName());
+            sysRepoHistory.setVersion(sysRepo_old.getVersion());
+            sysRepoHistory.setRemark(sysRepo_old.getRemark());
             if(sysRepoHistoryService.insertSysRepoHistory(sysRepoHistory)<1){
                 return AjaxResult.error("文件插入失败");
             }
-            sysRepo.setUpdateBy(getUsername());
-            sysRepo.setUrl(sysRepo_new.getUrl());
             if(sysRepoService.updateSysRepo(sysRepo)<1){
                 return AjaxResult.error("文件插入失败");
             }
@@ -132,15 +135,27 @@ public class SysRepoController extends BaseController
     @PostMapping(value = "/back_file")
     public AjaxResult upload_file(@RequestBody SysRepoHistory sysRepoHistory)
     {
-        Long repoId = sysRepoHistory.getRepoId();
-        SysRepo sysRepo = sysRepoService.selectSysRepoByRepoId(repoId);
-        SysRepoHistory sysRepoHistory1 = sysRepoHistoryService.selectSysRepoHistoryByHId(sysRepoHistory.gethId());
-        sysRepoHistory1.sethId(null);
-        if(sysRepoHistoryService.insertSysRepoHistory(sysRepoHistory1)<1){
+        SysRepo  sysRepo = sysRepoService.selectSysRepoByRepoId(sysRepoHistory.getRepoId());
+        SysRepoHistory sysRepoHistory_repo = new SysRepoHistory();
+        sysRepoHistory_repo.setRepoId(sysRepo.getRepoId());
+        sysRepoHistory_repo.setUrl(sysRepo.getUrl());
+        sysRepoHistory_repo.setUploadBy(sysRepo.getUpdateBy());
+        sysRepoHistory_repo.setFileName(sysRepo.getFileName());
+        sysRepoHistory_repo.setVersion(sysRepo.getVersion());
+        sysRepoHistory_repo.setRemark(sysRepo.getRemark());
+        if(sysRepoHistoryService.insertSysRepoHistory(sysRepoHistory_repo)<1){
             return AjaxResult.error("文件插入失败");
         }
+//        SysRepoHistory sysRepoHistory_back = sysRepoHistoryService.selectSysRepoHistory(sysRepoHistory);
+//        sysRepoHistory_back.sethId(null);
+//        if(sysRepoHistoryService.insertSysRepoHistory(sysRepoHistory_back)<1){
+//            return AjaxResult.error("文件插入失败");
+//        }
         sysRepo.setUpdateBy(getUsername());
         sysRepo.setUrl(sysRepoHistory.getUrl());
+        sysRepo.setVersion(sysRepoHistory.getVersion());
+        sysRepo.setFileName(sysRepoHistory.getFileName());
+        sysRepo.setRemark("回滚版本"+sysRepoHistory.getVersion());
         if(sysRepoService.updateSysRepo(sysRepo)<1){
             return AjaxResult.error("文件插入失败");
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRepo.java

@@ -53,6 +53,9 @@ public class SysRepo extends BaseEntity
     /** url */
     private String  url;
 
+    /** 备注 **/
+    private String remark;
+
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
     public Long getRepoId() 
@@ -138,6 +141,16 @@ public class SysRepo extends BaseEntity
         this.url = url;
     }
 
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -154,6 +167,7 @@ public class SysRepo extends BaseEntity
             .append("version", getVersion())
             .append("isDelete", getIsDelete())
             .append("url", getIsDelete())
+            .append("remark",getRemark())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRepoHistory.java

@@ -33,6 +33,9 @@ public class SysRepoHistory extends BaseEntity
     /** 文件名 **/
     private String fileName;
 
+    /** 备注 **/
+    private String remark;
+
     public void sethId(Long hId) 
     {
         this.hId = hId;
@@ -91,6 +94,13 @@ public class SysRepoHistory extends BaseEntity
 		return fileName;
 	}
 
+    public void setRemark(String remark) {
+		this.remark = remark;
+	}
+    public String getRemark() {
+		return remark;
+	}
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -100,6 +110,7 @@ public class SysRepoHistory extends BaseEntity
             .append("version", getVersion())
             .append("url", getUrl())
             .append("fileName", getFileName())
+            .append("remark", getRemark())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRepoHistoryMapper.java

@@ -27,6 +27,16 @@ public interface SysRepoHistoryMapper
      */
     public List<SysRepoHistory> selectSysRepoHistoryList(SysRepoHistory sysRepoHistory);
 
+
+    /**
+     * 根据条件查询文件历史
+     *
+     * @param sysRepoHistory 文件历史相关的信息
+     * @return 文件历史
+     */
+    public SysRepoHistory selectSysRepoHistory(SysRepoHistory sysRepoHistory);
+
+
     /**
      * 新增文件历史
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRepoHistoryService.java

@@ -27,6 +27,15 @@ public interface ISysRepoHistoryService
      */
     public List<SysRepoHistory> selectSysRepoHistoryList(SysRepoHistory sysRepoHistory);
 
+    /**
+     * 查询仓库历史版本列表
+     *
+     * @param sysRepoHistory 仓库历史版本
+     * @return 仓库历史版本集合
+     */
+    public SysRepoHistory selectSysRepoHistory(SysRepoHistory sysRepoHistory);
+
+
     /**
      * 新增仓库历史版本
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRepoHistoryServiceImpl.java

@@ -43,6 +43,18 @@ public class SysRepoHistoryServiceImpl implements ISysRepoHistoryService
         return sysRepoHistoryMapper.selectSysRepoHistoryList(sysRepoHistory);
     }
 
+    /**
+     * 查询仓库历史版本
+     *
+     * @param sysRepoHistory 仓库历史版本
+     * @return 仓库历史版本
+     */
+    @Override
+    public SysRepoHistory selectSysRepoHistory(SysRepoHistory sysRepoHistory)
+    {
+        return sysRepoHistoryMapper.selectSysRepoHistory(sysRepoHistory);
+    }
+
     /**
      * 新增仓库历史版本
      * 

ruoyi-system/src/main/resources/mapper/system/SysRepoHistoryMapper.xml

@@ -11,10 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="version"    column="version"    />
         <result property="url"    column="url"    />
         <result property="fileName"    column="file_name"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectSysRepoHistoryVo">
-        select h_id, repo_id, upload_by, version, url, file_name from sys_repo_history
+        select h_id, repo_id, upload_by, version, url, file_name, remark from sys_repo_history
     </sql>
 
     <select id="selectSysRepoHistoryList" parameterType="SysRepoHistory" resultMap="SysRepoHistoryResult">
@@ -25,6 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null  and version != ''"> and version = #{version}</if>
             <if test="url != null  and url != ''"> and url = #{url}</if>
             <if test="fileName != null  and fileName != ''"> and file_name = #{fileName}</if>
+            <if test="remark != null and remark != ''"> and remark = #{remark}</if>
+        </where>
+    </select>
+
+    <select id="selectSysRepoHistory" parameterType="SysRepoHistory" resultMap="SysRepoHistoryResult">
+        <include refid="selectSysRepoHistoryVo"/>
+        <where>
+            <if test="repoId != null "> and repo_id = #{repoId}</if>
+            <if test="uploadBy != null  and uploadBy != ''"> and upload_by = #{uploadBy}</if>
+            <if test="version != null  and version != ''"> and version = #{version}</if>
+            <if test="url != null  and url != ''"> and url = #{url}</if>
+            <if test="fileName != null  and fileName != ''"> and file_name = #{fileName}</if>
+            <if test="remark != null and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
     
@@ -41,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null and version != ''">version,</if>
             <if test="url != null and url != ''">url,</if>
             <if test="fileName != null  and fileName != ''">file_name,</if>
+            <if test="remark != null and remark != ''">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="repoId != null">#{repoId},</if>
@@ -48,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null and version != ''">#{version},</if>
             <if test="url != null and url != ''">#{url},</if>
             <if test="fileName != null  and fileName != ''">#{fileName},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
          </trim>
     </insert>
 
@@ -59,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null and version != ''">version = #{version},</if>
             <if test="url != null and url != ''">url = #{url},</if>
             <if test="fileName != null  and fileName != ''">file_name = #{fileName},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
         </trim>
         where h_id = #{hId}
     </update>

ruoyi-system/src/main/resources/mapper/system/SysRepoMapper.xml

@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="version"    column="version"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="url"    column="url"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectSysRepoVo">
-        select repo_Id, repo_name, create_by, update_by, repo_type, repo_status, create_Time, update_Time, file_name, group_id, version, is_delete, url from sys_repo
+        select repo_Id, repo_name, create_by, update_by, repo_type, repo_status, create_Time, update_Time, file_name, group_id, version, is_delete, url, remark from sys_repo
     </sql>
 
     <select id="selectSysRepoList" parameterType="SysRepo" resultMap="SysRepoResult">
@@ -37,9 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null  and version != ''"> and version = #{version}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="url != null and url != ''"> and url = #{url}</if>
+            <if test="remark != null and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
-    
+
     <select id="selectSysRepoByRepoId" parameterType="Long" resultMap="SysRepoResult">
         <include refid="selectSysRepoVo"/>
         where repo_Id = #{repoId}
@@ -60,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">version,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="url != null and url != ''">url,</if>
+            <if test="remark != null and remark != ''">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="repoName != null and repoName != ''">#{repoName},</if>
@@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">#{version},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="url != null and url != ''">#{url},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
          </trim>
     </insert>
 
@@ -92,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">version = #{version},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="url != null and url != ''">url = #{url},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
         </trim>
         where repo_Id = #{repoId}
     </update>