From ef9e8df8f911d53d1ec23bf920f1cd5ba8f18e13 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 13 九月 2024 08:04:26 +0800
Subject: [PATCH] 线路配置，打标机前端页面
---
JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 4
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java | 10
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java | 43 ++
JiuMuMesParent/moduleService/DeviceInteractionModule/target/deviceInteraction-1.0-SNAPSHOT.jar.original | 0
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Line.java | 46 ++
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java | 2
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/MachineMapper.java | 17
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineConfigurationService.java | 17
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java | 23 +
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java | 3
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineServiceImpl.java | 20 +
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineConfigurationMapper.java | 16
UI-Project/src/views/Blank/blank.vue | 2
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/MachineServiceImpl.java | 23 +
JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst | 1
logs/deviceInteraction/web_warn.log | 103 ++++-
JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 94 ++--
UI-Project/src/views/Marking/marking.vue | 191 +++++++--
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineService.java | 16
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineMapper.java | 16
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Machine.java | 56 ++
UI-Project/src/lang/zh.js | 9
JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 22
JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst | 1
logs/deviceInteraction/web_error.log | 15
/dev/null | 23 -
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/MachineService.java | 16
JiuMuMesParent/gateway/target/gateway-1.0-SNAPSHOT.jar.original | 0
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 41 ++
UI-Project/src/router/index.js | 12
JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 4
logs/deviceInteraction/web_info.log | 214 +++++++++--
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/LineConfiguration.java | 54 ++
33 files changed, 909 insertions(+), 205 deletions(-)
diff --git a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
deleted file mode 100644
index 7d29ab6..0000000
--- a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.mes.engineering.entity;
-
-public class Engineering {
-}
diff --git a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
deleted file mode 100644
index 5581d4e..0000000
--- a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.engineering.mapper;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.mes.engineering.entity.Engineering;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author wu
- * @since 2024-05-11
- */
-public interface EngineeringMapper extends MPJBaseMapper<Engineering> {
-
-}
diff --git a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
deleted file mode 100644
index 8807b04..0000000
--- a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.engineering.service;
-
-import com.github.yulichang.base.MPJBaseService;
-import com.mes.engineering.entity.Engineering;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface EngineeringService extends MPJBaseService<Engineering> {
-
-}
diff --git a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
deleted file mode 100644
index 79e9de6..0000000
--- a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.engineering.service.impl;
-
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.mapper.EngineeringMapper;
-import com.mes.engineering.service.EngineeringService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Service
-@Slf4j
-public class EngineeringServiceImpl extends MPJBaseServiceImpl<EngineeringMapper, Engineering> implements EngineeringService {
-
-
-}
diff --git a/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 249030b..314e2ba 100644
--- a/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,4 +1,3 @@
-com\mes\engineering\service\EngineeringService.class
com\mes\utils\ResultCodeEnum.class
com\mes\service\Communication.class
com\mes\device\PlcParameterInfo.class
@@ -8,9 +7,7 @@
com\mes\tools\WebSocketServer.class
com\mes\common\config\Const.class
com\mes\service\PlcAgreement.class
-com\mes\engineering\mapper\EngineeringMapper.class
com\mes\tools\DatabaseDesignDocUtil.class
-com\mes\engineering\entity\Engineering.class
com\mes\utils\Result.class
com\mes\common\config\MybatisPlusConfig.class
com\mes\common\exception\ServiceException.class
@@ -20,7 +17,6 @@
com\mes\device\PlcParameterObject.class
com\mes\entity\request\GeneralRequest.class
com\mes\tools\InitUtil.class
-com\mes\engineering\service\impl\EngineeringServiceImpl.class
com\mes\utils\HexUtil.class
com\mes\tools\HexConversion.class
com\mes\tools\S7control.class
diff --git a/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 68e8e96..6ca42b8 100644
--- a/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/JiuMuMesParent/common/servicebase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -4,14 +4,11 @@
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\common\config\Swagger2Config.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\service\Communication.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\utils\MD5.java
-D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\engineering\service\impl\EngineeringServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\common\exception\ServiceException.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\device\PlcParameterObject.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\common\config\WebSocketConfig.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\tools\DatabaseDesignDocUtil.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\utils\HexUtil.java
-D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\engineering\entity\Engineering.java
-D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\engineering\mapper\EngineeringMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\tools\CodeGet.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\common\config\MybatisPlusConfig.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\service\PlcAgreement.java
@@ -28,4 +25,3 @@
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\common\exception\GlobalExceptionHandler.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\utils\Result.java
D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\tools\S7control.java
-D:\workfile\JiuMuMES\JiuMuMesParent\common\servicebase\src\main\java\com\mes\engineering\service\EngineeringService.java
diff --git a/JiuMuMesParent/gateway/target/gateway-1.0-SNAPSHOT.jar.original b/JiuMuMesParent/gateway/target/gateway-1.0-SNAPSHOT.jar.original
index 966c99f..20e5ec2 100644
--- a/JiuMuMesParent/gateway/target/gateway-1.0-SNAPSHOT.jar.original
+++ b/JiuMuMesParent/gateway/target/gateway-1.0-SNAPSHOT.jar.original
Binary files differ
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java
index fd11c13..d6ec90e 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java
@@ -18,7 +18,7 @@
@MapperScan("com.mes.*.mapper")
@EnableDiscoveryClient
@EnableSwagger2
-@EnableScheduling
+//@EnableScheduling
public class DeviceInteractionModuleApplication {
public static void main(String[] args) {
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
index 9cad4da..4ded016 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
@@ -19,10 +19,11 @@
* @since 2024-08-28
*/
@RestController
- @RequestMapping("/jiumumes/tasking")
+ @RequestMapping("/tasking")
public class TaskingController {
@Autowired
private TaskingService taskingService;
+
@ApiOperation("鍒囨崲妯″紡")
@PostMapping("/updateLoadState") //鍒囨崲妯″紡"
@ResponseBody
@@ -65,5 +66,45 @@
List<Tasking> tasking =taskingService.selectTasking();
return Result.build(1,"瀹氬埗妯″紡",tasking);
}
+
+ @ApiOperation("鏌ヨ褰撳墠宸ヨ壓锛屾煇宸ヤ綔鐘舵�佺殑绾夸笂浠诲姟")
+ @PostMapping("/findCraftTasking")
+ @ResponseBody
+ public Result findCraftTasking(@RequestBody Tasking tasking) {
+ List<Tasking> list =taskingService.findCraftTasking(tasking);
+ return Result.build(200,"鎴愬姛",list);
+ }
+
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愮牬鎹�/澶辫触/瀹屽伐銆�")
+ @PostMapping("/updateCraftTasking")
+ @ResponseBody
+ public Result updateCraftTasking(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+ @ApiOperation("淇敼褰撳墠璁惧 銆愬紑宸�/鏆傚仠銆�")
+ @PostMapping("/updateMachineState")
+ @ResponseBody
+ public Result updateMachineState(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
+ @PostMapping("/updateTopLine")
+ @ResponseBody
+ public Result updateTopLine(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笅绾裤��")
+ @PostMapping("/updateDownLine")
+ @ResponseBody
+ public Result updateDownLine(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+
+
}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Line.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Line.java
new file mode 100644
index 0000000..8404938
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Line.java
@@ -0,0 +1,46 @@
+package com.mes.md.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 绾胯矾琛�
+ * </p>
+ *
+ * @author yanzhixin
+ * @since 2024-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Line implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 椤甸潰琛ㄤ富閿�
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 绾胯矾缂栧彿
+ */
+ private String number;
+
+ /**
+ * 绾胯矾鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/LineConfiguration.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/LineConfiguration.java
new file mode 100644
index 0000000..6ec3c4e
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/LineConfiguration.java
@@ -0,0 +1,54 @@
+package com.mes.md.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 绾胯矾琛�
+ * </p>
+ *
+ * @author yanzhixin
+ * @since 2024-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class LineConfiguration implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 绾胯矾閰嶇疆ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鏈哄櫒id
+ */
+ private Long machineId;
+
+ /**
+ * 绾胯矾id
+ */
+ private Long lineId;
+
+ /**
+ * 浜х嚎宸ヨ壓椤哄簭
+ */
+ private Long processSequence;
+ /**
+ * 浼樺厛绾ч『搴�
+ */
+ private Long prioritySequence;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Machine.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Machine.java
new file mode 100644
index 0000000..2d4cbe8
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Machine.java
@@ -0,0 +1,56 @@
+package com.mes.md.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 璁惧琛�
+ * </p>
+ *
+ * @author yanzhixin
+ * @since 2024-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Machine implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 璁惧涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁惧鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 璁惧IP
+ */
+ private String ip;
+
+ /**
+ * 绔彛鍙�
+ */
+ private int port;
+
+ /**
+ * 鐘舵��
+ */
+ private String state;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineConfigurationMapper.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineConfigurationMapper.java
new file mode 100644
index 0000000..6ac8df0
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineConfigurationMapper.java
@@ -0,0 +1,16 @@
+package com.mes.md.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.md.entity.LineConfiguration;
+
+/**
+ * <p>
+ * 绾胯矾閰嶇疆
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+public interface LineConfigurationMapper extends MPJBaseMapper<LineConfiguration> {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineMapper.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineMapper.java
new file mode 100644
index 0000000..08639e7
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/LineMapper.java
@@ -0,0 +1,16 @@
+package com.mes.md.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.md.entity.Line;
+
+/**
+ * <p>
+ * 椤甸潰琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+public interface LineMapper extends MPJBaseMapper<Line> {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/MachineMapper.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/MachineMapper.java
new file mode 100644
index 0000000..689e3f8
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/MachineMapper.java
@@ -0,0 +1,17 @@
+package com.mes.md.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.md.entity.Line;
+import com.mes.md.entity.Machine;
+
+/**
+ * <p>
+ * 璁惧琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+public interface MachineMapper extends MPJBaseMapper<Machine> {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineConfigurationService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineConfigurationService.java
new file mode 100644
index 0000000..3d02797
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineConfigurationService.java
@@ -0,0 +1,17 @@
+package com.mes.md.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.mes.md.entity.Line;
+import com.mes.md.entity.LineConfiguration;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+public interface LineConfigurationService extends MPJBaseService<LineConfiguration> {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineService.java
new file mode 100644
index 0000000..63d7a6b
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/LineService.java
@@ -0,0 +1,16 @@
+package com.mes.md.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.mes.md.entity.Line;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+public interface LineService extends MPJBaseService<Line> {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/MachineService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/MachineService.java
new file mode 100644
index 0000000..d59dabe
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/MachineService.java
@@ -0,0 +1,16 @@
+package com.mes.md.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.mes.md.entity.Machine;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+public interface MachineService extends MPJBaseService<Machine> {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
index fae12ff..6caea98 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
@@ -54,4 +54,14 @@
* @return List<Tasking>
*/
boolean updateTasking(String scanId);
+
+ /**
+ * 鏌ヨ褰撳墠宸ヨ壓锛屾煇宸ヤ綔鐘舵�佺殑绾夸笂浠诲姟
+ * @return List<Tasking>
+ */
+ List<Tasking> findCraftTasking(Tasking tasking);
+
+ int updateCraftTasking(Tasking tasking);
+
+ int updateDownLine(Tasking tasking);
}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
index 9a49ae0..43e6058 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
@@ -1,10 +1,7 @@
package com.mes.md.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.engineering.entity.Engineering;
import com.mes.md.entity.*;
import com.mes.md.mapper.AccountMapper;
import com.mes.md.mapper.RoleMapper;
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java
new file mode 100644
index 0000000..96efcb2
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineConfigurationServiceImpl.java
@@ -0,0 +1,23 @@
+package com.mes.md.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.md.entity.Line;
+import com.mes.md.entity.LineConfiguration;
+import com.mes.md.mapper.LineConfigurationMapper;
+import com.mes.md.mapper.LineMapper;
+import com.mes.md.service.LineConfigurationService;
+import com.mes.md.service.LineService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+@Service
+public class LineConfigurationServiceImpl extends MPJBaseServiceImpl<LineConfigurationMapper, LineConfiguration> implements LineConfigurationService {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineServiceImpl.java
new file mode 100644
index 0000000..9c4b152
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/LineServiceImpl.java
@@ -0,0 +1,20 @@
+package com.mes.md.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.md.entity.Line;
+import com.mes.md.mapper.LineMapper;
+import com.mes.md.service.LineService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+@Service
+public class LineServiceImpl extends MPJBaseServiceImpl<LineMapper, Line> implements LineService {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/MachineServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/MachineServiceImpl.java
new file mode 100644
index 0000000..6a1f6ca
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/MachineServiceImpl.java
@@ -0,0 +1,23 @@
+package com.mes.md.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.md.entity.Line;
+import com.mes.md.entity.Machine;
+import com.mes.md.mapper.LineMapper;
+import com.mes.md.mapper.MachineMapper;
+import com.mes.md.service.LineService;
+import com.mes.md.service.MachineService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-08-28
+ */
+@Service
+public class MachineServiceImpl extends MPJBaseServiceImpl<MachineMapper, Machine> implements MachineService {
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
index 0b83559..7edeb9c 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
import com.mes.md.entity.GlassInfo;
@@ -125,4 +126,44 @@
public Boolean insertTaskingPro(String tasking) {
return null;
}
+
+
+ /**
+ * @param tasking
+ * 鏌ヨ褰撳墠宸ヨ壓锛岀嚎涓婃湭瀹屽伐鐨勪换鍔�
+ * @return
+ */
+ @Override
+ public List<Tasking> findCraftTasking(Tasking tasking) {
+ return baseMapper.selectList(new MPJLambdaQueryWrapper<Tasking>()
+ .selectAll(Tasking.class)
+ .eq(Tasking::getCurrentCraft,tasking.getCurrentCraft())
+ .ne(Tasking::getWorkState,"瀹屽伐")
+ .orderByAsc(Tasking::getGlassId));
+ }
+
+ /**
+ * @param tasking
+ * 淇敼浠诲姟鐘舵�� 銆愮牬鎹�/澶辫触/瀹屽伐銆�
+ * @return
+ */
+ @Override
+ public int updateCraftTasking(Tasking tasking) {
+ Tasking oldTasking=baseMapper.selectById(tasking);
+ oldTasking.setWorkState(tasking.getWorkState());
+ return baseMapper.updateById(oldTasking);
+ }
+
+ /**
+ * @param tasking
+ * 淇敼鐘舵�� 銆愪笅绾裤��
+ * @return
+ */
+ @Override
+ public int updateDownLine(Tasking tasking) {
+ Tasking oldTasking=baseMapper.selectById(tasking);
+ oldTasking.setState(tasking.getState());
+ return baseMapper.updateById(oldTasking);
+ }
+
}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/deviceInteraction-1.0-SNAPSHOT.jar.original b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/deviceInteraction-1.0-SNAPSHOT.jar.original
index 46d4aa4..f6782b4 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/deviceInteraction-1.0-SNAPSHOT.jar.original
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/deviceInteraction-1.0-SNAPSHOT.jar.original
Binary files differ
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index e554e55..3146183 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,86 +1,96 @@
-com\mes\AppRunnerConfig.class
-com\mes\md\controller\TaskingController.class
com\mes\md\mapper\TaskingMapper.class
-com\mes\md\controller\AccountController.class
-com\mes\md\service\TaskLogService.class
-com\mes\md\controller\WorktaskdetailController.class
com\mes\md\mapper\RoleMapper.class
com\mes\md\service\impl\ProjectServiceImpl.class
-com\mes\md\service\PrimitiveTaskService.class
+com\mes\job\PLCRinse.class
com\mes\md\service\impl\OrderOriginalPieceServiceImpl.class
com\mes\md\service\AccountService.class
-com\mes\md\entity\Account.class
com\mes\DeviceInteractionModuleApplication.class
-com\mes\md\service\impl\MenuServiceImpl.class
-com\mes\md\controller\PageController.class
-com\mes\md\entity\TaskLog.class
+com\mes\job\PLCScanQRVerify.class
com\mes\md\service\ProjectService.class
com\mes\md\service\WorkTaskDetailService.class
-com\mes\md\mapper\EquipmentLogMapper.class
-com\mes\md\entity\RoleMenu.class
com\mes\md\service\impl\EquipmentLogServiceImpl.class
-com\mes\md\controller\OrderoriginalpieceController.class
-com\mes\md\controller\TaskLogController.class
-com\mes\md\service\impl\TaskingServiceImpl.class
-com\mes\md\controller\EdgegrindingLogController.class
+com\mes\md\controller\WorkTaskDetailController.class
com\mes\md\controller\MenuController.class
-com\mes\md\mapper\ProjectMapper.class
com\mes\md\entity\OrderOriginalPiece.class
com\mes\md\service\MenuService.class
com\mes\md\controller\GlassInfoController.class
-com\mes\md\controller\EquipmentLogController.class
+com\mes\job\PLCTurn.class
com\mes\md\mapper\PageMapper.class
com\mes\md\service\ProjectLogService.class
com\mes\md\entity\Project.class
-com\mes\common\SmbTool.class
-com\mes\md\mapper\ProjectLogMapper.class
-com\mes\md\controller\RolemenuController.class
com\mes\md\mapper\PrimitiveTaskMapper.class
com\mes\md\service\impl\EdgeGrindingLogServiceImpl.class
-com\mes\md\controller\PrimitivetaskController.class
-com\mes\md\mapper\OrderOriginalPieceMapper.class
com\mes\edgstoragecage\controller\EdgStorageCageController.class
-com\mes\edgstoragecage\entity\EdgStorageCageDetails.class
com\mes\edgstoragecage\entity\EdgStorageCage.class
com\mes\md\mapper\RoleMenuMapper.class
-com\mes\md\service\impl\RoleServiceImpl.class
-com\mes\md\entity\Role.class
com\mes\md\mapper\TaskLogMapper.class
com\mes\md\service\impl\AccountServiceImpl.class
com\mes\edgstoragecage\service\EdgStorageCageService.class
+com\mes\md\entity\Line.class
com\mes\md\entity\EdgeGrindingLog.class
com\mes\md\service\OrderOriginalPieceService.class
com\mes\md\service\impl\GlassInfoServiceImpl.class
com\mes\md\entity\EquipmentLog.class
-com\mes\md\mapper\EdgeGrindingLogMapper.class
-com\mes\md\entity\PrimitiveTask.class
+com\mes\md\controller\PrimitiveTaskController.class
+com\mes\md\controller\RoleMenuController.class
com\mes\md\entity\WorkTaskDetail.class
com\mes\md\mapper\WorkTaskDetailMapper.class
-com\mes\job\CacheGlassTask.class
-com\mes\md\entity\Menu.class
+com\mes\md\service\LineService.class
com\mes\md\service\impl\PageServiceImpl.class
-com\mes\common\S7object.class
com\mes\md\service\impl\WorkTaskDetailServiceImpl.class
-com\mes\md\mapper\MenuMapper.class
com\mes\md\service\impl\TaskLogServiceImpl.class
+com\mes\md\controller\EdgeGrindingLogController.class
+com\mes\md\entity\GlassInfo.class
+com\mes\md\service\GlassInfoService.class
+com\mes\md\entity\Page.class
+com\mes\md\controller\RoleController.class
+com\mes\job\MarkingTask.class
+com\mes\md\mapper\AccountMapper.class
+com\mes\md\service\EquipmentLogService.class
+com\mes\md\service\impl\PrimitiveTaskServiceImpl.class
+com\mes\md\controller\OrderOriginalPieceController.class
+com\mes\md\controller\ProjectController.class
+com\mes\md\entity\ProjectLog.class
+com\mes\md\service\EdgeGrindingLogService.class
+com\mes\AppRunnerConfig.class
+com\mes\md\controller\TaskingController.class
+com\mes\md\controller\AccountController.class
+com\mes\md\service\TaskLogService.class
+com\mes\job\PLCScanQR.class
+com\mes\md\service\PrimitiveTaskService.class
+com\mes\md\entity\Account.class
+com\mes\md\service\impl\MenuServiceImpl.class
+com\mes\md\controller\PageController.class
+com\mes\md\entity\TaskLog.class
+com\mes\md\mapper\EquipmentLogMapper.class
+com\mes\job\PLCMechanicalArm.class
+com\mes\md\entity\RoleMenu.class
+com\mes\md\controller\TaskLogController.class
+com\mes\md\service\impl\TaskingServiceImpl.class
+com\mes\md\mapper\ProjectMapper.class
+com\mes\md\controller\EquipmentLogController.class
+com\mes\common\SmbTool.class
+com\mes\md\mapper\ProjectLogMapper.class
+com\mes\md\mapper\OrderOriginalPieceMapper.class
+com\mes\edgstoragecage\entity\EdgStorageCageDetails.class
+com\mes\md\service\impl\RoleServiceImpl.class
+com\mes\md\entity\Role.class
+com\mes\md\service\impl\LineServiceImpl.class
+com\mes\md\mapper\LineMapper.class
+com\mes\md\mapper\EdgeGrindingLogMapper.class
+com\mes\md\entity\PrimitiveTask.class
+com\mes\md\entity\Menu.class
+com\mes\common\S7object.class
+com\mes\md\mapper\MenuMapper.class
com\mes\md\service\RoleMenuService.class
com\mes\edgstoragecage\service\impl\EdgStorageCageServiceImpl.class
com\mes\edgstoragecage\mapper\EdgStorageCageMapper.class
com\mes\md\service\impl\ProjectLogServiceImpl.class
com\mes\md\service\impl\RoleMenuServiceImpl.class
-com\mes\md\entity\GlassInfo.class
com\mes\md\service\TaskingService.class
-com\mes\md\service\GlassInfoService.class
com\mes\md\service\RoleService.class
com\mes\md\service\PageService.class
com\mes\md\controller\ProjectLogController.class
-com\mes\md\entity\Page.class
-com\mes\md\controller\RoleController.class
-com\mes\md\mapper\AccountMapper.class
-com\mes\md\service\EquipmentLogService.class
+com\mes\job\PLCEdging.class
com\mes\md\mapper\GlassInfoMapper.class
-com\mes\md\service\impl\PrimitiveTaskServiceImpl.class
-com\mes\md\controller\ProjectController.class
com\mes\md\entity\Tasking.class
-com\mes\md\entity\ProjectLog.class
-com\mes\md\service\EdgeGrindingLogService.class
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index f92ad72..64dc5f8 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,7 +1,10 @@
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\PLCMechanicalArm.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\edgstoragecage\mapper\EdgStorageCageMapper.java
-D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\CacheGlassTask.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\LineMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\DeviceInteractionModuleApplication.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\PLCEdging.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\ProjectLog.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\MarkingTask.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\Role.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\Tasking.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\edgstoragecage\service\impl\EdgStorageCageServiceImpl.java
@@ -10,7 +13,7 @@
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\ProjectLogMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\PageService.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\GlassInfoServiceImpl.java
-D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\WorktaskdetailController.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\WorkTaskDetailController.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\WorkTaskDetailServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\TaskLog.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\GlassInfo.java
@@ -23,11 +26,13 @@
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\MenuServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\RoleMenuServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\edgstoragecage\entity\EdgStorageCage.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\PLCTurn.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\Project.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\PrimitiveTaskMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\PrimitiveTaskServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\edgstoragecage\service\EdgStorageCageService.java
-D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\EdgegrindingLogController.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\PLCScanQR.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\EdgeGrindingLogController.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\EdgeGrindingLog.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\Account.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\TaskingController.java
@@ -48,10 +53,12 @@
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\WorkTaskDetailMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\OrderOriginalPieceService.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\RoleMenuMapper.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\Line.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\EquipmentLogMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\EquipmentLog.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\EdgeGrindingLogMapper.java
-D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\PrimitivetaskController.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\LineServiceImpl.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\PrimitiveTaskController.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\PageServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\edgstoragecage\controller\EdgStorageCageController.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\MenuMapper.java
@@ -60,10 +67,12 @@
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\MenuService.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\Menu.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\Page.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\LineService.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\RoleMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\EquipmentLogService.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\ProjectLogService.java
-D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\RolemenuController.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\RoleMenuController.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\PLCScanQRVerify.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\GlassInfoController.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\OrderOriginalPieceServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\edgstoragecage\entity\EdgStorageCageDetails.java
@@ -71,8 +80,9 @@
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\impl\ProjectLogServiceImpl.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\mapper\TaskingMapper.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\ProjectLogController.java
-D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\OrderoriginalpieceController.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\OrderOriginalPieceController.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\WorkTaskDetail.java
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\job\PLCRinse.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\controller\TaskLogController.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\service\TaskLogService.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\main\java\com\mes\md\entity\PrimitiveTask.java
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
index 0de62f3..3b57a0c 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -1 +1,2 @@
com\mes\DeviceInteractionModuleApplicationTest.class
+com\mes\TaskingModuleApplicationTest.class
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index ba1d8de..6ee79cc 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -1 +1,2 @@
+D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\test\java\com\mes\TaskingModuleApplicationTest.java
D:\workfile\JiuMuMES\JiuMuMesParent\moduleService\DeviceInteractionModule\src\test\java\com\mes\DeviceInteractionModuleApplicationTest.java
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 8b3601f..978142c 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -121,4 +121,13 @@
page:'椤甸潰锛�',
pagechoice:'璇烽�夋嫨椤甸潰',
},
+ marking:{
+ deleteTips:'鏄惁纭鐮存崯锛�',
+ delete :'鍒犻櫎',
+ tips:'鏄惁纭锛�',
+ yes:'鏄�',
+ sure :'纭',
+ cancel :'鍙栨秷',
+ canceled :'澶辫触'
+ }
}
\ No newline at end of file
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 674db0e..75b8bb9 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -24,18 +24,6 @@
component: () => import('../layout/MainErpView.vue'),
children: [
{
- path: 'TL',
- name: 'Temperedlayout',
- component: () => import('../views/TL/Temperedlayout.vue'),
- children: [
- {
- path: '/TL/Temperedlayout',
- name: 'Temperedlayout',
- component: () => import('../views/TL/Temperedlayout.vue'),
- }
- ]
- },
- {
/*----------- 鑷姩涓婄墖 ----------------*/
path: 'ZiDongShangpian',
name: 'zidongshangpian',
diff --git a/UI-Project/src/views/Blank/blank.vue b/UI-Project/src/views/Blank/blank.vue
index c44af41..fdc2833 100644
--- a/UI-Project/src/views/Blank/blank.vue
+++ b/UI-Project/src/views/Blank/blank.vue
@@ -8,7 +8,7 @@
mounted() {
//鑾峰彇鏁版嵁
var data="ProcessId="+"P24032508";
- request.get("/TidyUpGlassModule/SelectTerritoryInfo?"+data).then((res) => {
+ request.get(""+data).then((res) => {
if (res.code == 200) {
for(var i=0;i<res.data.length;i++){
//閬嶅巻鏁版嵁
diff --git a/UI-Project/src/views/Marking/marking.vue b/UI-Project/src/views/Marking/marking.vue
index 6ec2763..8b76033 100644
--- a/UI-Project/src/views/Marking/marking.vue
+++ b/UI-Project/src/views/Marking/marking.vue
@@ -1,33 +1,116 @@
<!-- 鎵撴爣鏈� -->
<script setup>
import request from "@/utils/request";
-import { ElMessage } from "element-plus";
-</script>
-<script>
-export default {
- mounted() {
- //鑾峰彇鏁版嵁
- var data="ProcessId="+"P24032508";
- request.get("/TidyUpGlassModule/SelectTerritoryInfo?"+data).then((res) => {
- if (res.code == 200) {
- for(var i=0;i<res.data.length;i++){
- //閬嶅巻鏁版嵁
- }
- f1();
- } else {
- ElMessage.warning(res.msg)
- router.push("/login");
- }
- });
- },
- methods: {
- //鏂规硶
- f1() {
-
+import { ElMessage, ElMessageBox } from "element-plus";
+import { reactive, ref, onMounted } from 'vue'
+import { useI18n } from 'vue-i18n'
+let language = ref(localStorage.getItem('lang') || 'zh')
+const { t } = useI18n()
+const requestData = reactive({
+ account: '',
+ password: '',
+});
+const findCraftTaskingData = ref([]);
+
+onMounted(async () => {
+ load();
+});
+//鑾峰彇鏁版嵁
+const load = async() => {
+ try {
+ const response = await request.post('/deviceInteraction/tasking/findCraftTasking',
+ {
+ "glassId": 0,
+ "state": "绾夸笂",
+ "workState": "宸ヤ綔",
+ "currentCraft": "鎵撶（"
+ }); // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (response.code === 200) {
+ findCraftTaskingData.value= response.data;
+ } else {
+ ElMessage.warning(res.msg)
}
+ } catch (error) {
+ // console.error('Error fetching rects :', error);
}
}
+//淇敼宸ヤ綔鐘舵�� 銆愬け璐�/宸ヤ綔/瀹屾垚銆�
+const workStatus = async(row,state) => {
+ ElMessageBox.confirm(
+ t('marking.tips'),
+ t('delivery.prompt'),
+ {
+ confirmButtonText: t('marking.sure'),
+ cancelButtonText: t('marking.cancel'),
+ type: 'warning',
+ }
+ )
+ .then(() => {
+ //寮�濮嬩慨鏀�
+ request.post("/deviceInteraction/tasking/updateCraftTasking",
+ {
+ "glassId": row.glassId,
+ "workState": state
+ }).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ ElMessage.success(res.message);
+ load();
+ } else {
+ ElMessage.warning(res.message)
+ }
+ })
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: t('marking.cancel'),
+ })
+ })
+}
+
+//寮�宸�/鏆傚仠
+const machineStatus = async(row,state) => {
+
+}
+
+//涓嬬嚎(鎷胯蛋)
+const downLine = async(row,state) => {
+ ElMessageBox.confirm(
+ t('marking.tips'),
+ t('delivery.prompt'),
+ {
+ confirmButtonText: t('marking.sure'),
+ cancelButtonText: t('marking.cancel'),
+ type: 'warning',
+ }
+ )
+ .then(() => {
+ //涓嬬嚎鎺ュ彛
+ request.post("/deviceInteraction/tasking/updateDownLine",
+ {
+ "glassId": row.glassId,
+ "state": state
+ }).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ ElMessage.success(res.message);
+ this.load();
+ } else {
+ ElMessage.warning(res.message)
+ }
+ })
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: t('marking.cancel'),
+ })
+ })
+}
+//涓婄嚎
+const topLine = async() => {
+
+}
</script>
<template>
@@ -35,52 +118,70 @@
<div id="div-title" style="font-size: 20px; font-weight: bold; margin:10px 0 10px 0;padding-left: 20px;">
鑷姩鎵撴爣鏈�
</div>
- <hr/>
+ <hr />
<br>
- <div id="search">
+ <div id="search" style="padding-left: 20px;">
<!-- 鍔熻兘 -->
- <el-button type="primary" id="searchButton">寮�宸�</el-button>
- <el-button type="primary" id="searchButton">涓婄嚎</el-button>
- <el-button type="primary" id="searchButton">涓嬬嚎</el-button>
- <el-button type="primary" id="searchButton">鐮存崯</el-button>
- <el-button type="primary" id="searchButton">瀹屽伐</el-button>
+ <el-button type="primary" id="searchButton" @click="machineStatus">寮�宸�</el-button>
+ <el-button type="primary" id="searchButton" @click="topLine">涓婄嚎</el-button>
+ <!-- <el-button type="primary" id="searchButton" @click="downLine('涓嬬嚎')">涓嬬嚎</el-button>
+ <el-button type="primary" id="searchButton" @click="workStatus('鐮存崯')">鐮存崯</el-button>
+ <el-button type="primary" id="searchButton" @click="workStatus('瀹屽伐')">瀹屽伐</el-button> -->
</div>
<div id="main-body" style="min-height:240px;">
<!-- 琛ㄦ牸鍐呭 -->
- <el-table :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129',textAlign:'center'}">
- <el-table-column prop="date" label="搴忓彿" />
- <el-table-column prop="name" label="宸ョ▼鍙�" />
- <el-table-column prop="name" label="鐜荤拑绫诲瀷" />
- <el-table-column prop="name" label="鐜荤拑缂栧彿" />
- <el-table-column prop="name" label="闀�" />
- <el-table-column prop="name" label="瀹�" />
- <el-table-column prop="name" label="鍘�" />
- <el-table-column prop="name" label="鐘舵��" />
+ <el-table :data="findCraftTaskingData" stripe
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
+ :cell-style="{ textAlign: 'center' }">
+ <!-- <el-table-column type="selection" min-width="30" /> -->
+ <el-table-column type="index" label="搴忓彿" min-width="30" />
+ <el-table-column prop="batchNumber" label="鎵规鍙�" />
+ <el-table-column prop="taskType" label="浠诲姟绫诲瀷" />
+ <el-table-column prop="glassId" label="鐜荤拑缂栧彿" />
+ <el-table-column prop="length" label="闀�" />
+ <el-table-column prop="width" label="瀹�" />
+ <el-table-column prop="thickness" label="鍘�" />
+ <el-table-column prop="workState" label="鐘舵��" />
+ <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
+ <template #default="scope">
+ <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '鐮存崯')">鐮存崯</el-button>
+ <el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '瀹屽伐')">瀹屽伐</el-button>
+ <el-button size="mini" link type="primary" plain @click="downLine(scope.row, '涓嬬嚎')">涓嬬嚎</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
-
- <div id="main-body" style="height: 100%;">
+
+ <div id="main-body"
+ style="width: 100%; height: 460px;background-image: url(../../src/assets/鑷姩鎵撴爣鏈�.png) ;background-size: 100% 100%;">
<!-- 鐢诲浘鍐呭 -->
- <el-image style="width: 100%; height: 460px;" src="../../src/assets/鑷姩鎵撴爣鏈�.png"></el-image>
+ <div style="width: 100px; height: 100px; background-color: red; position: relative; top: 171px; left: 218px">
+ </div>
</div>
</div>
</template>
<style scoped>
-table{
+table {
text-align: center;
width: 100%;
height: 100%;
border-collapse: collapse;
border-spacing: 0;
}
-#main-body{
+
+table td {
+ text-align: center;
+}
+
+#main-body {
width: 100%;
height: 100%;
border: 1px solid #ccc;
margin-top: 25px;
}
-#searchButton{
+
+#searchButton {
width: 100px;
height: 40px;
font-size: 16px;
diff --git a/logs/deviceInteraction/web_error.log b/logs/deviceInteraction/web_error.log
index 94ee2ed..737e936 100644
--- a/logs/deviceInteraction/web_error.log
+++ b/logs/deviceInteraction/web_error.log
@@ -1,3 +1,12 @@
-2024-09-09 08:11:18.161 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
-2024-09-09 08:11:18.351 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
-2024-09-09 08:11:18.444 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 10:21:44.900 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 10:21:45.085 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 10:21:45.170 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 22:43:40.854 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 22:43:41.059 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 22:43:41.157 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 22:46:56.118 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 22:46:56.300 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 22:46:56.388 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 23:03:27.754 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 23:03:27.948 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2024-09-12 23:03:28.026 [main] ERROR org.apache.catalina.core.AprLifecycleListener - An incompatible version [1.2.10] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
diff --git a/logs/deviceInteraction/web_info.log b/logs/deviceInteraction/web_info.log
index 0633b28..6c251f7 100644
--- a/logs/deviceInteraction/web_info.log
+++ b/logs/deviceInteraction/web_info.log
@@ -1,40 +1,174 @@
-2024-09-09 08:11:15.718 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$a4da85c8] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2024-09-09 08:11:16.746 [main] INFO com.mes.DeviceInteractionModuleApplication - The following profiles are active: prod
-2024-09-09 08:11:17.616 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
-2024-09-09 08:11:17.629 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data repositories in DEFAULT mode.
-2024-09-09 08:11:17.668 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 23ms. Found 0 repository interfaces.
-2024-09-09 08:11:17.920 [main] INFO o.springframework.cloud.context.scope.GenericScope - BeanFactory id=059818e1-784d-30a6-a728-bf38cb3309d3
-2024-09-09 08:11:18.002 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$88c082cb] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2024-09-09 08:11:18.029 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2024-09-09 08:11:18.032 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$f24ef39c] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2024-09-09 08:11:18.122 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2024-09-09 08:11:18.138 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$a4da85c8] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
-2024-09-09 08:11:18.429 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8081 (http)
-2024-09-09 08:11:18.445 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8081"]
-2024-09-09 08:11:18.452 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
-2024-09-09 08:11:18.452 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.24]
-2024-09-09 08:11:18.577 [main] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
-2024-09-09 08:11:18.579 [main] INFO org.springframework.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1818 ms
-2024-09-09 08:11:18.737 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join properties config complete
-2024-09-09 08:11:18.895 [main] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1,jiumumes} inited
-2024-09-09 08:11:18.896 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [jiumumes] success
-2024-09-09 08:11:18.896 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource initial loaded [1] datasource,primary datasource named [jiumumes]
-2024-09-09 08:11:18.921 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join SqlInjector init
-2024-09-09 08:11:20.949 [main] INFO com.mes.service.PlcAgreement - 鍒濆鍖朠lcCacheGlass锛歠alse
-2024-09-09 08:11:21.411 [main] INFO s.d.s.w.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
-2024-09-09 08:11:21.426 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
-2024-09-09 08:11:21.441 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
-2024-09-09 08:11:21.623 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
-2024-09-09 08:11:22.733 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskScheduler - Initializing ExecutorService
-2024-09-09 08:11:23.014 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler'
-2024-09-09 08:11:24.093 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
-2024-09-09 08:11:24.111 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
-2024-09-09 08:11:24.145 [main] INFO s.d.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
-2024-09-09 08:11:24.314 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8081"]
-2024-09-09 08:11:24.335 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8081 (http) with context path ''
-2024-09-09 08:11:24.432 [main] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - nacos registry, deviceInteraction 10.153.19.29:8081 register finished
-2024-09-09 08:11:25.310 [main] INFO com.mes.DeviceInteractionModuleApplication - Started DeviceInteractionModuleApplication in 11.168 seconds (JVM running for 12.369)
-2024-09-09 08:11:25.311 [main] INFO com.mes.AppRunnerConfig - 鍚姩瀹屾垚
-2024-09-09 08:18:28.152 [http-nio-8081-exec-1] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
-2024-09-09 08:18:28.152 [http-nio-8081-exec-1] INFO org.springframework.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
-2024-09-09 08:18:28.161 [http-nio-8081-exec-1] INFO org.springframework.web.servlet.DispatcherServlet - Completed initialization in 8 ms
+2024-09-12 10:21:26.964 [Thread-34] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registering from Nacos Server now...
+2024-09-12 10:21:26.992 [Thread-34] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registration finished.
+2024-09-12 10:21:27.001 [Thread-34] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-09-12 10:21:27.013 [Thread-34] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource start closing ....
+2024-09-12 10:21:27.029 [Thread-34] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1} closed
+2024-09-12 10:21:27.031 [Thread-34] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource all closed success,bye
+2024-09-12 10:21:41.340 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$a3358540] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 10:21:43.489 [main] INFO com.mes.DeviceInteractionModuleApplication - The following profiles are active: prod
+2024-09-12 10:21:44.349 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-09-12 10:21:44.352 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data repositories in DEFAULT mode.
+2024-09-12 10:21:44.391 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 23ms. Found 0 repository interfaces.
+2024-09-12 10:21:44.644 [main] INFO o.springframework.cloud.context.scope.GenericScope - BeanFactory id=6ad6a522-b511-3382-9ba4-990314bdc48c
+2024-09-12 10:21:44.742 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$871b8243] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 10:21:44.771 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 10:21:44.773 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$f0a9f314] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 10:21:44.865 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 10:21:44.881 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$a3358540] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 10:21:45.158 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8081 (http)
+2024-09-12 10:21:45.171 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8081"]
+2024-09-12 10:21:45.179 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
+2024-09-12 10:21:45.179 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.24]
+2024-09-12 10:21:45.304 [main] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+2024-09-12 10:21:45.304 [main] INFO org.springframework.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1802 ms
+2024-09-12 10:21:45.466 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join properties config complete
+2024-09-12 10:21:45.625 [main] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1,jiumumes} inited
+2024-09-12 10:21:45.626 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [jiumumes] success
+2024-09-12 10:21:45.626 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource initial loaded [1] datasource,primary datasource named [jiumumes]
+2024-09-12 10:21:45.653 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join SqlInjector init
+2024-09-12 10:21:47.878 [main] INFO com.mes.service.PlcAgreement - 鍒濆鍖朠lcCacheGlass锛歠alse
+2024-09-12 10:21:48.259 [main] INFO s.d.s.w.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2024-09-12 10:21:48.273 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 10:21:48.277 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 10:21:48.428 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-09-12 10:21:50.654 [main] INFO org.springframework.cloud.commons.util.InetUtils - Cannot determine local hostname
+2024-09-12 10:21:50.704 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskScheduler - Initializing ExecutorService
+2024-09-12 10:21:53.020 [main] INFO org.springframework.cloud.commons.util.InetUtils - Cannot determine local hostname
+2024-09-12 10:21:53.178 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
+2024-09-12 10:21:53.195 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
+2024-09-12 10:21:53.224 [main] INFO s.d.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
+2024-09-12 10:21:53.421 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8081"]
+2024-09-12 10:21:53.441 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8081 (http) with context path ''
+2024-09-12 10:21:53.529 [main] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - nacos registry, deviceInteraction 10.153.19.29:8081 register finished
+2024-09-12 10:21:55.543 [main] INFO org.springframework.cloud.commons.util.InetUtils - Cannot determine local hostname
+2024-09-12 10:21:55.545 [main] INFO com.mes.DeviceInteractionModuleApplication - Started DeviceInteractionModuleApplication in 16.934 seconds (JVM running for 18.209)
+2024-09-12 10:21:55.547 [main] INFO com.mes.AppRunnerConfig - 鍚姩瀹屾垚
+2024-09-12 10:23:22.882 [http-nio-8081-exec-1] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-09-12 10:23:22.883 [http-nio-8081-exec-1] INFO org.springframework.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+2024-09-12 10:23:22.893 [http-nio-8081-exec-1] INFO org.springframework.web.servlet.DispatcherServlet - Completed initialization in 10 ms
+2024-09-12 22:43:25.919 [Thread-45] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registering from Nacos Server now...
+2024-09-12 22:43:25.984 [Thread-45] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registration finished.
+2024-09-12 22:43:25.994 [Thread-45] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-09-12 22:43:26.011 [Thread-45] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource start closing ....
+2024-09-12 22:43:26.031 [Thread-45] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1} closed
+2024-09-12 22:43:26.032 [Thread-45] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource all closed success,bye
+2024-09-12 22:43:38.235 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$9dd05328] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:43:39.281 [main] INFO com.mes.DeviceInteractionModuleApplication - The following profiles are active: prod
+2024-09-12 22:43:40.252 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-09-12 22:43:40.255 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data repositories in DEFAULT mode.
+2024-09-12 22:43:40.297 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 23ms. Found 0 repository interfaces.
+2024-09-12 22:43:40.570 [main] INFO o.springframework.cloud.context.scope.GenericScope - BeanFactory id=dd2a68b9-3986-32ce-9dac-0306fb4de962
+2024-09-12 22:43:40.676 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$81b6502b] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:43:40.706 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:43:40.708 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$eb44c0fc] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:43:40.810 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:43:40.829 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$9dd05328] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:43:41.140 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8081 (http)
+2024-09-12 22:43:41.157 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8081"]
+2024-09-12 22:43:41.165 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
+2024-09-12 22:43:41.166 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.24]
+2024-09-12 22:43:41.294 [main] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+2024-09-12 22:43:41.294 [main] INFO org.springframework.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1996 ms
+2024-09-12 22:43:41.460 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join properties config complete
+2024-09-12 22:43:41.639 [main] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1,jiumumes} inited
+2024-09-12 22:43:41.639 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [jiumumes] success
+2024-09-12 22:43:41.640 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource initial loaded [1] datasource,primary datasource named [jiumumes]
+2024-09-12 22:43:41.666 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join SqlInjector init
+2024-09-12 22:43:43.930 [main] INFO com.mes.service.PlcAgreement - 鍒濆鍖朠lcCacheGlass锛歠alse
+2024-09-12 22:43:44.392 [main] INFO s.d.s.w.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2024-09-12 22:43:44.409 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 22:43:44.416 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 22:43:44.631 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-09-12 22:43:45.842 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskScheduler - Initializing ExecutorService
+2024-09-12 22:43:47.247 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
+2024-09-12 22:43:47.265 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
+2024-09-12 22:43:47.295 [main] INFO s.d.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
+2024-09-12 22:43:47.520 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8081"]
+2024-09-12 22:43:47.548 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8081 (http) with context path ''
+2024-09-12 22:43:47.650 [main] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - nacos registry, deviceInteraction 10.153.19.29:8081 register finished
+2024-09-12 22:43:48.606 [main] INFO com.mes.DeviceInteractionModuleApplication - Started DeviceInteractionModuleApplication in 12.076 seconds (JVM running for 13.529)
+2024-09-12 22:43:48.608 [main] INFO com.mes.AppRunnerConfig - 鍚姩瀹屾垚
+2024-09-12 22:45:32.181 [Thread-36] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registering from Nacos Server now...
+2024-09-12 22:45:32.186 [Thread-36] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registration finished.
+2024-09-12 22:45:32.188 [Thread-36] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-09-12 22:45:32.193 [Thread-36] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource start closing ....
+2024-09-12 22:45:32.202 [Thread-36] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1} closed
+2024-09-12 22:45:32.202 [Thread-36] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource all closed success,bye
+2024-09-12 22:46:53.819 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$e8da833e] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:46:54.842 [main] INFO com.mes.DeviceInteractionModuleApplication - The following profiles are active: prod
+2024-09-12 22:46:55.575 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-09-12 22:46:55.577 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data repositories in DEFAULT mode.
+2024-09-12 22:46:55.611 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 22ms. Found 0 repository interfaces.
+2024-09-12 22:46:55.887 [main] INFO o.springframework.cloud.context.scope.GenericScope - BeanFactory id=19efedd1-1cfa-3015-9f03-869c667d3cdd
+2024-09-12 22:46:55.986 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$ccc08041] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:46:56.012 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:46:56.014 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$364ef112] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:46:56.085 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:46:56.099 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$e8da833e] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 22:46:56.370 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8081 (http)
+2024-09-12 22:46:56.388 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8081"]
+2024-09-12 22:46:56.395 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
+2024-09-12 22:46:56.395 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.24]
+2024-09-12 22:46:56.510 [main] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+2024-09-12 22:46:56.510 [main] INFO org.springframework.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1655 ms
+2024-09-12 22:46:56.671 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join properties config complete
+2024-09-12 22:46:56.822 [main] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1,jiumumes} inited
+2024-09-12 22:46:56.823 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [jiumumes] success
+2024-09-12 22:46:56.823 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource initial loaded [1] datasource,primary datasource named [jiumumes]
+2024-09-12 22:46:56.846 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join SqlInjector init
+2024-09-12 22:46:59.063 [main] INFO com.mes.service.PlcAgreement - 鍒濆鍖朠lcCacheGlass锛歠alse
+2024-09-12 22:46:59.489 [main] INFO s.d.s.w.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2024-09-12 22:46:59.503 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 22:46:59.507 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 22:46:59.707 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-09-12 22:47:00.937 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskScheduler - Initializing ExecutorService
+2024-09-12 22:47:02.418 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
+2024-09-12 22:47:02.432 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
+2024-09-12 22:47:02.462 [main] INFO s.d.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
+2024-09-12 22:47:02.668 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8081"]
+2024-09-12 22:47:02.689 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8081 (http) with context path ''
+2024-09-12 22:47:02.794 [main] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - nacos registry, deviceInteraction 10.153.19.29:8081 register finished
+2024-09-12 22:47:03.749 [main] INFO com.mes.DeviceInteractionModuleApplication - Started DeviceInteractionModuleApplication in 11.436 seconds (JVM running for 12.648)
+2024-09-12 22:47:03.752 [main] INFO com.mes.AppRunnerConfig - 鍚姩瀹屾垚
+2024-09-12 23:03:11.744 [Thread-34] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registering from Nacos Server now...
+2024-09-12 23:03:11.748 [Thread-34] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - De-registration finished.
+2024-09-12 23:03:11.750 [Thread-34] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+2024-09-12 23:03:11.754 [Thread-34] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource start closing ....
+2024-09-12 23:03:11.760 [Thread-34] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1} closed
+2024-09-12 23:03:11.760 [Thread-34] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource all closed success,bye
+2024-09-12 23:03:25.461 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$88784c06] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 23:03:26.477 [main] INFO com.mes.DeviceInteractionModuleApplication - The following profiles are active: prod
+2024-09-12 23:03:27.245 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-09-12 23:03:27.247 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data repositories in DEFAULT mode.
+2024-09-12 23:03:27.280 [main] INFO o.s.d.r.config.RepositoryConfigurationDelegate - Finished Spring Data repository scanning in 21ms. Found 0 repository interfaces.
+2024-09-12 23:03:27.537 [main] INFO o.springframework.cloud.context.scope.GenericScope - BeanFactory id=fc98f7ea-ba84-31c7-be7e-cd052b24a7e8
+2024-09-12 23:03:27.623 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$6c5e4909] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 23:03:27.649 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 23:03:27.651 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$d5ecb9da] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 23:03:27.725 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 23:03:27.738 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$88784c06] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-09-12 23:03:28.015 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8081 (http)
+2024-09-12 23:03:28.026 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8081"]
+2024-09-12 23:03:28.033 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
+2024-09-12 23:03:28.033 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.24]
+2024-09-12 23:03:28.150 [main] INFO o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+2024-09-12 23:03:28.150 [main] INFO org.springframework.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1661 ms
+2024-09-12 23:03:28.310 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join properties config complete
+2024-09-12 23:03:28.456 [main] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1,jiumumes} inited
+2024-09-12 23:03:28.457 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [jiumumes] success
+2024-09-12 23:03:28.457 [main] INFO c.b.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource initial loaded [1] datasource,primary datasource named [jiumumes]
+2024-09-12 23:03:28.484 [main] INFO c.g.y.a.MybatisPlusJoinAutoConfiguration - mybatis plus join SqlInjector init
+2024-09-12 23:03:30.591 [main] INFO com.mes.service.PlcAgreement - 鍒濆鍖朠lcCacheGlass锛歠alse
+2024-09-12 23:03:30.988 [main] INFO s.d.s.w.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
+2024-09-12 23:03:31.005 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 23:03:31.009 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-09-12 23:03:31.161 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+2024-09-12 23:03:32.259 [main] INFO o.s.scheduling.concurrent.ThreadPoolTaskScheduler - Initializing ExecutorService
+2024-09-12 23:03:33.602 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
+2024-09-12 23:03:33.616 [main] INFO s.d.s.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
+2024-09-12 23:03:33.646 [main] INFO s.d.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
+2024-09-12 23:03:33.861 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8081"]
+2024-09-12 23:03:33.884 [main] INFO o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8081 (http) with context path ''
+2024-09-12 23:03:33.969 [main] INFO c.a.cloud.nacos.registry.NacosServiceRegistry - nacos registry, deviceInteraction 10.153.19.29:8081 register finished
+2024-09-12 23:03:34.851 [main] INFO com.mes.DeviceInteractionModuleApplication - Started DeviceInteractionModuleApplication in 10.893 seconds (JVM running for 12.041)
+2024-09-12 23:03:34.853 [main] INFO com.mes.AppRunnerConfig - 鍚姩瀹屾垚
diff --git a/logs/deviceInteraction/web_warn.log b/logs/deviceInteraction/web_warn.log
index a6b0b04..fb5707e 100644
--- a/logs/deviceInteraction/web_warn.log
+++ b/logs/deviceInteraction/web_warn.log
@@ -1,20 +1,83 @@
-2024-09-09 08:11:17.806 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgStorageCageMapper' and 'com.mes.edgstoragecage.mapper.EdgStorageCageMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.808 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'accountMapper' and 'com.mes.md.mapper.AccountMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.809 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgeGrindingLogMapper' and 'com.mes.md.mapper.EdgeGrindingLogMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.809 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'equipmentLogMapper' and 'com.mes.md.mapper.EquipmentLogMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.809 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'glassInfoMapper' and 'com.mes.md.mapper.GlassInfoMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.809 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'menuMapper' and 'com.mes.md.mapper.MenuMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.809 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'orderOriginalPieceMapper' and 'com.mes.md.mapper.OrderOriginalPieceMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.809 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'pageMapper' and 'com.mes.md.mapper.PageMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.809 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'primitiveTaskMapper' and 'com.mes.md.mapper.PrimitiveTaskMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectLogMapper' and 'com.mes.md.mapper.ProjectLogMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectMapper' and 'com.mes.md.mapper.ProjectMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMapper' and 'com.mes.md.mapper.RoleMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMenuMapper' and 'com.mes.md.mapper.RoleMenuMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskLogMapper' and 'com.mes.md.mapper.TaskLogMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskingMapper' and 'com.mes.md.mapper.TaskingMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'workTaskDetailMapper' and 'com.mes.md.mapper.WorkTaskDetailMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.810 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'engineeringMapper' and 'com.mes.engineering.mapper.EngineeringMapper' mapperInterface. Bean already defined with the same name!
-2024-09-09 08:11:17.811 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.mes.*.mapper]' package. Please check your configuration.
-2024-09-09 08:11:21.426 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
-2024-09-09 08:11:21.441 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 10:21:44.531 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgStorageCageMapper' and 'com.mes.edgstoragecage.mapper.EdgStorageCageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.534 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'accountMapper' and 'com.mes.md.mapper.AccountMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.534 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgeGrindingLogMapper' and 'com.mes.md.mapper.EdgeGrindingLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.534 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'equipmentLogMapper' and 'com.mes.md.mapper.EquipmentLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.534 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'glassInfoMapper' and 'com.mes.md.mapper.GlassInfoMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'menuMapper' and 'com.mes.md.mapper.MenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'orderOriginalPieceMapper' and 'com.mes.md.mapper.OrderOriginalPieceMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'pageMapper' and 'com.mes.md.mapper.PageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'primitiveTaskMapper' and 'com.mes.md.mapper.PrimitiveTaskMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectLogMapper' and 'com.mes.md.mapper.ProjectLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectMapper' and 'com.mes.md.mapper.ProjectMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMapper' and 'com.mes.md.mapper.RoleMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMenuMapper' and 'com.mes.md.mapper.RoleMenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskLogMapper' and 'com.mes.md.mapper.TaskLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskingMapper' and 'com.mes.md.mapper.TaskingMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'workTaskDetailMapper' and 'com.mes.md.mapper.WorkTaskDetailMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.535 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'engineeringMapper' and 'com.mes.engineering.mapper.EngineeringMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 10:21:44.536 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.mes.*.mapper]' package. Please check your configuration.
+2024-09-12 10:21:48.272 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 10:21:48.277 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 22:43:40.446 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgStorageCageMapper' and 'com.mes.edgstoragecage.mapper.EdgStorageCageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.446 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'accountMapper' and 'com.mes.md.mapper.AccountMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgeGrindingLogMapper' and 'com.mes.md.mapper.EdgeGrindingLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'equipmentLogMapper' and 'com.mes.md.mapper.EquipmentLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'glassInfoMapper' and 'com.mes.md.mapper.GlassInfoMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'lineMapper' and 'com.mes.md.mapper.LineMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'menuMapper' and 'com.mes.md.mapper.MenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'orderOriginalPieceMapper' and 'com.mes.md.mapper.OrderOriginalPieceMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'pageMapper' and 'com.mes.md.mapper.PageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'primitiveTaskMapper' and 'com.mes.md.mapper.PrimitiveTaskMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectLogMapper' and 'com.mes.md.mapper.ProjectLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectMapper' and 'com.mes.md.mapper.ProjectMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMapper' and 'com.mes.md.mapper.RoleMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMenuMapper' and 'com.mes.md.mapper.RoleMenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.447 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskLogMapper' and 'com.mes.md.mapper.TaskLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.448 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskingMapper' and 'com.mes.md.mapper.TaskingMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.448 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'workTaskDetailMapper' and 'com.mes.md.mapper.WorkTaskDetailMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.448 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'engineeringMapper' and 'com.mes.engineering.mapper.EngineeringMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:43:40.448 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.mes.*.mapper]' package. Please check your configuration.
+2024-09-12 22:43:44.409 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 22:43:44.416 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 22:46:55.750 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgStorageCageMapper' and 'com.mes.edgstoragecage.mapper.EdgStorageCageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.750 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'accountMapper' and 'com.mes.md.mapper.AccountMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.750 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgeGrindingLogMapper' and 'com.mes.md.mapper.EdgeGrindingLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.750 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'equipmentLogMapper' and 'com.mes.md.mapper.EquipmentLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.750 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'glassInfoMapper' and 'com.mes.md.mapper.GlassInfoMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.750 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'lineMapper' and 'com.mes.md.mapper.LineMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.750 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'menuMapper' and 'com.mes.md.mapper.MenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'orderOriginalPieceMapper' and 'com.mes.md.mapper.OrderOriginalPieceMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'pageMapper' and 'com.mes.md.mapper.PageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'primitiveTaskMapper' and 'com.mes.md.mapper.PrimitiveTaskMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectLogMapper' and 'com.mes.md.mapper.ProjectLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectMapper' and 'com.mes.md.mapper.ProjectMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMapper' and 'com.mes.md.mapper.RoleMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMenuMapper' and 'com.mes.md.mapper.RoleMenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskLogMapper' and 'com.mes.md.mapper.TaskLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskingMapper' and 'com.mes.md.mapper.TaskingMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.751 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'workTaskDetailMapper' and 'com.mes.md.mapper.WorkTaskDetailMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 22:46:55.752 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.mes.*.mapper]' package. Please check your configuration.
+2024-09-12 22:46:59.503 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 22:46:59.507 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 23:03:27.412 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgStorageCageMapper' and 'com.mes.edgstoragecage.mapper.EdgStorageCageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'accountMapper' and 'com.mes.md.mapper.AccountMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'edgeGrindingLogMapper' and 'com.mes.md.mapper.EdgeGrindingLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'equipmentLogMapper' and 'com.mes.md.mapper.EquipmentLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'glassInfoMapper' and 'com.mes.md.mapper.GlassInfoMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'lineConfigurationMapper' and 'com.mes.md.mapper.LineConfigurationMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'lineMapper' and 'com.mes.md.mapper.LineMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'machineMapper' and 'com.mes.md.mapper.MachineMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'menuMapper' and 'com.mes.md.mapper.MenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'orderOriginalPieceMapper' and 'com.mes.md.mapper.OrderOriginalPieceMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'pageMapper' and 'com.mes.md.mapper.PageMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'primitiveTaskMapper' and 'com.mes.md.mapper.PrimitiveTaskMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.413 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectLogMapper' and 'com.mes.md.mapper.ProjectLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.414 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'projectMapper' and 'com.mes.md.mapper.ProjectMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.414 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMapper' and 'com.mes.md.mapper.RoleMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.414 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'roleMenuMapper' and 'com.mes.md.mapper.RoleMenuMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.414 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskLogMapper' and 'com.mes.md.mapper.TaskLogMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.414 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'taskingMapper' and 'com.mes.md.mapper.TaskingMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.414 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - Skipping MapperFactoryBean with name 'workTaskDetailMapper' and 'com.mes.md.mapper.WorkTaskDetailMapper' mapperInterface. Bean already defined with the same name!
+2024-09-12 23:03:27.414 [main] WARN org.mybatis.spring.mapper.ClassPathMapperScanner - No MyBatis mapper was found in '[com.mes.*.mapper]' package. Please check your configuration.
+2024-09-12 23:03:31.005 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
+2024-09-12 23:03:31.009 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
--
Gitblit v1.8.0