From 9152c5394d4fd9d14d1a5fb9de9d441450b2bac6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 20 十一月 2024 08:41:13 +0800
Subject: [PATCH] 1、卧理进出片订阅功能直接按订阅结果判断,订阅后查询数据库,可能造成数据重复读,任务重复执行问题 2、大理片笼新增任务表、任务历史表脚本 3、大理片笼进片任务功能开发已完成50%

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
index 8fbb58a..d5cc9c8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
@@ -18,13 +18,13 @@
 public class ExcelToJsonConverter {
 
     public static void main(String[] args) {
-        String excelFilePath = "src/main/resources/JsonFile/alarm.xlsx";
+        String excelFilePath = "src/main/resources/JsonFile/PlcdownGlass.xlsx";
         String sheetName = "Sheet1";
         int addressColumnIndex = 0;
         int nameColumnIndex = 1;
 
         //int unitColumnIndex = 2;
-        String outputFilePath = "src/main/resources/JsonFile/PlcAlarm.json";
+        String outputFilePath = "src/main/resources/JsonFile/PlcdownGlass.json";
 
         try (Workbook workbook = new XSSFWorkbook(new FileInputStream(excelFilePath))) {
             Sheet sheet = workbook.getSheet(sheetName);
@@ -75,8 +75,8 @@
             LinkedHashMap<String, Object> resultObject = new LinkedHashMap<>();
             resultObject.put("plcAddressBegin", "DB100.0");
             resultObject.put("plcAddressLenght", String.valueOf(plcAddressLength));
-            // resultObject.put("dataType", "word");
-            resultObject.put("dataType", "bit");
+            resultObject.put("dataType", "word");
+           // resultObject.put("dataType", "bit");
             resultObject.put("parameteInfor", jsonList);
 
             Gson gson = new Gson();

--
Gitblit v1.8.0