From d81fe653d65bd5fa7a35a75c1d478d25bc735ac6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 16 八月 2024 16:24:50 +0800
Subject: [PATCH] 增加大屏推送的间隔时间,更改订单详情查询数据,增加扇形图点击查询方法,

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index e01fd73..202a852 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -2,12 +2,15 @@
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.mes.pp.entity.OptimizeProject;
 import com.mes.pp.entity.request.OptimizeRequest;
 import com.mes.pp.mapper.OptimizeProjectMapper;
 import com.mes.pp.service.OptimizeProjectService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -25,33 +28,51 @@
 @Service
 @DS("pp")
 @Slf4j
-public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
-
+public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
 
     @Override
     public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
-        log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯$硦鏌ヨ");
+        //灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯$硦鏌ヨ
         LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
+                .or(qw -> qw.eq(OptimizeProject::getState, 200))
                 .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
                 //.groupBy(OptimizeProject::getProjectNo)
         ;
-        log.info("杩斿洖宸ョ▼淇℃伅");
+        //杩斿洖宸ョ▼淇℃伅
         return this.list(wrapper);
     }
 
 
     @Override
-    public void insetProject(OptimizeProject glass) {
+    public void changeTask(String engineeringId, int state) {
+        UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
+        wrapper.eq("project_no",engineeringId)
+                .set("state",state);
+        boolean updateSuccess = this.update(wrapper);
+        log.info("宸ョ▼琛ㄦ洿鏂扮姸鎬亄}",updateSuccess);
 
     }
 
     @Override
-    public List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest) {
-        log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯$硦鏌ヨ");
-
-        log.info("杩斿洖宸ョ▼淇℃伅");
-        return this.baseMapper.saveProject(optimizeRequest);
+    public boolean overTask(UpPattenUsage sequence, int state) {
+        if(sequence.getState()==100){
+            UpdateWrapper<OptimizeProject> wrapper=new  UpdateWrapper<>();
+            wrapper.eq("project_no",sequence.getEngineeringId())
+                    .set("state",state);
+            boolean updateSuccess = this.update(wrapper);
+            log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}",updateSuccess);
+        }
+        return false;
     }
 
+    @Override
+    public List<OptimizeProject> getDoingTask() {
+        QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
+        wrapper.select("project_no,project_name")
+        .eq("state",200);
+        return this.list(wrapper);
+    }
+
+
 }

--
Gitblit v1.8.0