From 8a9b0adc7fe0f72c4de8c8e5d14e282f5913d63d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 十二月 2024 14:48:36 +0800
Subject: [PATCH] 1、fixbug:笼内玻璃错乱问题解决 2、中空问题修复：避免多个线程拿到的空格相同 3、swagger名称显示
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java | 2 +
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java | 3 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java | 2 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java | 2 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 3 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java | 2 +
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java | 2 +
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 11 +++--
hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java | 2 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 2
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/DamageDetailsController.java | 1
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java | 3 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassRelationInfo.java | 3 +
hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml | 18 +++-----
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 3 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/BasicDataProduceController.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java | 2
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 9 ++--
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassInfo.java | 3 +
33 files changed, 64 insertions(+), 39 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index 63c1825..5ff144b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -21,7 +21,7 @@
* @author wu
* @since 2024-06-25
*/
-@Api(description = "鎶ュ伐淇℃伅")
+@Api(tags = "鎶ュ伐淇℃伅")
@RestController
@RequestMapping("/damage")
@ResponseBody
@@ -29,6 +29,7 @@
@Autowired(required=true)
private DamageService damageService;
+
@ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
@PostMapping("/selectDamage")
public Result selectDamage(@RequestBody Map map) {
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
index 612845f..7fc0be5 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
@@ -1,6 +1,7 @@
package com.mes.glassinfo.controller;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -13,6 +14,7 @@
* @author wu
* @since 2024-04-29
*/
+@Api(tags = "鐜荤拑灏忕墖淇℃伅")
@RestController
@RequestMapping("/glassinfo/glass-info")
public class GlassInfoController {
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java
index 6ed83af..a772b6e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java
@@ -1,5 +1,7 @@
package com.mes.opctask.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.Date;
@@ -16,6 +18,7 @@
/**
* 鍘嗗彶浠诲姟id
*/
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 浠诲姟璇锋眰 0鏃犱换鍔� 1涓婄墖
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
index 06f0c22..ab39284 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
@@ -3,6 +3,7 @@
import com.mes.order.entity.Orders;
import com.mes.order.service.OrdersService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@
* @author wu
* @since 2024-06-17
*/
+@Api(tags = "璁㈠崟淇℃伅")
@RestController
@RequestMapping("/order/order")
@Slf4j
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/BasicDataProduceController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/BasicDataProduceController.java
index e275d47..eca9040 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/BasicDataProduceController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/BasicDataProduceController.java
@@ -20,7 +20,7 @@
* @author wu
* @since 2024-07-25
*/
-@Api(description = "鐢熶骇鍩虹鏁版嵁")
+@Api(tags = "鐢熶骇鍩虹鏁版嵁")
@RestController
@RequestMapping("/basic_data_produce")
public class BasicDataProduceController {
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/DamageDetailsController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/DamageDetailsController.java
index 37515ca..26a0918 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/DamageDetailsController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/DamageDetailsController.java
@@ -22,6 +22,7 @@
* @author wu
* @since 2024-07-26
*/
+@Api(tags = "鐮存崯璇︽儏淇℃伅")
@RestController
@RequestMapping("/damage_details")
public class DamageDetailsController {
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 38fc688..0e5e8cf 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
@@ -5,6 +5,7 @@
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,10 +21,10 @@
* @author zhoush
* @since 2024-04-16
*/
+@Api(tags = "宸ョ▼淇℃伅")
@RestController
@RequestMapping("/optimizeProject")
@Slf4j
-
public class OptimizeProjectController {
@Autowired
//鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
index 375cbc7..6189f9b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
@@ -5,6 +5,7 @@
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.pp.service.ReportingWorkService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@
* @author wu
* @since 2024-06-26
*/
+@Api(tags = "宸ョ▼閫夋嫨淇℃伅")
@RestController
@RequestMapping("/reporting_work/reporting-work")
@Slf4j
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
index 7cc83b8..85c84b2 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
@@ -20,7 +20,7 @@
* @author wu
* @since 2024-07-01
*/
-@Api(description = "鍊肩彮淇℃伅")
+@Api(tags = "鍊肩彮淇℃伅")
@RestController
@RequestMapping("/work_assignment")
public class WorkAssignmentController {
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
index b507a45..8fdf88b 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
@@ -17,7 +17,7 @@
* @author zhoush
* @since 2024-04-11
*/
-@Api(description = "鑿滃崟绠＄悊")
+@Api(tags = "鑿滃崟绠＄悊")
@RestController
@RequestMapping("/sys/menu")
public class SysMenuController {
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
index f752b45..3a5d711 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
@@ -22,7 +22,7 @@
* @author zhoush
* @since 2024-04-11
*/
-@Api(description = "瑙掕壊绠＄悊")
+@Api(tags = "瑙掕壊绠＄悊")
@RestController
@RequestMapping("/sys/role")
public class SysRoleController {
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index e897e65..a380ddf 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -27,7 +27,7 @@
* @author zhoush
* @since 2024-04-11
*/
-@Api(description = "鐢ㄦ埛绠＄悊")
+@Api(tags = "鐢ㄦ埛绠＄悊")
@RestController
@RequestMapping("/sys/user")
public class SysUserController {
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java
index 8e16a5e..ac27238 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java
@@ -4,6 +4,7 @@
import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +20,7 @@
* @author wu
* @since 2024-05-11
*/
+@Api(tags = "纾ㄨ竟闃熷垪淇℃伅")
@RestController
@RequestMapping("/edgGlassTaskInfo")
public class EdgGlassTaskInfoController {
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
index 60e6139..6096f13 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -68,7 +68,7 @@
public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
.select("line")
- .eq("status", 1)
+ .eq("state", 1)
.groupBy("line");
return this.list(wrapper);
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
index 362b306..7eb5d0b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
@@ -6,6 +6,7 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -18,6 +19,7 @@
* @author makejava
* @since 2024-10-27 21:04:29
*/
+@Api(tags = "鍗х悊鍘嗗彶浠诲姟")
@RestController
@RequestMapping("edgStorageDeviceTaskHistory")
public class EdgStorageDeviceTaskHistoryController {
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index 9911a6f..577dd92 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -21,7 +21,7 @@
* @author zhoush
* @since 2024-04-07
*/
-@Api(description = "璇嗗埆鏄剧ず")
+@Api(tags = "璇嗗埆鏄剧ず")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
index 6980cfb..9e0ce6c 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -18,7 +18,7 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "鐞嗙墖绗间俊鎭�")
+@Api(tags = "鐞嗙墖绗间俊鎭�")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index b069d57..280a6bf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -29,7 +29,7 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "鐞嗙墖绗艰鎯�")
+@Api(tags = "鐞嗙墖绗艰鎯�")
@RestController
@RequestMapping("/bigStorageCageDetails")
public class BigStorageCageDetailsController {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassInfo.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassInfo.java
index 39fa8c0..767fc19 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassInfo.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassInfo.java
@@ -1,5 +1,7 @@
package com.mes.bigstorage.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
/**
@@ -13,6 +15,7 @@
/**
* /*澶х悊鐗囩淇℃伅琛╥d
*/
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* /*鐜荤拑id
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassRelationInfo.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassRelationInfo.java
index ccc1fd5..8cb3996 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassRelationInfo.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageGlassRelationInfo.java
@@ -1,5 +1,7 @@
package com.mes.bigstorage.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
/**
@@ -13,6 +15,7 @@
/**
* /*閽㈠寲鐜荤拑鍏崇郴琛╥d
*/
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
private String engineerId;
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
index dab2e01..f423dbb 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
@@ -20,7 +20,7 @@
* @author zhoush
* @since 2024-04-16
*/
-@Api(description = "杩涚墖浠诲姟淇℃伅")
+@Api(tags = "杩涚墖浠诲姟淇℃伅")
@RestController
@RequestMapping("/big-storage-cage-feed-task")
public class BigStorageCageFeedTaskController {
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 cd4e8db..0f06894 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
@@ -20,7 +20,7 @@
* @author zhoush
* @since 2024-04-16
*/
-@Api(description = "鍑虹墖浠诲姟淇℃伅")
+@Api(tags = "鍑虹墖浠诲姟淇℃伅")
@RestController
@RequestMapping("/big-storage-cage-out-task")
public class BigStorageCageOutTaskController {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java
index b8b8a9d..5cf0b68 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java
@@ -1,6 +1,7 @@
package com.mes.edgglasstask.controller;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,6 +13,7 @@
* @author wu
* @since 2024-05-11
*/
+@Api(tags = "纾ㄨ竟闃熷垪")
@RestController
@RequestMapping("/edgGlassTaskInfo")
public class EdgGlassTaskInfoController {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index 0e1440e..4d69ac4 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -298,21 +298,22 @@
continue;
}
int sequence = -1;
- int startSlot = -1;
+ int targetSlot = -1;
for (BigStorageSequenceDTO item : sequenceDTOList) {
if (item.getMaxSequence() == sequence - 1) {
//鐢熸垚璋冨害浠诲姟
- int targetSlot = item.getSlot();
+ int startSlot = item.getSlot();
list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN).eq(BigStorageCageDetails::getSlot, startSlot));
- computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task", targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
+ computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task",
+ targetSlot, Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
List<Integer> slotList = new ArrayList<>();
slotList.add(targetSlot);
updateSlotRemainBySlots(slotList);
break loop;
}
sequence = item.getMinSequence();
- startSlot = item.getSlot();
+ targetSlot = item.getSlot();
}
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 13dbcca..ef317bf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -22,7 +22,7 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "閽㈠寲灏忕墖琛ㄤ俊鎭�")
+@Api(tags = "閽㈠寲灏忕墖琛ㄤ俊鎭�")
@RestController
@RequestMapping("/temperingGlassInfo")
public class TemperingGlassInfoController {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index ae9625e..1f43e77 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -106,9 +106,9 @@
String engineerId = upPattenUsage.get(0).getEngineeringId();
int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
if (count <=0){
+ //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
this.saveBatch(upPattenUsage);
}
- //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
}
@Override
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index 3a9e7f3..c163241 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -13,7 +13,7 @@
import java.util.List;
import java.util.Map;
-@Api(description = "缂撳瓨")
+@Api(tags = "缂撳瓨")
@RestController
@RequestMapping("/downStorage")
public class DownStorageCageDetailsController {
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index 7b9099c..08c589a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -26,7 +26,7 @@
*/
@RestController
-@Api(description = "宸ヤ綅")
+@Api(tags = "宸ヤ綅")
@RequestMapping("/downWorkStation")
public class DownWorkstationController {
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
index f695563..16c4a41 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -81,6 +82,8 @@
BeanUtils.copyProperties(queue, queueInfo);
queueInfo.setState(Const.TEMPERING_NEW);
queueInfo.setCell(cell);
+ queueInfo.setCreateTime(new Date());
+ queueInfo.setUpdateTime(new Date());
hollowQueues.add(queueInfo);
if (queue.getIsPair() == 1){
isPairCount -=1;
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index fb42c44..241f50f 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -567,7 +567,7 @@
List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>()
.eq(HollowGlassQueueInfo::getFlowCardId, hollowGlassQueueInfo.getFlowCardId())
.eq(HollowGlassQueueInfo::getCell, hollowGlassQueueInfo.getCell())
- .eq(HollowGlassQueueInfo::getIsPair, 1)
+// .eq(HollowGlassQueueInfo::getIsPair, 1)
.eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
);
if (CollectionUtil.isEmpty(list)){
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 4f71991..c745481 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -36,22 +36,23 @@
public void hollowGlassTask() {
List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
.in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START, Const.HOLLOW_FLOW_CARD_PAUSE));
- if (CollectionUtil.isEmpty(taskList)){
+ if (CollectionUtil.isEmpty(taskList)) {
return;
}
JSONObject jsonObject = new JSONObject();
List<String> flowCardIdList = taskList.stream().map(HollowGlassOutRelationInfo::getFlowCardId).collect(Collectors.toList());
List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>().in(HollowGlassQueueInfo::getFlowCardId, flowCardIdList));
Map<Integer, List<HollowGlassQueueInfo>> listMap = list.stream().collect(Collectors.groupingBy(HollowGlassQueueInfo::getCell));
- jsonObject.append("930",listMap.get(930));
- jsonObject.append("931",listMap.get(931));
- jsonObject.append("932",listMap.get(932));
+ jsonObject.append("930", listMap.get(930));
+ jsonObject.append("931", listMap.get(931));
+ jsonObject.append("932", listMap.get(932));
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
if (CollectionUtil.isNotEmpty(sendwServer)) {
- WebSocketServer socketServer = sendwServer.get(0);
+ for (WebSocketServer socketServer : sendwServer) {
if (socketServer != null && socketServer.session.isOpen()) {
socketServer.sendMessage(jsonObject.toString());
}
+ }
}
}
}
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml
index 4ac536a..f4c250c 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml
@@ -22,7 +22,7 @@
cloud:
nacos:
discovery:
- server-addr: 192.168.2.100:8848
+ server-addr: 127.0.0.1:8848
redis:
database: 0
host: 192.168.2.100
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
index c16715a..d1efe15 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
@@ -3,16 +3,16 @@
spring:
profiles:
- active: dev
+ active: yw
application:
name: hollowGlass
liquibase:
enabled: false
- task:
- scheduling:
- pool:
- size: 10
- thread-name-prefix: task-hollowGlass
+# task:
+# scheduling:
+# pool:
+# size: 10
+# thread-name-prefix: task-hollowGlass
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
@@ -29,13 +29,9 @@
xMaxSize: 2800
temperingOutTargetPosition: 930
artificialOutTargetPosition: 931
-
- scan:
- ip: 192.168.30.199
- port: 5000
kangaroohy:
milo:
- enabled: false
+ enabled: true
primary: default
config:
default:
--
Gitblit v1.8.0