From 6466ffb86e19485aa8dccc55aad3aa53b6780e4d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 七月 2024 08:42:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java | 73 ++++++++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java | 60 ++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java | 20 ++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 1
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml | 5
JsonFile/PlcTemperingGlass.json | 132 ++++++++++++++++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java | 20 ++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java | 16 ++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java | 16 ++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java | 29 ++++
12 files changed, 374 insertions(+), 2 deletions(-)
diff --git a/JsonFile/PlcTemperingGlass.json b/JsonFile/PlcTemperingGlass.json
new file mode 100644
index 0000000..3abe9a6
--- /dev/null
+++ b/JsonFile/PlcTemperingGlass.json
@@ -0,0 +1,132 @@
+{
+ "plcAddressBegin": "DB88.0",
+ "plcAddressLenght": "58",
+ "dataType": "word",
+ "parameteInfor": [
+ {
+ "codeId": "confirmationWord",
+ "addressIndex": "0",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperingLayoutId",
+ "addressIndex": "2",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "filmsid",
+ "addressIndex": "4",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperingType",
+ "addressIndex": "6",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "thickness",
+ "addressIndex": "8",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "loadingRate",
+ "addressIndex": "10",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "areaDifference",
+ "addressIndex": "12",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "state",
+ "addressIndex": "22",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "deviceState",
+ "addressIndex": "24",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "resultState",
+ "addressIndex": "26",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "loadSpeed",
+ "addressIndex": "28",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "downSpeed",
+ "addressIndex": "30",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "load1",
+ "addressIndex": "32",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heat1",
+ "addressIndex": "34",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heat2",
+ "addressIndex": "36",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "cool1",
+ "addressIndex": "38",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "cool2",
+ "addressIndex": "40",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "downId",
+ "addressIndex": "42",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "productionTime",
+ "addressIndex": "44",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heatEnergy",
+ "addressIndex": "46",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "coolEnergy",
+ "addressIndex": "48",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureUp1",
+ "addressIndex": "50",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureDown1",
+ "addressIndex": "52",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureUp2",
+ "addressIndex": "54",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureDown2",
+ "addressIndex": "56",
+ "addressLenght": "2"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 98206a6..c48b407 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -375,7 +375,7 @@
List<Object> list = edgStorageCageDetailsService.listObjs(queryWrapper);
//鑾峰彇绗煎唴鐜荤拑鐗堝浘宸�兼槸鍚﹀ぇ浜庨槇鍊�
if (CollectionUtil.isNotEmpty(list)) {
- int diff = (int) list.get(0);
+ Long diff = (Long) list.get(0);
return diff > threshold;
} else {
return Boolean.FALSE;
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java
new file mode 100644
index 0000000..94ae268
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java
@@ -0,0 +1,60 @@
+package com.mes.common;
+
+import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
+import com.mes.device.PlcParameterObject;
+import com.mes.tools.InitUtil;
+import com.mes.tools.S7control;
+
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/4/9 15:13
+ * @Description:
+ */
+public class S7object extends Thread {
+ public S7control plccontrol; // PLC閫氳绫诲疄渚�
+ private EPlcType plcType = EPlcType.S1200; // 瑗块棬瀛怭LC绫诲瀷
+ private String ip = "192.168.20.202"; // plc ip鍦板潃
+ private int port = 102; // plc 绔彛鍙�
+
+
+ public PlcParameterObject PlcMesObject;
+ private static volatile S7object instance = null;
+
+ private S7object() {
+ if (plccontrol == null) {
+ plccontrol = new S7control(plcType, ip, port, 0, 0);
+ String PlcLoadGlass = System.getProperty("user.dir") + "/JsonFile/PlcTemperingGlass.json";
+ PlcMesObject = InitUtil.initword(PlcLoadGlass);
+ }
+ }
+
+ // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
+ public static S7object getinstance() {
+ if (instance == null) {
+ synchronized (S7object.class) {
+ if (instance == null) {
+ instance = new S7object();
+ }
+ }
+ }
+ return instance;
+ }
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(100);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
+ if (getplcvlues != null) {
+ PlcMesObject.setPlcParameterList(getplcvlues);
+ }
+ }
+ }
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
new file mode 100644
index 0000000..6b27ad0
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -0,0 +1,29 @@
+package com.mes.job;
+
+import com.mes.tempering_record.service.TemperingRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/7/17 12:47
+ * @Description:
+ */
+public class TemperingTask {
+
+ @Autowired
+ private TemperingRecordService temporalRecordService;
+
+
+ @Scheduled(fixedDelay = 1000)
+ public void temperingGlassBefore() {
+ //todo:鑾峰彇閽㈠寲鐗堝浘涓姸鎬佷负2鐨勶紙杩涚倝瀹屾垚鐨勭幓鐠冧俊鎭級 涓斾笉瀛樺湪閽㈠寲璁板綍琛ㄥ唴鐨�
+
+
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void temperingGlassAfter() {
+
+ }
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java
new file mode 100644
index 0000000..774f5ae
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java
@@ -0,0 +1,20 @@
+package com.mes.tempering_record.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+@RestController
+@RequestMapping("/temperingRecord")
+public class TemperingRecordController {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java
new file mode 100644
index 0000000..b11715c
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java
@@ -0,0 +1,73 @@
+package com.mes.tempering_record.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TemperingRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閽㈠寲鐗堝浘
+ */
+ private Integer temperingLayoutId;
+
+ /**
+ * 鐜荤拑鏉愯川(鑶滅郴0.鐧界幓1.鍗曢摱2.鍙岄摱3涓夐摱 4.瓒呯櫧5.鐑弽灏�)
+ */
+ private Integer glassType;
+
+ /**
+ * 閽㈠寲绫诲瀷锛�1.鍏ㄩ挗:2.鍗婇挗锛�
+ */
+ private Integer temperingType;
+
+ /**
+ * 鍘氬害锛堝帤搴�*10)
+ */
+ private Double thickness;
+
+ /**
+ * 瑁呰浇鐜�
+ */
+ private Double loadingRate;
+
+ /**
+ * 闈㈢Н宸�
+ */
+ private Double areaDifference;
+
+ /**
+ * 鐢熶骇鑰楁椂
+ */
+ private String productionTime;
+
+ /**
+ * 鍔犵儹鑳借��
+ */
+ private String heatEnergy;
+
+ /**
+ * 鍐峰嵈鑳借��
+ */
+ private String coolEnergy;
+
+ /**
+ * 鏄惁瀹屾垚(plc鑾峰彇闈�1锛氬弬鏁颁笉瀛樺湪锛�2銆佸尮閰嶅畬鎴愶紱3銆佸尮閰嶈秴鏃讹級
+ */
+ private Integer state;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java
new file mode 100644
index 0000000..c163cb3
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java
@@ -0,0 +1,16 @@
+package com.mes.tempering_record.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.tempering_record.entity.TemperingRecord;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+public interface TemperingRecordMapper extends BaseMapper<TemperingRecord> {
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml
new file mode 100644
index 0000000..73d8f85
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.tempering_record.mapper.TemperingRecordMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java
new file mode 100644
index 0000000..49137c5
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java
@@ -0,0 +1,16 @@
+package com.mes.tempering_record.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.tempering_record.entity.TemperingRecord;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+public interface TemperingRecordService extends IService<TemperingRecord> {
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java
new file mode 100644
index 0000000..1596f57
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.mes.tempering_record.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.tempering_record.entity.TemperingRecord;
+import com.mes.tempering_record.mapper.TemperingRecordMapper;
+import com.mes.tempering_record.service.TemperingRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+@Service
+public class TemperingRecordServiceImpl extends ServiceImpl<TemperingRecordMapper, TemperingRecord> implements TemperingRecordService {
+
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 8b40827..6e60501 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -489,6 +489,7 @@
DownGlassInfo downGlassInfo = new DownGlassInfo();
BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
//todo锛氳惤鏋剁墖搴�
+ downGlassInfo.setSequence(downGlassInfoService.queryMaxSequence(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer()));
downGlassInfoService.save(downGlassInfo);
//鐢熸垚浠诲姟淇℃伅
GlassInfo glassInfo = new GlassInfo();
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
index 1930840..32bca1a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
@@ -38,7 +38,7 @@
order by count desc limit 1
</select>
<select id="queryMaxSequence" resultType="java.lang.Integer">
- SELECT max(sequence) + 1 as sequence
+ SELECT COALESCE(max(sequence) + 1, 0) as sequence
FROM down_glass_info
WHERE flow_card_id = #{flowCardId}
AND layer = #{layer}
--
Gitblit v1.8.0