From 1c5e44cdff0f7900914a883056d93979265e306f Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 20 九月 2023 08:20:16 +0800 Subject: [PATCH] 删除不需要的代码,parameter、action页不需要输入密码 --- springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java index 2ea5797..0f48627 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java +++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java @@ -37,12 +37,12 @@ List<StorageCage> cagelist3 = homeMapper.selectRack3(); List<StorageCage> cagelist4 = homeMapper.selectRack4(); jsonObject.append("cagelist1", cagelist1); - jsonObject.append("cagelist2", cagelist2); + jsonObject.append("cagelist2", (Object)cagelist2); jsonObject.append("cagelist3", cagelist3); jsonObject.append("cagelist4", cagelist4); // 杩涘嚭鐗囦换鍔� - List<StorageCage> tasklist1 = homeMapper.selectinout(2); - List<StorageCage> tasklist2 = homeMapper.selectinout(3); + List<StorageCage> tasklist1 = homeMapper.selectinout(3); + List<StorageCage> tasklist2 = homeMapper.selectinout(2); jsonObject.append("tasklist1", tasklist1); jsonObject.append("tasklist2", tasklist2); // 鏌ヨ鎶ヨ淇℃伅 @@ -53,7 +53,10 @@ addressList.add("DB106.12"); addressList.add("DB106.0"); List<Short> paramlist= S7control.getinstance().ReadWord(addressList); - + // 鑾峰彇杩涚墖杞︾姸鎬� + List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬� + boolean exist1 = datas1ListState.contains((short) 0); + jsonObject.append("zhuangtai",exist1); // List<Short> paramlists = new ArrayList<Short>(); // short para1 = 11111; // short para2 = 32000; -- Gitblit v1.8.0