From 4428a13b7b4f7035d07013079f10ba9800b38264 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 19 四月 2024 10:20:33 +0800
Subject: [PATCH] 更新膜系实体类
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 9 ++-------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 6 ++++--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 26 +++++++++++++++++++-------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java | 2 +-
4 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
index 712cb52..222759c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
@@ -26,6 +26,7 @@
@RestController
@RequestMapping("/optimizeProject")
@Slf4j
+
public class OptimizeProjectController {
@Autowired
//鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
@@ -44,8 +45,9 @@
@PostMapping("/saveProject") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
log.info("鑾峰彇閫夋嫨濂界殑宸ョ▼id杩涜鏌ヨ鏁版嵁鍚庝繚瀛�");
- List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
- log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庤繘琛屼繚瀛�:{}", glass);
+ List<OptimizeProject> glass = optimizeProjectService.selectSaveProject(optimizeRequest);
+ log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅鍚庝繚瀛樺埌upPattenUsage琛�:{}", glass);
+ optimizeProjectService.insetupPattenUsage(glass);
//void insetProject(glass);
return Result.build(200, "", glass);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
index 61b201a..c61e331 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
@@ -18,22 +18,17 @@
/**
* 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
- *
* @return
*/
List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
-
/**
* 鏌ヨ淇濆瓨鍒板師鐗囦娇鐢ㄨ鎯呰〃鐨勬暟鎹�
- *
* @return
*/
- List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
-
+ List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest);
/**
* 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛�
- *
* @return
*/
- void insetProject(OptimizeProject glass);
+ void insetupPattenUsage(List<OptimizeProject> glass);
}
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 4ec8d74..91f35f3 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
@@ -8,9 +8,13 @@
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 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;
/**
@@ -26,14 +30,15 @@
@Slf4j
public class OptimizeProjectServiceImpl extends ServiceImpl<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())
- .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()), OptimizeProject::getProjectNo, optimizeRequest.getProjectNo())
- //.groupBy(OptimizeProject::getProjectNo)
+ wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
+ .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
+ //.groupBy(OptimizeProject::getProjectNo)
;
log.info("杩斿洖宸ョ▼淇℃伅");
return this.list(wrapper);
@@ -41,12 +46,19 @@
@Override
- public void insetProject(OptimizeProject glass) {
-
+ 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 List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest) {
+ public List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest) {
log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
log.info("杩斿洖宸ョ▼淇℃伅");
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
index 680bc4d..a92188d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
@@ -35,7 +35,7 @@
/**
* 鑶滅郴id
*/
- private Integer filmsId;
+ private String filmsId;
/**
* 瀹�
--
Gitblit v1.8.0