|
@@ -18,6 +18,7 @@ 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.mesInfoInstallationcost.service.IMesInfoInstallationcostService;
|
|
|
import org.jeecg.modules.projectCost.service.IProjectCostService;
|
|
|
import org.jeecg.modules.projectCost.vo.ProjectCostVO;
|
|
@@ -66,6 +67,11 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
|
|
|
@SuppressWarnings("all")
|
|
|
private IKzksProjectCostYsService costYsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private RedisUtil redisUtil;
|
|
|
+
|
|
|
+ private static String PROJECT_COST_HUIJI = "projectCosthuiji";
|
|
|
+
|
|
|
@ApiOperation(value = "111111111111")
|
|
|
@GetMapping(value = "/children1")
|
|
|
public List<ProjectCostVO> children1(String taskno) {
|
|
@@ -105,6 +111,8 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
HttpServletRequest req) {
|
|
|
|
|
|
+ ProjectCostHuijiSumVO chcheResult = (ProjectCostHuijiSumVO) redisUtil.get(PROJECT_COST_HUIJI + ":" + pageNo + "&" + pageSize + ":" + projectCostHuiji.toString());
|
|
|
+ if (ObjectUtils.isNotEmpty(chcheResult)) return Result.ok(chcheResult);
|
|
|
|
|
|
ProjectCostHuijiSumVO sumVO = new ProjectCostHuijiSumVO();
|
|
|
|
|
@@ -123,7 +131,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
|
|
|
return projectCostHuijiService.costHuijPage(page, queryWrapper);
|
|
|
});
|
|
|
|
|
|
- CompletableFuture<Void> future1 = CompletableFuture.allOf(huijiFuture, pageFuture,ysFuture);
|
|
|
+ CompletableFuture<Void> future1 = CompletableFuture.allOf(huijiFuture, pageFuture, ysFuture);
|
|
|
future1.join();
|
|
|
ProjectCostHuiji huiji = huijiFuture.join();
|
|
|
Page<ProjectCostHuiji> pageList = pageFuture.join();
|
|
@@ -160,12 +168,15 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
|
|
|
IPage<ProjectCostHuijiListVO> pageList1 = ProjectCostHuijiConvert.INSTANCE.toHuijiListVOPage(pageList, list);
|
|
|
|
|
|
ProjectCostHuijiVo resultHuiJiVo = new ProjectCostHuijiVo();
|
|
|
- BeanUtils.copyProperties(huiji,resultHuiJiVo);
|
|
|
+ BeanUtils.copyProperties(huiji, resultHuiJiVo);
|
|
|
resultHuiJiVo.setClys(ys.getClys());
|
|
|
resultHuiJiVo.setWxys(ys.getWxys());
|
|
|
|
|
|
sumVO.setProjectCostHuijiSum(resultHuiJiVo);
|
|
|
sumVO.setPageList(pageList1);
|
|
|
+
|
|
|
+ redisUtil.set(PROJECT_COST_HUIJI + ":" + pageNo + "&" + pageSize + ":" + projectCostHuiji.toString(),sumVO,1000L*60*60*2);
|
|
|
+
|
|
|
return Result.OK(sumVO);
|
|
|
} else return Result.OK(new ProjectCostHuijiSumVO());
|
|
|
}
|