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 | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 20a4b32..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,6 +2,7 @@
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.github.yulichang.base.MPJBaseServiceImpl;
@@ -10,11 +11,10 @@
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
-import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import java.util.Collections;
import java.util.List;
/**
@@ -30,32 +30,19 @@
@Slf4j
public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
- @Resource
- UpPattenUsageMapper upPattenUsageMapper;
@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 insetupPattenUsage(List<OptimizeProject> glass) {
- log.info("寰幆鏌ヨ缁撴灉淇濆瓨鍒癠pPattenUsage琛ㄤ腑");
- for (OptimizeProject project : glass) {
- UpPattenUsage upPattenUsage = new UpPattenUsage();
- upPattenUsage.setEngineeringId(project.getProjectNo());
- upPattenUsage.setFilmsId(project.getGlassType());
- upPattenUsage.setState(project.getState());
- upPattenUsageMapper.insert(upPattenUsage);
- }
- }
@Override
public void changeTask(String engineeringId, int state) {
@@ -67,6 +54,25 @@
}
+ @Override
+ 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