APP版本控制

src/main/java/com/ruoyi/system/service/impl/SysAppVersionServiceImpl.java

@@ -13,6 +13,8 @@ import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.annotation.Resources;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,10 +27,10 @@ import java.util.List;
 @Service
 public class SysAppVersionServiceImpl implements ISysAppVersionService
 {
-    @Autowired
+    @Resource
     private SysAppVersionMapper sysAppVersionMapper;
 
-    @Autowired
+    @Resource
     ISysConfigService configService;
 
     /**
@@ -40,9 +42,10 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService
     @Override
     public SysAppVersion selectSysAppVersionById(String id)
     {
-        /**图片前缀**/
+        /*图片前缀*/
         String url = configService.selectConfigByKey("fileUrl");
         SysAppVersion sysAppVersion = sysAppVersionMapper.selectSysAppVersionById(id);
+        sysAppVersion.setPath(url+sysAppVersion.getPath());
         sysAppVersion.setPicUrl(url+sysAppVersion.getPicUrl());
         return sysAppVersion;
     }
@@ -56,12 +59,13 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService
     @Override
     public List<SysAppVersion> selectSysAppVersionList(SysAppVersion sysAppVersion)
     {
-        /**图片前缀**/
+        /*图片前缀*/
         String url = configService.selectConfigByKey("fileUrl");
-        /**如果附件不为空，则拼接协议前缀，用来回显**/
+        /*如果附件不为空，则拼接协议前缀，用来回显*/
         List<SysAppVersion> ls = sysAppVersionMapper.selectSysAppVersionList(sysAppVersion);
-        for (int i = 0; i < ls.size(); i++) {
-            ls.get(i).setPicUrl(url + ls.get(i).getPicUrl());
+        for (SysAppVersion l : ls) {
+            l.setPath(url + l.getPath());
+            l.setPicUrl(url + l.getPicUrl());
         }
         return ls;
     }
@@ -77,14 +81,18 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService
     {
         sysAppVersion.setId(IdUtils.simpleUUID());
         sysAppVersion.setCreateTime(DateUtils.getNowDate());
-        String url = configService.selectConfigByKey("fileUrl");
-        /**如果附件不为空，则去掉协议前缀**/
+        /*如果附件不为空，则去掉协议前缀*/
+        removeUrlPrefix(sysAppVersion);
+        return sysAppVersionMapper.insertSysAppVersion(sysAppVersion);
+    }
+
+    private void removeUrlPrefix(SysAppVersion sysAppVersion) {
+        if (!"".equals(sysAppVersion.getPath()) && null != sysAppVersion.getPath()) {
+            sysAppVersion.setPath(sysAppVersion.getPath().substring(sysAppVersion.getPath().indexOf("/group")));
+        }
         if (!"".equals(sysAppVersion.getPicUrl()) && null != sysAppVersion.getPicUrl()) {
-            for (String file : sysAppVersion.getPicUrl().split(",")) {
-                sysAppVersion.setPicUrl(file.replace(url, ""));
-            }
+            sysAppVersion.setPicUrl(sysAppVersion.getPicUrl().substring(sysAppVersion.getPicUrl().indexOf("/group")));
         }
-        return sysAppVersionMapper.insertSysAppVersion(sysAppVersion);
     }
 
     /**
@@ -97,11 +105,8 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService
     public int updateSysAppVersion(SysAppVersion sysAppVersion)
     {
         sysAppVersion.setUpdateTime(DateUtils.getNowDate());
-        sysAppVersion.setPath(sysAppVersion.getPath().replaceAll("10.6.52.32:8081","218.27.3.115:9301"));
-        /**如果附件不为空，则去掉协议前缀**/
-        if (!"".equals(sysAppVersion.getPicUrl()) && null != sysAppVersion.getPicUrl()) {
-            sysAppVersion.setPicUrl(sysAppVersion.getPicUrl().substring(sysAppVersion.getPicUrl().indexOf("/group")));
-        }
+        /*如果附件不为空，则去掉协议前缀*/
+        removeUrlPrefix(sysAppVersion);
         return sysAppVersionMapper.updateSysAppVersion(sysAppVersion);
     }
 
@@ -131,9 +136,10 @@ public class SysAppVersionServiceImpl implements ISysAppVersionService
 
     @Override
     public AppVersionBO getVersionInfo(String packageName) {
-        /**图片前缀**/
+        /*图片前缀*/
         String url = configService.selectConfigByKey("fileUrl");
         AppVersionBO appVersionBO = sysAppVersionMapper.selectMaxVersion(packageName);
+        appVersionBO.setPath(url+appVersionBO.getPath());
         appVersionBO.setPicUrl(url+appVersionBO.getPicUrl());
         return appVersionBO;
     }