调整通过resManager上传图片的调用方法由uploadRes调整为uploadResAndSave。增加租户标识隔离

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsCropController.java

@@ -15,6 +15,7 @@ import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.service.ISysDictDataService;
+import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.fms.domain.FmsCrop;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AddNoValueReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsCropResVo;
@@ -56,6 +57,8 @@ public class FmsCropController extends BaseController
     private IFmsPeriodService fmsPeriodService;
     @Resource
     private IFmsLandService fmsLandService;
+    @Resource
+    private ISysResService sysResService;
     /**
      * 查询作物列表
      */
@@ -185,7 +188,7 @@ public class FmsCropController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.CROP, ResConstants.mediaType.IMG, "", file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.CROP, ResConstants.mediaType.IMG, "", file,getLoginUser());
             return success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());
@@ -201,7 +204,7 @@ public class FmsCropController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.CROP_VIDEO, ResConstants.mediaType.VIDEO, "", file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.CROP_VIDEO, ResConstants.mediaType.VIDEO, "", file,getLoginUser());
             return success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsExpertController.java

@@ -122,7 +122,7 @@ public class FmsExpertController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.EXPERT_AVATAR, ResConstants.mediaType.IMG,"",file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.EXPERT_AVATAR, ResConstants.mediaType.IMG,"",file,getLoginUser());
             return success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsPeriodController.java

@@ -137,7 +137,7 @@ public class FmsPeriodController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.PERIOD, ResConstants.mediaType.IMG, "", file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.PERIOD, ResConstants.mediaType.IMG, "", file,getLoginUser());
             return success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskController.java

@@ -548,7 +548,7 @@ public class FmsTaskController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.TASKRCD, ResConstants.mediaType.IMG,"",file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.TASKRCD, ResConstants.mediaType.IMG,"",file,getLoginUser());
             return AjaxResult.success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());
@@ -563,7 +563,7 @@ public class FmsTaskController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.TASKRCD, ResConstants.mediaType.PRE_IMG,"",file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.TASKRCD, ResConstants.mediaType.PRE_IMG,"",file,getLoginUser());
             return AjaxResult.success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskrcdController.java

@@ -161,7 +161,7 @@ public class FmsTaskrcdController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.TASKRCD, ResConstants.mediaType.IMG,"",file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.TASKRCD, ResConstants.mediaType.IMG,"",file,getLoginUser());
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", sysRes.getResUrl());
             ajax.put("resId", sysRes.getResId());

src/main/java/com/yunfeiyun/agmp/fms/controller/SysCustomerController.java

@@ -125,7 +125,7 @@ public class SysCustomerController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.CUSTOMER_QUALIFICATION, ResConstants.mediaType.IMG, "", file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.CUSTOMER_QUALIFICATION, ResConstants.mediaType.IMG, "", file,getLoginUser());
             return success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());

src/main/java/com/yunfeiyun/agmp/fms/controller/WmsFinishgoodsController.java

@@ -183,7 +183,7 @@ public class WmsFinishgoodsController extends BaseController
     {
         if (!file.isEmpty())
         {
-            SysRes sysRes  = resManager.uploadRes( ResConstants.BizType.FINISH_GOODS_PERIOD, ResConstants.mediaType.IMG, "", file,getLoginUser());
+            SysRes sysRes  = resManager.uploadResAndSave( ResConstants.BizType.FINISH_GOODS_PERIOD, ResConstants.mediaType.IMG, "", file,getLoginUser());
             return success(sysRes);
         }
         return error(ErrorCode.UPLOAD_FAIL.getCode());

src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsSupplierServiceImpl.java

@@ -144,7 +144,7 @@ public class WmsSupplierServiceImpl implements IWmsSupplierService
             return AjaxResult.error(ErrorCode.UPLOAD_FAIL.getCode());
         }
         try {
-            SysRes sysRes = resManager.uploadRes(ResConstants.BizType.SUPPLY, ResConstants.mediaType.IMG,null,file,SecurityUtils.getLoginUser());
+            SysRes sysRes = resManager.uploadResAndSave(ResConstants.BizType.SUPPLY, ResConstants.mediaType.IMG,null,file,SecurityUtils.getLoginUser());
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", sysRes.getResUrl());
             ajax.put("resId", sysRes.getResId());