diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java index d3fb651571bf75ed47561117908710ae13193b1d..b4a5b66c60f47d817d41796ccd4f329cf930cd92 100644 --- a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java +++ b/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());