ZengTao
2024-04-01 eccfd8d0504c48f07c7e11ed1fc94451ce5e7cb1
添加报警信息
5个文件已修改
251 ■■■■■ 已修改文件
Alarm.json 221 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/MyGenerator.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Alarm.json
@@ -1,618 +1,653 @@
{
  "content": [
    {
      "name": "D01 VFD error",
      "name": "Emergency Stop",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D02 VFD error",
      "name": "DB15.0.1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D03 VFD error",
      "name": "DB15.0.2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D04 VFD error",
      "name": "DB15.0.3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D05 VFD error",
      "name": "DB15.0.4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D06 VFD error",
      "name": "DB15.0.5",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01 VFD error",
      "name": "DB15.0.6",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02 VFD error",
      "name": "DB15.0.7",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 VFD error",
      "name": "DB15.1.0",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 VFD error",
      "name": "DB15.1.1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 servo turn error",
      "name": "DB15.1.2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 servo turn error",
      "name": "DB15.1.3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 servo travel error",
      "name": "DB15.1.4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 servo travel error",
      "name": "DB15.1.5",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01 servo travel error",
      "name": "DB15.1.6",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02 servo travel error",
      "name": "DB15.1.7",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D01 DEC error",
      "name": "A01_FVDAlarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D01 pos error",
      "name": "A01_LowAlarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D02 DEC error",
      "name": "A01_OutJam",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D02 pos error",
      "name": "DB15.2.3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D03 DEC error",
      "name": "DB15.2.4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D03 pos error",
      "name": "DB15.2.5",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D04 DEC error",
      "name": "DB15.2.6",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D04 pos error",
      "name": "DB15.2.7",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D05 DEC error",
      "name": "DB15.3.0",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D05 pos error",
      "name": "DB15.3.1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D06 DEC error",
      "name": "DB15.3.2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D06 pos error",
      "name": "DB15.3.3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "DB15.3.4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "DB15.3.5",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "DB15.3.6",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "DB15.3.7",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02_ServoXAlarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 DEC error",
      "name": "A02_ServoYAlarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 pos error",
      "name": "A02_InJam",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 DEC error",
      "name": "A02_OutJam",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 pos error",
      "name": "A02_limiBottom",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01 IN DEC error",
      "name": "A02_LimitTop",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01 IN pos error",
      "name": "DB15.4.6",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01 OUT DEC error",
      "name": "DB15.4.7",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01 OUT pos error",
      "name": "DB15.5.0",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02 IN DEC error",
      "name": "DB15.5.1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02 IN pos error",
      "name": "DB15.5.2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02 OUT DEC error",
      "name": "DB15.5.3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02 OUT pos error",
      "name": "DB15.5.4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D01 Scan glass exceeding limit",
      "name": "DB15.5.5",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "emergency stop alarm",
      "name": "DB15.5.6",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "More glass than known",
      "name": "DB15.5.7",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "less glass than known",
      "name": "B01_V90Alarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D01 conveyor timeout alarm",
      "name": "B01_FVDAlarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D02 conveyor timeout alarm",
      "name": "B01_I950Alarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D03 conveyor timeout alarm",
      "name": "B01_LeftLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D04 conveyor timeout alarm",
      "name": "B01_RightLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D05 conveyor timeout alarm",
      "name": "B01_TurnTopLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "D06 conveyor timeout alarm",
      "name": "B01_TurnBottomLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 conveyor timeout alarm",
      "name": "B01_Limit+",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 conveyor timeout alarm",
      "name": "B01_Limit-",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01 conveyor timeout alarm",
      "name": "B01_LeftJam",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02 conveyor timeout alarm",
      "name": "B01_RightJam",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 conveyor Left safety alarm",
      "name": "DB15.7.3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01 conveyor right safety alarm",
      "name": "DB15.7.4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 conveyor Left safety alarm",
      "name": "DB15.7.5",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02 conveyor right safety alarm",
      "name": "DB15.7.6",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "1# buffer safety alarm",
      "name": "DB15.7.7",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "2# buffer safety alarm",
      "name": "C01_V90Alarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "3# buffer safety alarm",
      "name": "C01_FVDAlarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "4# buffer safety alarm",
      "name": "C01_LeftLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A01.SR right in pos error",
      "name": "C01_RightLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "A02.SR left in pos error",
      "name": "C01_Limit+",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01.SR left in pos error",
      "name": "C01_Limit-",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01.SR left dec error",
      "name": "C01_BlowAlarm1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01.SR right dec error",
      "name": "C01_BlowAlarm2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B01.SR right in pos error",
      "name": "C01_BlowAlarm3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02.SR left in pos error",
      "name": "C01_BlowAlarm4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02.SR left dec error",
      "name": "C01_BlowUpAlarm1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },
    {
      "name": "B02.SR right dec error",
      "name": "C01_BlowUpAlarm2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    }
    ,{
      "name": "B02.SR right in pos error",
      "name": "C01_GlassUpAlarm1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A01 servo turn  homed",
      "name": "C01_GlassUpAlarm2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A02 servo turn  homed",
      "name": "C01_GlassUpAlarm3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A01 servo travel  homed",
      "name": "C01_GlassUpAlarm4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A02 servo travel  homed",
      "name": "C02_V90Alarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "B01 servo travel  homed",
      "name": "C02_FVDAlarm",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "B02 servo travel  homed",
      "name": "C02_LeftLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "resetDelay",
      "name": "C02_RightLimit",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A01 travel Negative limit",
      "name": "C02_Limit+",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A01 travel Positive limit",
      "name": "C02_Limit-",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A01 turn up limit",
      "name": "C02_BlowAlarm1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A01 turn down limit",
      "name": "C02_BlowAlarm2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A02 travel Negative limit",
      "name": "C02_BlowAlarm3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A02 travel Positive limit",
      "name": "C02_BlowAlarm4",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A02 turn up limit",
      "name": "C02_BlowUpAlarm1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    } ,{
      "name": "A02 turn down limit",
      "name": "C02_BlowUpAlarm2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },{
      "name": "B01 travel Negative limit",
      "name": "C02_GlassUpAlarm1",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },{
      "name": "B01 travel Positive limit",
      "name": "C02_GlassUpAlarm2",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },{
      "name": "B02 travel Negative limit",
      "name": "C02_GlassUpAlarm3",
      "value": "1",
      "state": "1",
      "type": "3",
      "page": "1"
    },{
      "name": "B02 travel Positive limit",
      "name": "C02_GlassUpAlarm4",
      "value": "1",
      "state": "1",
      "type": "3",
@@ -621,8 +656,8 @@
  ],
  "address": [
    {
      "name": "DB104.0.0",
      "count": 91
      "name": "DB15.0.0",
      "count": 96
    }
  ]
}
springboot-vue3/src/main/java/MyGenerator.java
@@ -18,7 +18,8 @@
public class MyGenerator {
    /** 数据源配置*/
    private static final String jdbc = "jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    // private static final String jdbc = "jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    private static final String jdbc = "jdbc:mysql://localhost:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    private static final String driverName = "com.mysql.cj.jdbc.Driver";
    private static final String username = "root";
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -10,7 +10,6 @@
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.example.springboot.mapper.AlarmMapper;
@@ -28,7 +27,7 @@
    FileInputStream fileInputStream;
    try {
      // 从文件中读取字节数据存入 fileInputStream
      fileInputStream = new FileInputStream("D:/Albania_Mes/Alarm.json");
      fileInputStream = new FileInputStream("D:/Code/Albania_Mes/Alarm.json");
      // 读取 fileInputStream 中字节并将其解码为字符
      InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
      // 提高读取效率,在 BufferedReader 内包装 InputStreamReader
@@ -87,9 +86,9 @@
      Integer Plccount = this.count;
      // 根据地址读取PCL数据
      List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.0.0", Plccount);
      List<Boolean> plclist = S7control.getinstance().ReadBits("DB15.0.0", Plccount);
//      List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
      // System.out.println(plclist);
      System.out.println(plclist);
      // Boolean[] values = { false, false, true, false, true, false, true, false,
      // true, false, true, false, true, false,
      // true, false, true, false, true, false, true, false, true, false, true, false,
@@ -129,6 +128,10 @@
            alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
            for (short i = 0; i < array1.length; i++) {
              // 查询对应报警信息结束时间为null的条数
              if(i==48){
                short result = alarmMapper.selectnullti(array1[i]);
                System.out.println(result+"-"+array1[i]);
              }
              short result = alarmMapper.selectnullti(array1[i]);
              // 读取到PLC的值为1并且对应报警信息结束时间为null的条数的条数为0
    //System.out.println(result);
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -16,11 +16,15 @@
        // TODO Auto-generated method stub
        //
        System.out.println("启动完成");
        new PLCAutoMes().start();
         new PlcHoldNew().start();
         new Plchome().start();
        new Plcalarm().start();
        // new PLCAutoMes().start();
        //  new PlcHoldNew().start();
        //  new Plchome().start();
       
    }
}
springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java
@@ -14,10 +14,10 @@
  @Select("SELECT count(*) FROM alarmmg where endTime is null and content=#{content}")
  short selectnullti(String content);// 根据报警内容查询结束时间为null的
  @Insert("INSERT INTO `canadames`.`alarmmg`( `content`,`timeon`) VALUES ( #{content},now())")
  @Insert("INSERT INTO `alarmmg`( `content`,`timeon`) VALUES ( #{content},now())")
  void Insertalarm(String content);// 添加一条报警数据
  @Insert("UPDATE  `canadames`.`alarmmg` set endTime= now() where endTime is null and content=#{content}")
  @Insert("UPDATE  `alarmmg` set endTime= now() where endTime is null and content=#{content}")
  void updatealarm(String content);// 修改对应报警内容的结束时间
  @Select("SELECT * FROM alarmmg where timeon between #{sj1} and #{sj2}")