From 4ed658032050ccf83b90df7eed3467007d14d786 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 23 Aug 2023 00:03:39 +0800 Subject: [PATCH] update code --- .../controller/ProjectScheduleController.java | 25 ++++++++++++++++++- .../jh/project/domain/SurProjectSchedule.java | 10 ++++++++ .../mapper/SurProjectScheduleMapper.java | 7 ++++++ .../service/ISurProjectScheduleService.java | 7 ++++++ .../impl/SurProjectScheduleServiceImpl.java | 12 ++++++++- .../SmzProjectQuarterlyAssessMapper.xml | 2 +- .../project/SurProjectScheduleMapper.xml | 21 +++++++++++++++- 7 files changed, 80 insertions(+), 4 deletions(-) diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java index e8f87a5b..5a63bbb5 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java @@ -1,6 +1,8 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.redis.RedisCache; import com.yanzhu.jh.project.domain.SurProjectSchedule; import com.yanzhu.jh.project.service.ISurProjectScheduleService; import org.springframework.beans.factory.annotation.Autowired; @@ -8,16 +10,37 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.concurrent.TimeUnit; + @RestController @RequestMapping("/bgscreen/schedule") public class ProjectScheduleController { @Autowired private ISurProjectScheduleService isurProjectScheduleService; - + @Autowired + private RedisCache redisCache; @GetMapping("/projectConstructionProgress") public AjaxResult getProjectConstructionProgress(Long projectId){ SurProjectSchedule surProjectSchedule= isurProjectScheduleService.getProjectConstructionProgress(projectId); return AjaxResult.success(surProjectSchedule); } + + /** + * 按项目类型查询形象进度数据 + * @param type + * @return + */ + @GetMapping("/selectByProjectType") + public AjaxResult selectByProjectType(Long type){ + String key="bgscreen_schedule_selectByProjectType_"+type; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=isurProjectScheduleService.selectByProjectType(type); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java index 6629ee9c..5e2f4cd8 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java @@ -80,6 +80,16 @@ public class SurProjectSchedule extends BaseEntity @Excel(name = "数据状态") private Long isDel; + private SurProject surProject; + + public SurProject getSurProject() { + return surProject; + } + + public void setSurProject(SurProject surProject) { + this.surProject = surProject; + } + public void setId(Long id) { this.id = id; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java index dfe0cb20..98f778cf 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java @@ -60,4 +60,11 @@ public interface SurProjectScheduleMapper * @return 结果 */ public int deleteSurProjectScheduleByIds(Long[] ids); + + /** + * 按项目类型查询形象进度数据 + * @param type + * @return + */ + public List selectByProjectType(Long type); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java index 6ba2b959..e60604f5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java @@ -59,4 +59,11 @@ public interface ISurProjectScheduleService * @return 结果 */ public int deleteSurProjectScheduleById(Long id); + + /** + * 按项目类型查询形象进度数据 + * @param type + * @return + */ + public List selectByProjectType(Long type); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java index 1d9694bc..c3677921 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java @@ -15,7 +15,7 @@ import com.yanzhu.jh.project.service.ISurProjectScheduleService; * @date 2023-07-29 */ @Service -public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService +public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService { @Autowired private SurProjectScheduleMapper surProjectScheduleMapper; @@ -99,4 +99,14 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService { return surProjectScheduleMapper.deleteSurProjectScheduleById(id); } + + /** + * 按项目类型查询形象进度数据 + * @param type + * @return + */ + @Override + public List selectByProjectType(Long type) { + return surProjectScheduleMapper.selectByProjectType(type); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml index 488f3101..f1a53944 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * from ( SELECT s.*,p.projectName @@ -162,4 +170,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file