1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -21,9 +21,7 @@ import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.ExportVView;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseNumView;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseBaseInfoMapper;
@@ -5601,14 +5599,26 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         //  公司ID
         pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
         pageView.put("searchKeyWord", warehouseBaseInfo.getSearchKeyWord());
-        pageView.put("startDate", warehouseBaseInfo.getStartDate());
-        pageView.put("endDate", warehouseBaseInfo.getEndDate());
+        pageView.put("startDate", warehouseBaseInfo.getWarehouseStartDate());
+        pageView.put("endDate", warehouseBaseInfo.getWarehouseEndDate());
         pageView.put("pageSize", warehouseBaseInfo.getPageSize());
         pageView.put("currentPage", warehouseBaseInfo.getCurrentPage());
+        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_WAREHOUSEINFO+JSONObject.toJSONString(pageView),WarehouseBaseInfo.class);
+        if(listRedis != null && listRedis.size() > 0 ){
+            Long countRedis = Long.parseLong(cacheComponent.getRaw(Const.ADMIN_WAREHOUSEINFO_NUM+JSONObject.toJSONString(pageView)));
+            Page<WarehouseBaseInfo> page = new Page<>();
+            page.setRecords(listRedis == null ? Lists.newArrayList() : listRedis);
+            page.setTotal(countRedis == null ? 0 : countRedis);
+            page.setCurrent(warehouseBaseInfo.getCurrentPage());
+            page.setSize(warehouseBaseInfo.getPageSize());
+            return page;
+        }
         // 查询服务商总数
         Integer dataCount = baseMapper.getBaseCountByCondition(pageView);
         List<WarehouseBaseInfo> dataList = baseMapper.getBaseListByCondition(pageView);
 
+        cacheComponent.putRaw(Const.ADMIN_WAREHOUSEINFO+JSONObject.toJSONString(pageView), JSONObject.toJSONString(dataList),60*60*24);
+        cacheComponent.putRaw(Const.ADMIN_WAREHOUSEINFO_NUM+JSONObject.toJSONString(pageView), dataCount+"",60*60*24);
 
         Page<WarehouseBaseInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
@@ -5632,10 +5642,20 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
         pageView.put("startDate", warehouseBaseInfo.getWarehouseStartDate());
         pageView.put("endDate", warehouseBaseInfo.getWarehouseEndDate());
-        List<WarehouseBaseInfo> dataList = baseMapper.getWarehouseChartByCondition(pageView);
-        List<WarehouseBaseInfo> dataList1 = baseMapper.getWarehouseFormByCondition(pageView);
-        warehouseBaseInfo1.setChartList(dataList);
-        warehouseBaseInfo1.setFormList(dataList1);
+        List<WarehouseBaseInfo> dataList = new ArrayList<>();
+        List<WarehouseBaseInfo> dataList1 = new ArrayList<>();
+        dataList = cacheComponent.getObjList(Const.ADMIN_WAREHOUSEINFOCHAR+JSONObject.toJSONString(pageView), WarehouseBaseInfo.class);
+        dataList1 = cacheComponent.getObjList(Const.ADMIN_WAREHOUSEINFOFORM+JSONObject.toJSONString(pageView), WarehouseBaseInfo.class);
+        if(dataList != null){
+            warehouseBaseInfo1.setChartList(dataList);
+            warehouseBaseInfo1.setFormList(dataList1);
+        }
+        else{
+            dataList = baseMapper.getWarehouseChartByCondition(pageView);
+            dataList1 = baseMapper.getWarehouseFormByCondition(pageView);
+            cacheComponent.putRaw(Const.ADMIN_WAREHOUSEINFOCHAR+JSONObject.toJSONString(pageView), JSONObject.toJSONString(dataList),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_WAREHOUSEINFOFORM+JSONObject.toJSONString(pageView), JSONObject.toJSONString(dataList1),60*60*24);
+        }
 
         return warehouseBaseInfo1;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/Const.java

@@ -40,4 +40,8 @@ public class Const {
     public static final String ADMIN_WEIGHINGINFO = "ADMIN_WEIGHINGINFO_";
     public static final String ADMIN_WEIGHINGINFO_NUM = "ADMIN_WEIGHINGINFO_NUM_";
     public static final String ADMIN_BI_INFO = "ADMIN_BI_INFO_";
+    public static final String ADMIN_WAREHOUSEINFO = "ADMIN_WAREHOUSEINFO_";
+    public static final String ADMIN_WAREHOUSEINFO_NUM = "ADMIN_WAREHOUSEINFO_NUM_";
+    public static final String ADMIN_WAREHOUSEINFOCHAR = "ADMIN_WAREHOUSEINFOCHAR_";
+    public static final String ADMIN_WAREHOUSEINFOFORM = "ADMIN_WAREHOUSEINFOFORM_";
 }