From b8f057970ae6d3693ad26b39c8a39392389abd6d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 17 四月 2024 09:46:58 +0800
Subject: [PATCH] 增加工程信息选择
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 8 ++
/dev/null | 51 ------------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java | 8 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 33 ++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 15 +--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java | 3
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 62 ++++++++++----
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java | 6
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 17 ++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java | 0
12 files changed, 120 insertions(+), 89 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 48631bf..eb531bf 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
@@ -1,8 +1,19 @@
package com.mes.pp.controller;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.request.OptimizeRequest;
+import com.mes.pp.service.OptimizeProjectService;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
@@ -13,8 +24,28 @@
* @since 2024-04-16
*/
@RestController
-@RequestMapping("/userinfo/optimize-project")
+@RequestMapping("/optimizeProject")
+@Slf4j
public class OptimizeProjectController {
+ @Autowired
+ //鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
+ private OptimizeProjectService optimizeProjectService;
+
+ @ApiOperation("鏄剧ず宸ョ▼閫夋嫨淇℃伅")
+ @GetMapping("/listByState") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
+ public Result<List<OptimizeProject>> listByState(@RequestBody OptimizeRequest optimizeRequest) {
+ log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
+ List<OptimizeProject> glass = optimizeProjectService.listByState(optimizeRequest);
+ log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
+ return Result.build(200, "", glass);
+ }
+
+// public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
+// log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
+// List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
+// log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
+// return Result.build(200, "", glass);
+// }
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java
index f9a85ec..75e4d99 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java
@@ -7,7 +7,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -94,7 +94,7 @@
*/
private Integer creater;
- private LocalDateTime createTime;
+ private Date createTime;
@TableField("intRemark")
private Integer intremark;
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
index 30eab79..beb015c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
@@ -7,7 +7,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -182,12 +182,12 @@
/**
* 鍒涘缓鏃堕棿
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 淇敼鏃堕棿
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 棰勭暀锛屼娇鐢ㄩ渶娉ㄦ槑
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
index be5eec9..43a8c82 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
@@ -4,6 +4,8 @@
import com.mes.pp.entity.OptimizeProject;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* <p>
* Mapper 鎺ュ彛
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 b8b4cc6..c3631d6 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
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.request.OptimizeRequest;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,9 @@
*/
public interface OptimizeProjectService extends IService<OptimizeProject> {
+ /**
+ * 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
+ * @return
+ */
+ List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
}
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 d09f0a9..c4963eb 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
@@ -1,11 +1,17 @@
package com.mes.pp.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,6 +23,17 @@
*/
@Service
@DS("pp")
+@Slf4j
public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
+
+ @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());
+ log.info("杩斿洖宸ョ▼淇℃伅");
+ return this.list(wrapper);
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
index 1330b54..e6d5946 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
@@ -17,7 +17,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -30,6 +30,7 @@
@Autowired
private BigStorageCageOutTaskService bigStorageCageOutTaskService;
+
@ApiOperation("杩涚墖浠诲姟淇℃伅")
@GetMapping("/querybigStorageCageTask")
public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
index c874c83..c8e558e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
@@ -11,7 +11,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -21,9 +21,9 @@
public class BigStorageCageOutTaskServiceImpl extends ServiceImpl<BigStorageCageOutTaskMapper, BigStorageCageOutTask> implements BigStorageCageOutTaskService {
@Override
- public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState){
- LambdaQueryWrapper<BigStorageCageOutTask> getOutTaskWrapper=new LambdaQueryWrapper<>();
- getOutTaskWrapper.eq(BigStorageCageOutTask::getTaskState,taskState);
+ public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState) {
+ LambdaQueryWrapper<BigStorageCageOutTask> getOutTaskWrapper = new LambdaQueryWrapper<>();
+ getOutTaskWrapper.eq(BigStorageCageOutTask::getTaskState, taskState);
return baseMapper.selectList(getOutTaskWrapper);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
similarity index 100%
rename from hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java
rename to hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
index 34ea858..78c21a3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -1,6 +1,7 @@
package com.mes.workstation.controller;
+import com.mes.workstation.entity.GlassInfo;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import com.mes.utils.Result;
@@ -25,7 +26,7 @@
public class UpWorkstationController {
@Autowired
private UpWorkstationService upWorkstationService;
-
+ private GlassInfo glassInfo;
@ApiOperation("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅")
@GetMapping("/list") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
public Result<List<UpWorkstation>> list() {
@@ -34,18 +35,16 @@
return Result.build(200, "", glass);
}
- @PostMapping("/updateGlassMessage") //淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
+
+ //鏂板宸ヤ綅淇℃伅淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d
+ //鍒犻櫎宸ヤ綅淇℃伅涔熺敤杩欎釜,闄や簡宸ヤ綅id鐜荤拑淇℃伅浼爊ull
+ @PostMapping("/updateGlassMessage")
@ResponseBody
public void updateGlassMessage(@RequestBody UpWorkstation upwork) {
upWorkstationService.updateGlassMessage(upwork);
}
- //todo: 鍜寀pdateGlassMessage绫讳技
-// @PostMapping("/deleteGlass") //淇敼涓�鏉″伐浣嶇殑鐜荤拑淇℃伅锛屼紶杈撳伐浣峣d灏嗙幓鐠冧俊鎭浉鍏冲瓧娈垫洿鏀逛负null
-// @ResponseBody
-// public void selectCutTerritory(int upworkid) {
-// loadGlassService.deleteGlass(upworkid);
-// }
+
@PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔�
@ResponseBody
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
deleted file mode 100644
index a0f9941..0000000
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mes.temperingglass.controller;
-import java.util.List;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.service.TemperingOverService;
-import com.mes.temperingglass.service.TemperingService;
-import com.mes.utils.Result;
-
-
-@RestController
-@RequestMapping("/Tempering")
-
-// TidyUpGlassModule 閽㈠寲妯″潡
-public class TemperingController {
-
- @Autowired
- private TemperingService temperingService;
-
- @Autowired
- private TemperingOverService temperingOverService;
-
- @GetMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
- @ResponseBody
- public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
- List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass();
- System.out.println(glass);
- return Result.build(200,"", glass);
- }
-
- @GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
- @ResponseBody
- public Result SelectIntoGlass(String ProcessId) {
- List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass();
- System.out.println(glass);
- return Result.build(200,"", glass);
- }
-
- @GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
- @ResponseBody
- public Result SelectOutGlass(String ProcessId) {
- List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass();
- System.out.println(glass);
- return Result.build(200,"", glass);
- }
-
-
-
-
-}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 30648bf..5306703 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,27 +1,51 @@
package com.mes.temperingglass.controller;
+import java.util.List;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingOverService;
+import com.mes.temperingglass.service.TemperingService;
+import com.mes.utils.Result;
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
+
@RestController
@RequestMapping("/temperingGlassInfo")
+
+// TidyUpGlassModule 閽㈠寲妯″潡
public class TemperingGlassInfoController {
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
- }
-}
+ @Autowired
+ TemperingService temperingService;
+ @Autowired
+ private TemperingOverService temperingOverService;
+
+ @GetMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
+ @ResponseBody
+ public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
+ List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass();
+ System.out.println(glass);
+ return Result.build(200,"", glass);
+ }
+
+ @GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
+ @ResponseBody
+ public Result SelectIntoGlass(String ProcessId) {
+ List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass();
+ System.out.println(glass);
+ return Result.build(200,"", glass);
+ }
+
+ @GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
+ @ResponseBody
+ public Result SelectOutGlass(String ProcessId) {
+ List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass();
+ System.out.println(glass);
+ return Result.build(200,"", glass);
+ }
+
+
+
+
+}
--
Gitblit v1.8.0