ZengTao
2023-09-08 6cda9305bd4a146af008711e1349ac65056279cf
主界面添加报警信息弹窗
2个文件已修改
24 ■■■■ 已修改文件
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -91,9 +91,9 @@
      for (short i = 0; i < shuzu1.length; i++) {
        short result = alarmMapper.selectnullti(shuzu[i]);
        if (shuzu1[i] == 1 && result == 0) {
          alarmMapper.Insertalarm(shuzu[i]);
          // alarmMapper.Insertalarm(shuzu[i]);
        } else if (shuzu1[i] == 0 && result > 0) {
          alarmMapper.updatealarm(shuzu[i]);
          // alarmMapper.updatealarm(shuzu[i]);
        }
      }
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -2,9 +2,9 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
import org.springframework.context.ConfigurableApplicationContext;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -25,6 +25,7 @@
            JSONObject jsonObject = new JSONObject();
            
            //注入mapper
            homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
            // 笼子使用情况
            List<StorageCage> tableData = homeMapper.selectAll();
@@ -46,14 +47,15 @@
            //查询报警信息
            List<alarmmg> alarmmg=homeMapper.SelectAlarmmgInfo();
            jsonObject.append("alarmmg", alarmmg);
            //读去Plc进片车与出片车位置
            // List<String> addressList = new ArrayList<>();
            // addressList.add("DB100.DBW0");
            // addressList.add("DB100.DBW2");
            // List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
            // jsonObject.append("params", paramlist);
            jsonObject.append("params", new short[] { 30, 40, });
            //读去Plc进片车与出片车位置W
            List<String> addressList = new ArrayList<String>();
            addressList.add("DB100.DBW0");
            addressList.add("DB100.DBW12");
            List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
            //将集合转为数组
            Short[] paramlists = paramlist.toArray(new Short[0]);
            jsonObject.append("params", paramlists);
            // jsonObject.append("params", new short[] { 30, 40, });
            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
            if (sendwServer != null) {