From a3c282cdd0047d8f8029baa921b7de31e7574634 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 6 Sep 2023 00:38:10 +0800
Subject: [PATCH] update code

---
 .../controller/ProjectBuildNodeController.java    | 15 ++++++++++++++-
 .../mapper/SurProjectBuildNodeDataMapper.java     |  2 ++
 .../service/ISurProjectBuildNodeDataService.java  |  2 ++
 .../impl/SurProjectBuildNodeDataServiceImpl.java  |  5 +++++
 .../project/SurProjectBuildNodeDataMapper.xml     |  6 ++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
index 86a3d39b..396c0e38 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
@@ -82,6 +82,19 @@ public class ProjectBuildNodeController {
         List list=surProjectBuildNodeDataService.queryByProjectType(type);
         redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
         return AjaxResult.success(list);
-
     }
+
+
+    @GetMapping("/queryFinishProject")
+    public AjaxResult queryFinishProject(long projectId){
+        String key="bgscreen_projectBuildNode_queryFinishProject_"+projectId;
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            //return AjaxResult.success(obj);
+        }
+        List list=surProjectBuildNodeDataService.queryFinishProject(projectId);
+        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/mapper/SurProjectBuildNodeDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
index 7acbbb39..e67c9f91 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
@@ -76,4 +76,6 @@ public interface SurProjectBuildNodeDataMapper
     public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
 
     public List<SurProjectBuildNodeData> queryByProjectType(long type);
+
+    public List<SurProjectBuildNodeData> queryFinishProject(long projectId);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java
index 374a62b1..5aee94cc 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectBuildNodeDataService.java
@@ -81,4 +81,6 @@ public interface ISurProjectBuildNodeDataService
     public  List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
 
     public List<SurProjectBuildNodeData> queryByProjectType(long type);
+
+    public List<SurProjectBuildNodeData> queryFinishProject(long projectId);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
index c2e36bd5..ab70de95 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
@@ -185,4 +185,9 @@ public class SurProjectBuildNodeDataServiceImpl implements ISurProjectBuildNodeD
     public List<SurProjectBuildNodeData> queryByProjectType(long type) {
         return surProjectBuildNodeDataMapper.queryByProjectType(type);
     }
+
+    @Override
+    public List<SurProjectBuildNodeData> queryFinishProject(long projectId) {
+        return surProjectBuildNodeDataMapper.queryFinishProject(projectId);
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
index 6db1b9eb..ac84ebd7 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
@@ -198,4 +198,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE is_del=0 AND project_id IN (
         SELECT id FROM sur_project WHERE isdel=0 AND projecttype=#{type})
     </select>
+
+
+    <select id="queryFinishProject" parameterType="Long" resultMap="SurProjectBuildNodeDataResultNode">
+        <include refid="selectSurProjectBuildNodeDataVoByNode"/>
+        WHERE is_del=0 AND project_id =#{projectId} and end_date is not null
+    </select>
 </mapper>
\ No newline at end of file