添加客户端资源部署

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ZipUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.code.ImageReEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
@@ -32,6 +33,8 @@ import java.util.zip.ZipEntry;
 public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleDistributeDao, DeviceModuleDistributeEntity, Long> implements DeviceModuleDistributeService {
     @Autowired
     private ProductService productService;
+    @Autowired
+    private UploadService uploadService;
 
     @Override
     protected void saveBefore(DeviceModuleDistributeEntity entity, Context context) throws AppException {
@@ -44,7 +47,9 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
     @Override
     public void active(DeviceModuleDistributeEntity distributeEntity, Context context) {
         //判断文件是否存在
-        if (FileUtil.isEmpty(new File(distributeEntity.getFilePath()))) {
+
+        String targetFilePath = uploadService.getFilePath(distributeEntity.getFilePath());
+        if (FileUtil.isEmpty(new File(targetFilePath))) {
             throw new AppException("部署文件不存在！");
         }
 
@@ -66,7 +71,7 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
             FileUtil.del(disPath);
         }
 
-        ZipUtil.unzip(distributeEntity.getFilePath(), disPath);
+        ZipUtil.unzip(targetFilePath, disPath);
         //更新
         distributeEntity.setDistributeFilePath(disPath);
         distributeEntity.setDistribute(YesNoEnum.YES.getValue());