修复项目成本查询bug

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -12,6 +12,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.Md5Util;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.Index.util.CacheKey;
 import org.jeecg.modules.mesInfoInstallationcost.service.IMesInfoInstallationcostService;
@@ -37,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.nio.charset.CharsetEncoder;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -113,7 +115,10 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 
 
         String superQueryParams = Arrays.toString(req.getParameterMap().get("superQueryParams"));
-        ProjectCostHuijiSumVO chcheResult = (ProjectCostHuijiSumVO) redisUtil.get(CacheKey.PROJECT_COST_HUIJI + ":" + projectCostHuiji.toString() + ":" + superQueryParams + ":" + pageNo + "&" + pageSize);
+        String superQueryParamsMd5 = Md5Util.md5Encode(superQueryParams, "utf-8");
+        String ObjectMd5 = Md5Util.md5Encode(projectCostHuiji.toString(), "utf-8");
+
+        ProjectCostHuijiSumVO chcheResult = (ProjectCostHuijiSumVO) redisUtil.get(CacheKey.PROJECT_COST_HUIJI + ":" + ObjectMd5 + ":" + superQueryParamsMd5 + ":" + pageNo + "&" + pageSize);
         if (ObjectUtils.isNotEmpty(chcheResult)) return Result.ok(chcheResult);
 
         ProjectCostHuijiSumVO sumVO = new ProjectCostHuijiSumVO();
@@ -215,7 +220,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
             sumVO.setProjectCostHuijiSum(resultHuiJiVo);
             sumVO.setPageList(pageList1);
 
-            redisUtil.set(CacheKey.PROJECT_COST_HUIJI + ":" + projectCostHuiji.toString() + ":" + superQueryParams + ":" + pageNo + "&" + pageSize, sumVO, 1000L * 60 * 60 * 10);
+            redisUtil.set(CacheKey.PROJECT_COST_HUIJI + ":" + ObjectMd5 + ":" + superQueryParamsMd5 + ":" + pageNo + "&" + pageSize, sumVO, 1000L * 60 * 60 * 10);
 
             return Result.OK(sumVO);
         } else {
@@ -248,7 +253,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
                 } else {
                     projectCostHuiji1 = projectCostHuijiService.costHJSumByProjectCostByTaskList(taskList);
                 }
-                if (projectCostHuiji1 == null) projectCostHuiji1 = new ProjectCostHuiji();
+                if (projectCostHuiji1 == null) projectCostHuiji1 = initProjectCostHuiji();
                 return projectCostHuiji1;
             });
 
@@ -325,7 +330,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
             projectCostSumVo.setProjectCostHuijiSum(resultHuiJiVo);
             projectCostSumVo.setPageList(projectCostListVOPage);
 
-            redisUtil.set(CacheKey.PROJECT_COST_HUIJI + ":" + projectCostHuiji.toString() + ":" + superQueryParams + ":" + pageNo + "&" + pageSize, sumVO, 1000L * 60 * 60 * 10);
+            redisUtil.set(CacheKey.PROJECT_COST_HUIJI + ":" + ObjectMd5 + ":" + superQueryParamsMd5 + ":" + pageNo + "&" + pageSize, projectCostSumVo, 1000L * 60 * 60 * 10);
 
             return Result.OK(projectCostSumVo);
         }