产品版本更新分站点

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java

@@ -47,12 +47,6 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
     @Autowired
     private ISiteFeign siteFeign;
     
-    @Override
-    protected void saveBefore(DeviceModuleDistributeEntity entity, Context context) throws AppException {
-
-
-    }
-
 
     @Override
     protected void updateBefore(DeviceModuleDistributeEntity entity, Context context) throws AppException {

device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductVersionServiceImpl.java

@@ -42,6 +42,7 @@ import org.springframework.util.ObjectUtils;
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.nio.file.StandardCopyOption;
 import java.util.Date;
 import java.util.List;
 
@@ -127,8 +128,8 @@ public class ProductVersionServiceImpl extends AbstractCRUDServiceImpl<ProductVe
         if ("zip".equals(type)) {
             String disPath = filePath + "/file/fileupload/" + mainName;
             String replace = StrUtil.replace(productVersionEntity.getFilePath(), FileUtil.getName(productVersionEntity.getFilePath()), "");
-            disPath = filePathGlob+"/"+replace+mainName+"/";
-            if(!FileUtil.isDirectory(new File(disPath))){
+            disPath = filePathGlob + "/" + replace + mainName + "/";
+            if (!FileUtil.isDirectory(new File(disPath))) {
                 FileUtil.mkdir(disPath);
             }
             String fileEncode = "UTF-8";
@@ -137,7 +138,7 @@ public class ProductVersionServiceImpl extends AbstractCRUDServiceImpl<ProductVe
             } catch (Exception e) {
                 log.error("异常", e);
             }
-            log.info("unzip disPath:{}",disPath);
+            log.info("unzip disPath:{}", disPath);
             ZipUtil.unzip(targetFilePath, disPath, Charset.forName(fileEncode));
         }
         pushUpgradMsg(productVersionEntity, context);
@@ -173,7 +174,11 @@ public class ProductVersionServiceImpl extends AbstractCRUDServiceImpl<ProductVe
                 productVersion.setSiteId(sitePdu.getId());
                 productVersion.setSiteName(sitePdu.getSiteName());
                 productVersion.setSiteCode(sitePdu.getSiteCode());
-                productVersion.setFilePath("");
+                String mainName = FileUtil.mainName(productVersion.getFilePath());
+                //todo 复制附件 和地址
+                String targetFilePath = uploadService.getFilePath(sitePdu.getSiteCode() + "/" + mainName);
+                FileUtil.copyFile(productVersion.getFilePath(), targetFilePath, StandardCopyOption.REPLACE_EXISTING);
+                productVersion.setFilePath(targetFilePath);
                 this.save(productVersion, context);
             }
         }