-

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -40,13 +40,21 @@ public class EconomicServiceImpl implements EconomicService {
      */
     private static final Integer TYPE = 1;
 
+    /**
+     * 默认排序
+     */
+    private static final String FIELD = "gdp";
+    private static final String ORDER = "desc";
+
+
+
 
     @Override
     public AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto) {
         if (ObjectUtil.isEmpty(dto.getYear())) {
             dto.setYear(DateUtils.getYear() - 1);
         }
-        String redisKey = CacheConstants.DATA_ECONOMIC + dto.getYear() + dto.getProvinceIds() + dto.getCityIds() + dto.getAreaIds();
+        String redisKey = CacheConstants.DATA_ECONOMIC + dto.getPageIndex() + dto.getYear() + dto.getProvinceIds() + dto.getCityIds() + dto.getAreaIds();
         Map<String, Object> cacheMap = redisCache.getCacheObject(redisKey);
         if (ObjectUtil.isNotEmpty(cacheMap)) {
             return BeanUtil.toBean(cacheMap, AjaxResult.class);
@@ -59,10 +67,13 @@ public class EconomicServiceImpl implements EconomicService {
         Map data = MapUtils.getMap(map, "data", null);
         List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
         if (ObjectUtil.isNotEmpty(list) && TYPE.equals(dto.getType())) {
-            if (ObjectUtil.isEmpty(dto.getProvinceIds()) && ObjectUtil.isEmpty(dto.getCityIds()) && ObjectUtil.isEmpty(dto.getAreaIds())) {
+            if (FIELD.equals(dto.getField()) && ORDER.equals(dto.getOrder())) {
+                if (ObjectUtil.isEmpty(dto.getProvinceIds()) && ObjectUtil.isEmpty(dto.getCityIds())
+                        && ObjectUtil.isEmpty(dto.getAreaIds()) && ObjectUtil.isEmpty(dto.getField())) {
                     redisCache.setCacheObject(redisKey, map);
                 }
             }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }