调整资源查询逻辑

src/main/java/com/yunfeiyun/agmp/tss/controller/AgmTaskPickController.java

@@ -15,6 +15,7 @@ import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 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.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.WmsWarehouse;
 import com.yunfeiyun.agmp.tss.domain.reqvo.*;
 import com.yunfeiyun.agmp.tss.domain.resvo.AgmTaskPickListResVo;
@@ -56,6 +57,8 @@ public class AgmTaskPickController extends BaseController
     private IMppMaterialService mppMaterialService;
     @Autowired
     private ResManager resManager;
+    @Resource
+    private ISysResService sysResService;
     @Autowired
     private DataAuthUtil dataAuthUtil;
     @Resource
@@ -105,7 +108,7 @@ public class AgmTaskPickController extends BaseController
         List<WmsFinishgoodsListResVo> list = agmTaskpickService.selectWmsFinishgoodsList(reqVo);
         for (WmsFinishgoodsListResVo wmsFinishgoodsListResVo : list) {
             //查询溯源图片
-            List<SysRes> res = resManager.queryRes(wmsFinishgoodsListResVo.getSourceinfoId(), ResConstants.BizType.SOURCE_INFO_AVATAR.getKey());
+            List<SysRes> res = sysResService.selectResByBusIdAndTid(wmsFinishgoodsListResVo.getSourceinfoId(), ResConstants.BizType.SOURCE_INFO_AVATAR.getKey(),reqVo.getTid());
             if (res.size() > 0) {
                 wmsFinishgoodsListResVo.setSourceinfoAvatar(res.get(0).getResUrl());
             }
@@ -133,7 +136,7 @@ public class AgmTaskPickController extends BaseController
     public AjaxResult inInfo(String finishgoodsId) {
         WmsFinishgoodsListResVo wmsFinishgoodsListResVo = agmTaskpickService.selectWmsFinishgoodsInfoById(finishgoodsId,SecurityUtils.getTid());
         //查询溯源图片
-        List<SysRes> res = resManager.queryRes(wmsFinishgoodsListResVo.getSourceinfoId(), ResConstants.BizType.SOURCE_INFO_AVATAR.getKey());
+        List<SysRes> res = sysResService.selectResByBusIdAndTid(wmsFinishgoodsListResVo.getSourceinfoId(), ResConstants.BizType.SOURCE_INFO_AVATAR.getKey(),SecurityUtils.getTid());
         if (res.size() > 0) {
             wmsFinishgoodsListResVo.setSourceinfoAvatar(res.get(0).getResUrl());
         }

src/main/java/com/yunfeiyun/agmp/tss/controller/TssSourceinfoController.java

@@ -17,6 +17,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.ISysConfigService;
+import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.TssSourceEnvironment;
 import com.yunfeiyun.agmp.tss.domain.TssSourceinfo;
 import com.yunfeiyun.agmp.tss.domain.TssSourceperiod;
@@ -53,6 +54,8 @@ public class TssSourceinfoController extends BaseController {
     private IWmsFinishgoodsService wmsFinishgoodsService;
     @Autowired
     private ResManager resManager;
+    @Resource
+    private ISysResService sysResService;
     @Autowired
     private ITssSourceEnvironmentService tssSourceEnvironmentService;
     @Autowired
@@ -116,9 +119,9 @@ public class TssSourceinfoController extends BaseController {
         TssSourceinfoListResVo resVo = new TssSourceinfoListResVo();
         BeanUtils.copyProperties(tssSourceinfo, resVo);
 
-        List<SysRes> resList1 = resManager.queryRes(sourceinfoId, ResConstants.BizType.SOURCE_INFO_AVATAR, ResConstants.mediaType.IMG);
-        List<SysRes> resList2 = resManager.queryRes(sourceinfoId, ResConstants.BizType.SOURCE_INFO_QUALITY, ResConstants.mediaType.IMG);
-        List<SysRes> resList3 = resManager.queryRes(sourceinfoId, ResConstants.BizType.SOURCE_INFO_FIGURE.getKey());
+        List<SysRes> resList1 = sysResService.selectResByBusIdAndTid(sourceinfoId, ResConstants.BizType.SOURCE_INFO_AVATAR.getKey(),SecurityUtils.getTid() );
+        List<SysRes> resList2 = sysResService.selectResByBusIdAndTid(sourceinfoId, ResConstants.BizType.SOURCE_INFO_QUALITY.getKey(), SecurityUtils.getTid());
+        List<SysRes> resList3 = sysResService.selectResByBusIdAndTid(sourceinfoId, ResConstants.BizType.SOURCE_INFO_FIGURE.getKey(),SecurityUtils.getTid());
         resVo.setAvatarPreview(getResUrl(resList1));
         resVo.setAvatarResIds(getResIds(resList1));
         resVo.setQualityPreview(getResUrl(resList2));
@@ -132,7 +135,7 @@ public class TssSourceinfoController extends BaseController {
         tssSourceperiod.setTid(SecurityUtils.getTid());
         List<TssSourceperiod> tssSourceperiods = tssSourceperiodService.selectTssSourceperiodList(tssSourceperiod);
         for (TssSourceperiod sourceperiod : tssSourceperiods) {
-            List<SysRes> resList4 = resManager.queryRes(sourceperiod.getSourceperiodId(), ResConstants.BizType.SOURCE_INFO_PERIOD, ResConstants.mediaType.IMG);
+            List<SysRes> resList4 = sysResService.selectResByBusIdAndTid(sourceperiod.getSourceperiodId(), ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(), SecurityUtils.getTid());
             sourceperiod.setPeriodResIds(getResIds(resList4));
             sourceperiod.setPeriodPreview(getResUrl(resList4));
 
@@ -142,7 +145,7 @@ public class TssSourceinfoController extends BaseController {
             childReqVo.setSourceperiodParentid(sourceperiod.getSourceperiodId());
             List<TssSourceperiod> sourceperiods = tssSourceperiodService.selectTssSourceperiodList(childReqVo);
             for (TssSourceperiod sourceperiod1 : sourceperiods) {
-                List<SysRes> resList5 = resManager.queryRes(sourceperiod1.getSourceperiodId(), ResConstants.BizType.SOURCE_INFO_PERIOD, ResConstants.mediaType.IMG);
+                List<SysRes> resList5 = sysResService.selectResByBusIdAndTid(sourceperiod1.getSourceperiodId(), ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(), SecurityUtils.getTid());
                 sourceperiod1.setPeriodResIds(getResIds(resList5));
                 sourceperiod1.setPeriodPreview(getResUrl(resList5));
             }
@@ -156,7 +159,7 @@ public class TssSourceinfoController extends BaseController {
         tssSourceEnvironment.setTid(SecurityUtils.getTid());
         List<TssSourceEnvironment> tssSourceEnvironments = tssSourceEnvironmentService.selectTssSourceEnvironmentList(tssSourceEnvironment);
         for (TssSourceEnvironment tssSourceEnvironment1 : tssSourceEnvironments) {
-            List<SysRes> resList5 = resManager.queryRes(tssSourceEnvironment1.getSourceEnvironmentId(), ResConstants.BizType.SOURCE_INFO_ENVIRONMENT, ResConstants.mediaType.IMG);
+            List<SysRes> resList5 = sysResService.selectResByBusIdAndTid(tssSourceEnvironment1.getSourceEnvironmentId(), ResConstants.BizType.SOURCE_INFO_ENVIRONMENT.getKey(),SecurityUtils.getTid());
             tssSourceEnvironment1.setEnvironmentResIds(getResIds(resList5));
             tssSourceEnvironment1.setEnvironmentPreviews(getResUrl(resList5));
         }

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

@@ -15,6 +15,7 @@ import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 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.tss.domain.WmsFinishgoods;
 import com.yunfeiyun.agmp.tss.domain.reqvo.AppSeedOutAddHistoryListReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.MppMaterialReqVo;
@@ -55,6 +56,8 @@ public class WmsFinishgoodsController extends BaseController {
     private DataAuthUtil dataAuthUtil;
     @Resource
     private ISysDictDataService sysDictDataService;
+    @Resource
+    private ISysResService sysResService;
 
     /**
      * 查询农产品货物列表
@@ -136,7 +139,7 @@ public class WmsFinishgoodsController extends BaseController {
     public AjaxResult getInfo(@RequestParam("finishgoodsId") String finishgoodsId) {
         WmsFinishgoodsInfoResVo resVo = wmsFinishgoodsService.selectWmsFinishgoodsByFinishgoodsId(finishgoodsId,SecurityUtils.getTid());
         //查询图片
-        List<SysRes> res = resManager.queryRes(finishgoodsId, ResConstants.BizType.SOURCE_INFO_AVATAR, ResConstants.mediaType.IMG);
+        List<SysRes> res = sysResService.selectResByBusIdAndTid(finishgoodsId, ResConstants.BizType.SOURCE_INFO_AVATAR.getKey(),SecurityUtils.getTid());
         String resIds = "";
         for (SysRes re : res) {
             resIds += re.getResId() + ",";

src/main/java/com/yunfeiyun/agmp/tss/controller/WmsSupplierController.java

@@ -10,6 +10,7 @@ import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 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.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
 import com.yunfeiyun.agmp.tss.domain.reqvo.WmsSupplierAddReqVo;
 import com.yunfeiyun.agmp.tss.service.IWmsSupplierService;
@@ -18,6 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -34,6 +36,8 @@ public class WmsSupplierController extends BaseController {
     private IWmsSupplierService wmsSupplierService;
     @Autowired
     private ResManager resManager;
+    @Resource
+    private ISysResService sysResService;
 
     /**
      * 查询供应商列表
@@ -63,7 +67,7 @@ public class WmsSupplierController extends BaseController {
     @PreAuthorize("@ss.hasPermi('wms:supplier:info')")
     @GetMapping(value = "/info")
     public AjaxResult getInfo(@RequestParam("supplierId") String supplierId) {
-        List<SysRes> sysResList = resManager.queryRes(supplierId, ResConstants.BizType.SUPPLY.getKey());
+        List<SysRes> sysResList = sysResService.selectResByBusIdAndTid(supplierId, ResConstants.BizType.SUPPLY.getKey(),SecurityUtils.getTid());
         WmsSupplier wmsSupplier = wmsSupplierService.selectWmsSupplierBySupplierId(supplierId,SecurityUtils.getTid());
         if(!sysResList.isEmpty())
         {

src/main/java/com/yunfeiyun/agmp/tss/service/impl/AgmTaskpickServiceImpl.java

@@ -17,6 +17,7 @@ import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.common.web.system.service.ISysConfigService;
 import com.yunfeiyun.agmp.common.web.system.service.ISysCusareaService;
+import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.*;
 import com.yunfeiyun.agmp.tss.domain.dto.FmsTaskrcdListDto;
 import com.yunfeiyun.agmp.tss.domain.reqvo.*;
@@ -26,8 +27,7 @@ import com.yunfeiyun.agmp.tss.domain.resvo.FmsTaskResVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.WmsFinishgoodsListResVo;
 import com.yunfeiyun.agmp.tss.mapper.*;
 import com.yunfeiyun.agmp.tss.service.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,8 +47,8 @@ import java.util.List;
  * @date 2023-05-23
  */
 @Service
+@Slf4j
 public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
-    private final Logger log = LoggerFactory.getLogger(AgmTaskpickServiceImpl.class);
     private static final String QUALITY_CHECK_IMG_URL = "https://yunfei-agm.oss-cn-hangzhou.aliyuncs.com/agmpb1.2.0.0_20230628/mppQualityCheck/20240314/hgz_95b4cfc2c5b646fea8de78bacdf669b6.jpg";
 
 
@@ -104,6 +104,8 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
     private NoGenerator noGenerator;
     @Resource
     private ISysCusareaService sysCusareaService;
+    @Resource
+    private ISysResService sysResService;
 
 
     @Override
@@ -428,7 +430,7 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService {
         appSeedOutAddInfoResVo.setCusareaLevelname(sysCusarea.getCusareaLevelname());
         appSeedOutAddInfoResVo.setSupplierName(supplier.getSupplierName());
         appSeedOutAddInfoResVo.setQualitycheckOrgName(checkCompany.getSupplierName());
-        List<SysRes> resList = resManager.queryRes( finishgoodsId,ResConstants.BizType.FINISH_GOODS_OUT_ADD_PERIOD.getKey());
+        List<SysRes> resList = sysResService.selectResByBusIdAndTid( finishgoodsId,ResConstants.BizType.FINISH_GOODS_OUT_ADD_PERIOD.getKey(),tid);
         appSeedOutAddInfoResVo.setProcessImgResList(resList);
         return appSeedOutAddInfoResVo;
     }

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

@@ -96,7 +96,7 @@ public class WmsSupplierServiceImpl implements IWmsSupplierService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateWmsSupplier(WmsSupplierAddReqVo  wmsSupplierAddReqVo) {
-        List<SysRes> oldRes = resManager.queryRes(wmsSupplierAddReqVo.getSupplierId(),ResConstants.BizType.SUPPLY,ResConstants.mediaType.IMG);
+        List<SysRes> oldRes = sysResService.selectResByBusIdAndTid(wmsSupplierAddReqVo.getSupplierId(),ResConstants.BizType.SUPPLY.getKey(),wmsSupplierAddReqVo.getTid());
         if(oldRes.isEmpty()){
             if (!StringUtils.isEmpty(wmsSupplierAddReqVo.getSupplierQualificationResId())) {
                 resManager.updateRes(wmsSupplierAddReqVo.getSupplierQualificationResId(),wmsSupplierAddReqVo.getSupplierId());