增加假的报警代码

yangys

2024-09-10 1bf92cd596e6d1c259e471dae605fca4d0ed8824

增加假的报警代码

 collect/src/main/java/com/qianwen/mdc/collect/controller/MqttController.java

@@ -41,7 +41,7 @@
    public void testRec2() {
        //数据格式：{"174":[{"values":{"d1":12},"ts":"1721978780449"}]} 174是应用id
        //多条格式：{"174":[{"values":{"DeviceStatus":2},"ts":"1722478128278"},{"values":{"spindleSpeed":22},"ts":"1722478128281"}]}
        String payload = "{\"174\":[{\"values\":{\"DeviceStatus\":2,\"Output\":34},\"ts\":\"1725247557768\"}]}";
        String payload = "{\"174\":[{\"values\":{\"DeviceStatus\":2,\"Output\":38},\"ts\":\"1725247557768\"}]}";
        //payload = "{\"174\":[{\"values\":{\"Output\":11},\"ts\":\"1722478128278\"},{\"values\":{\"SpindleSpeed\":22},\"ts\":\"1722478128281\"}]}";
        recService.handle(payload);
    }

 collect/src/main/java/com/qianwen/mdc/collect/entity/iotdb/AggregateOutput.java

@@ -23,7 +23,7 @@
    private Integer shiftIndex;
    private Integer shiftTimeType;
  
    private Boolean isSync;
    //private Boolean isSync;
    private Long employeeId;

   
@@ -65,11 +65,11 @@
    public void setShiftTimeType(final Integer shiftTimeType) {
        this.shiftTimeType = shiftTimeType;
    }

/*

    public void setIsSync(final Boolean isSync) {
        this.isSync = isSync;
    }
    }*/

    public void setEmployeeId(final Long employeeId) {
        this.employeeId = employeeId;
@@ -179,10 +179,10 @@
        return this.shiftTimeType;
    }


    /*
    public Boolean getIsSync() {
        return this.isSync;
    }
    }*/

    public Long getEmployeeId() {
        return this.employeeId;

 collect/src/main/java/com/qianwen/mdc/collect/handler/AlarmDataHandler.java

@@ -30,7 +30,7 @@
        alarm.setFactoryYear(data.getFactoryYear());
        alarm.setShiftIndex(data.getShiftIndex());
        alarm.setShiftTimeType(data.getShiftTimeType());
    	
        fileAlarmDetail(alarm,data);
        alarmService.saveAlarms(Arrays.asList(alarm));
        
        log.info("报警数据处理完成:告警数据{} ",alarm);
@@ -42,6 +42,15 @@
     * @param alarm
     */
    void fileAlarmDetail(Alarm alarm,PackedTelemetryData data){
        alarm.setCode(this.parseCode(data.getValue()));
        alarm.setMessage(data.getValue());
    }
    /**
     * 解析报警代码
     * @param collectText
     * @return
     */
    String parseCode(String collectText) {
        return "00";
    }
}