fix：夏东伟提交

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/EquipmentWarningRecord.java

+package net.vtstar.zhongtong.avi.equipment.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.vtstar.user.search.JoinColumn;
+import net.vtstar.user.search.Search;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author: xiadongwei
+ * @Date: 2019/9/20 17:29
+ */
+@ApiModel("设备报警")
+@Data
+@Search(code = "MACHINE_RUNTIME_RECORD")
+@Table(name = "equip_warning_record")
+public class EquipmentWarningRecord {
+
+    @Id
+    private Long id;
+
+    @ApiModelProperty(notes = "车间")
+    @Column(name = "workshop_code")
+    @Search
+    private String workshopCode;
+
+    @ApiModelProperty(notes = "设备ID")
+    @Column(name = "machine_id")
+    private Long machineId;
+
+    @ApiModelProperty(notes = "设备编号")
+    @JoinColumn(tableName = EquipInfo.class, name = "equip_code")
+    private String equipCode;
+
+    @ApiModelProperty(notes = "设备名称")
+    @JoinColumn(tableName = EquipInfo.class, name = "alias")
+    @Search
+    private String alias;
+
+    @ApiModelProperty(notes = "当前运行时间")
+    @Column(name = "current_runtime")
+    private BigDecimal currentRuntime;
+
+    @ApiModelProperty(notes = "累计运行时间")
+    @Column(name = "total_runtime")
+    private BigDecimal totalRuntime;
+
+    @ApiModelProperty(notes = "创建时间")
+    @Column(name = "create_time")
+    private Date createTime;
+}

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/CentralizedFillingClutchMachine.java

@@ -26,12 +26,7 @@ public class CentralizedFillingClutchMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "加注量(ml)")
     @ApiModelProperty(notes = "加注量")
@@ -46,7 +41,7 @@ public class CentralizedFillingClutchMachine extends EquipmentData {
     @Show(label = "设备状态")
     @Column(name = "state")
     @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
-    private int state;
+    private Integer status;
 
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FloorLeatherHotMachine.java

@@ -26,12 +26,7 @@ public class FloorLeatherHotMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "模头1区温度")
     @ApiModelProperty(notes = "模头1区温度")
@@ -101,7 +96,7 @@ public class FloorLeatherHotMachine extends EquipmentData {
     @Show(label = "设备状态")
     @Column(name = "state")
     @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
-    private int state;
+    private Integer status;
 
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FocusAddingRefrigerantMachine.java

@@ -26,12 +26,7 @@ public class FocusAddingRefrigerantMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "加注量(ml)")
     @ApiModelProperty(notes = "加注量")
@@ -46,7 +41,7 @@ public class FocusAddingRefrigerantMachine extends EquipmentData {
     @Show(label = "设备状态")
     @Column(name = "state")
     @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
-    private int state;
+    private Integer status;
 
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FocusBoosterOilMachine.java

@@ -26,12 +26,7 @@ public class FocusBoosterOilMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "枪1加注量(ml)")
     @ApiModelProperty(notes = "枪1加注量(ml)")
@@ -46,7 +41,7 @@ public class FocusBoosterOilMachine extends EquipmentData {
     @Show(label = "设备状态")
     @Column(name = "state")
     @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
-    private int state;
+    private Integer status;
 
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/PlateChainMachine.java

@@ -25,12 +25,7 @@ public class PlateChainMachine{
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "当班平均运行间隔时间")
     @ApiModelProperty(notes = "当班平均运行间隔时间")

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/PlateChainStateMachine.java

@@ -21,11 +21,7 @@ public class PlateChainStateMachine extends EquipmentData {
 
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Column(name = "state")
     @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/CentralizedFillingClutchMachineJob.java

@@ -5,11 +5,12 @@ import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.scada.base.gather.job.GatherJob;
 import net.vtstar.zhongtong.avi.gateway.assembly.domain.CentralizedFillingClutchMachine;
-import net.vtstar.zhongtong.avi.gateway.assembly.domain.FloorLeatherHotMachine;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 离合油加注设备数据采集JOB
  */
@@ -28,23 +29,11 @@ public class CentralizedFillingClutchMachineJob extends GatherJob {
 
     public boolean handleObject(EquipmentData equipmentData) {
         CentralizedFillingClutchMachine data = (CentralizedFillingClutchMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -55,4 +44,9 @@ public class CentralizedFillingClutchMachineJob extends GatherJob {
         }
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((CentralizedFillingClutchMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/FloorLeatherHotMachineJob.java

@@ -5,11 +5,12 @@ import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.scada.base.gather.job.GatherJob;
 import net.vtstar.zhongtong.avi.gateway.assembly.domain.FloorLeatherHotMachine;
-import net.vtstar.zhongtong.avi.gateway.chassis.domain.ChassisTorqueWrench;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 地板革热熔涂胶设备数据采集JOB
  */
@@ -26,25 +27,14 @@ public class FloorLeatherHotMachineJob extends GatherJob {
         super.gatherByModbus(NAME, FloorLeatherHotMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         FloorLeatherHotMachine data = (FloorLeatherHotMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -52,4 +42,9 @@ public class FloorLeatherHotMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((FloorLeatherHotMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/FocusAddingRefrigerantMachineJob.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 冷媒加注机设备数据采集JOB
  */
@@ -25,25 +27,14 @@ public class FocusAddingRefrigerantMachineJob extends GatherJob {
         super.gatherByModbus(NAME, FocusAddingRefrigerantMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         FocusAddingRefrigerantMachine data = (FocusAddingRefrigerantMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -51,4 +42,9 @@ public class FocusAddingRefrigerantMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((FocusAddingRefrigerantMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/FocusBoosterOilMachineJob.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 助力油加注设备数据采集JOB
  */
@@ -25,25 +27,14 @@ public class FocusBoosterOilMachineJob extends GatherJob {
         super.gatherByModbus(NAME, FocusBoosterOilMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         FocusBoosterOilMachine data = (FocusBoosterOilMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -51,4 +42,10 @@ public class FocusBoosterOilMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((FocusBoosterOilMachine)equipmentData).setCreateTime(new Date());
+    }
+
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/PlateChainStateMachineJob.java

@@ -12,6 +12,7 @@ import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * 总装板链状态设备数据采集JOB
@@ -59,4 +60,9 @@ public class PlateChainStateMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((PlateChainStateMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/domain/ChassisTorqueWrench.java

@@ -26,12 +26,7 @@ public class ChassisTorqueWrench  extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "一轴扭矩")
     @ApiModelProperty(notes = "一轴扭矩")
@@ -56,7 +51,7 @@ public class ChassisTorqueWrench  extends EquipmentData {
     @Show(label = "设备状态")
     @Column(name = "state")
     @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
-    private int state;
+    private Integer status;
 
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")

src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/job/ChassisTorqueMachineJob.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 底盘车间智能扭力扳手数据采集JOB
  */
@@ -28,23 +30,11 @@ public class ChassisTorqueMachineJob extends GatherJob {
     @Override
     protected boolean handleObject(EquipmentData equipmentData) {
         ChassisTorqueWrench data = (ChassisTorqueWrench) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -52,4 +42,9 @@ public class ChassisTorqueMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((ChassisTorqueWrench)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/PaintingRobotMachine.java

@@ -21,12 +21,7 @@ public class PaintingRobotMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "系统是否运行")
     @Column(name = "run_state")
@@ -41,7 +36,7 @@ public class PaintingRobotMachine extends EquipmentData {
     @Show(label = "系统状态")
     @Column(name = "state")
     @ApiModelProperty(notes = "系统状态")
-    private int state;
+    private Integer status;
 
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")

src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/PaintingRobotMachineJob.java

@@ -5,11 +5,12 @@ import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.scada.base.gather.job.GatherJob;
 import net.vtstar.zhongtong.avi.gateway.painting.domain.PaintingRobotMachine;
-import net.vtstar.zhongtong.avi.gateway.welding.domain.PlateChainMachine;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 涂装机器人数据采集JOB
  */
@@ -28,23 +29,11 @@ public class PaintingRobotMachineJob extends GatherJob {
 
     public boolean handleObject(EquipmentData equipmentData) {
         PaintingRobotMachine data = (PaintingRobotMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -52,4 +41,9 @@ public class PaintingRobotMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((PaintingRobotMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/DustingLineMachine.java

@@ -21,12 +21,7 @@ public class DustingLineMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "链速")
     @Column(name = "chain_speed")
@@ -48,5 +43,5 @@ public class DustingLineMachine extends EquipmentData {
     @Column(name = "create_time")
     private Date createTime;
 
-    private Integer state;
+    private Integer status;
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/PretreatmentMachine.java

@@ -10,7 +10,6 @@ import net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType;
 
 import javax.persistence.Column;
 import javax.persistence.Table;
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -22,12 +21,7 @@ public class PretreatmentMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "热纯水燃烧机温度")
     @Column(name = "rcs_temperature")
@@ -109,5 +103,5 @@ public class PretreatmentMachine extends EquipmentData {
     @Column(name = "create_time")
     private Date createTime;
 
-    private Integer state;
+    private Integer status;
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/SteelCncCuttingMachine.java

@@ -21,12 +21,7 @@ public class SteelCncCuttingMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "设备状态")
     @Column(name = "state")

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/WeldingRobotMachine.java

@@ -20,12 +20,7 @@ public class WeldingRobotMachine{
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "开机时间")
     @Column(name = "turn_on_time")

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/DustingLineMachineJob.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 喷粉线数据采集JOB
  */
@@ -25,31 +27,33 @@ public class DustingLineMachineJob extends GatherJob {
         super.gatherByModbus(NAME, DustingLineMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         //0待机，1是喷粉
         DustingLineMachine data = (DustingLineMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state ==1) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
     @Override
     public Object handleValue(String fieldName, Object value) {
+        if (fieldName.startsWith("state")){
+            if (Integer.valueOf(value.toString()) == 0){
+                return "待机";
+            }
+            if (Integer.valueOf(value.toString()) == 1){
+                return "喷粉";
+            }
+        }
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((DustingLineMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/PretreamentMachineJob.java

@@ -5,11 +5,12 @@ import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.scada.base.gather.job.GatherJob;
 import net.vtstar.zhongtong.avi.gateway.parts.domain.PretreatmentMachine;
-import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 前处理数据采集JOB
  */
@@ -26,26 +27,14 @@ public class PretreamentMachineJob extends GatherJob {
         super.gatherByModbus(NAME, PretreatmentMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
-
         PretreatmentMachine data = (PretreatmentMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state ==1) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -60,4 +49,9 @@ public class PretreamentMachineJob extends GatherJob {
 
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((PretreatmentMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/SteelCncCuttingMachineJob.java

@@ -4,12 +4,13 @@ import lombok.extern.slf4j.Slf4j;
 import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.scada.base.gather.job.GatherJob;
-import net.vtstar.zhongtong.avi.gateway.parts.domain.PretreatmentMachine;
 import net.vtstar.zhongtong.avi.gateway.parts.domain.SteelCncCuttingMachine;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 型钢下料数据采集JOB
  */
@@ -26,6 +27,7 @@ public class SteelCncCuttingMachineJob extends GatherJob {
         super.gatherByModbus(NAME, SteelCncCuttingMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
 
         SteelCncCuttingMachine data = (SteelCncCuttingMachine) equipmentData;
@@ -34,14 +36,23 @@ public class SteelCncCuttingMachineJob extends GatherJob {
             return false;
         }
         switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
             case 1:
                 equipmentData.setEquipStatus(EquipStatusEnum.RUN);
+                data.setStateString("运行");
                 break;
             case 2:
+                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
+                data.setStateString("关机");
+                break;
+            case 4:
                 equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
+                data.setStateString("报警");
+                break;
+            case 3:
+            case 5:
+            case 6:
+                equipmentData.setEquipStatus(EquipStatusEnum.IDLE);
+                data.setStateString("待机");
                 break;
             default:
                 return false;
@@ -53,4 +64,9 @@ public class SteelCncCuttingMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((SteelCncCuttingMachine) equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/WeldingRobotMachineJob.java

@@ -71,8 +71,7 @@ public class WeldingRobotMachineJob extends QuartzJobBean {
                 String weldingTime = Integer.valueOf(hourWelding.toString()) + "小时" + Integer.valueOf(minuteWelding.toString()) + "分" +
                         Integer.valueOf(secondWelding.toString()) + "秒";
                 WeldingRobotMachine machine = new WeldingRobotMachine();
-                machine.setEqpCode(ipAddress);
-                machine.setEqpName("焊接机器人");
+                machine.setEquipCode("焊接机器人");
                 machine.setTurnOnTime(turnOnTime);
                 machine.setWeldingTime(weldingTime);
                 machine.setCreateTime(new Date());

src/main/java/net/vtstar/zhongtong/avi/gateway/trial/domain/ChargingPileMachine.java

@@ -26,12 +26,7 @@ public class ChargingPileMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "车辆编号")
     @ApiModelProperty(notes = "车辆编号")
@@ -83,13 +78,12 @@ public class ChargingPileMachine extends EquipmentData {
     @Column(name = "soc")
     private Integer soc;
 
-    @Show(label = "设备状态")
-    @Column(name = "state")
-    @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
-    private int state;
-
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
     private Date createTime;
+
+    @Column(name = "state")
+    @ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
+    private Integer status;
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/trial/job/ChargingPileMachineJob.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 试交车间充电桩设备数据采集JOB
  */
@@ -27,23 +29,11 @@ public class ChargingPileMachineJob extends GatherJob {
 
     public boolean handleObject(EquipmentData equipmentData) {
         ChargingPileMachine data = (ChargingPileMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -57,4 +47,9 @@ public class ChargingPileMachineJob extends GatherJob {
         }
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((ChargingPileMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlateChainMachine.java

@@ -21,12 +21,7 @@ public class PlateChainMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "系统是否报警")
     @Column(name = "error_state")
@@ -43,4 +38,6 @@ public class PlateChainMachine extends EquipmentData {
     @Column(name = "create_time")
     private Date createTime;
 
+    private Integer status;
+
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlcControlTireMachine1.java

@@ -21,12 +21,7 @@ public class PlcControlTireMachine1 extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "1#上车长宽")
     @Column(name = "top_bus_width")
@@ -98,9 +93,11 @@ public class PlcControlTireMachine1 extends EquipmentData {
     @ApiModelProperty(notes = "车型宽")
     private Float vehicleWidth;
 
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "系统运行(1,0)")
-    private Integer state;
 
+    @Show(label = "时间",dataType = FieldType.DATETIME)
+    @ApiModelProperty("时间")
+    @Column(name = "create_time")
+    private Date createTime
+            ;
+    private Integer status;
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlcControlTireMachine2.java

@@ -6,9 +6,11 @@ import lombok.Data;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.user.search.Search;
 import net.vtstar.zhongtong.avi.global.web.Show;
+import net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType;
 
 import javax.persistence.Column;
 import javax.persistence.Table;
+import java.util.Date;
 
 @Data
 @Search(code = "PLC_CONTROL_TIRE_2")
@@ -19,12 +21,7 @@ public class PlcControlTireMachine2 extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
-    private String eqpCode;
-
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "设备名称")
-    private String eqpName;
+    private String equipCode;
 
     @Show(label = "上梁宽")
     @Column(name = "top_bus_width")
@@ -71,9 +68,11 @@ public class PlcControlTireMachine2 extends EquipmentData {
     @ApiModelProperty(notes = "地盘高")
     private Float siteHeight;
 
-    @Show(label = "设备名称")
-    @Column(name = "eqp_name")
-    @ApiModelProperty(notes = "系统运行(1,0)")
-    private Integer state;
+    @Show(label = "时间",dataType = FieldType.DATETIME)
+    @ApiModelProperty("时间")
+    @Column(name = "create_time")
+    private Date createTime;
 
+    @ApiModelProperty(notes = "系统运行(1,0)")
+    private Integer status;
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlateChainMachineJob.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * 焊装板链数据采集JOB
  */
@@ -25,25 +27,14 @@ public class PlateChainMachineJob extends GatherJob {
         super.gatherByModbus(NAME, PlateChainMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         PlateChainMachine data = (PlateChainMachine) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -51,4 +42,9 @@ public class PlateChainMachineJob extends GatherJob {
     public Object handleValue(String fieldName, Object value) {
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((PlateChainMachine)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlcControlTireMachine1Job.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * PLC数控合装胎数据采集JOB
  */
@@ -25,33 +27,27 @@ public class PlcControlTireMachine1Job extends GatherJob {
         super.gatherByModbus(NAME, PlcControlTireMachine1.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         PlcControlTireMachine1 data = (PlcControlTireMachine1) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
     @Override
     public Object handleValue(String fieldName, Object value) {
         if (!"state".equals(fieldName)){
-            return Long.valueOf(value.toString()) / 100f;
+            return Float.valueOf(value.toString()) / 100f;
         }
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((PlcControlTireMachine1)equipmentData).setCreateTime(new Date());
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlcControlTireMachine2Job.java

@@ -9,6 +9,8 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * PLC数控合装胎数据采集JOB
  */
@@ -25,25 +27,14 @@ public class PlcControlTireMachine2Job extends GatherJob {
         super.gatherByModbus(NAME, PlcControlTireMachine2.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         PlcControlTireMachine2 data = (PlcControlTireMachine2) equipmentData;
-        Integer state = data.getState();
-        if (state == null) {
+        Integer state = data.getStatus();
+        if (state != null && state == 0) {
             return false;
         }
-        switch (state) {
-            case 0:
-                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
-                break;
-            case 1:
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
-                break;
-            case 2:
-                equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-                break;
-            default:
-                return false;
-        }
         return true;
     }
 
@@ -54,4 +45,10 @@ public class PlcControlTireMachine2Job extends GatherJob {
         }
         return value;
     }
+
+    @Override
+    protected void postHandle(EquipmentData equipmentData) {
+        ((PlcControlTireMachine2)equipmentData).setCreateTime(new Date());
+    }
+
 }

src/main/java/net/vtstar/zhongtong/avi/sqlserver/domain/TestSpeedResult.java

@@ -44,6 +44,11 @@ public class TestSpeedResult {
     @Column(name = "SPEED_MAX")
     private Float SPEED_MAX;
 
+    @Show(label = "检测结果")
+    @ApiModelProperty(notes = "检测结果")
+    @Column(name = "SPEED_XSDG")
+    private String SPEEDXSDG;
+
     @Show(label = "速度下限")
     @ApiModelProperty(notes = "速度下限")
     @Column(name = "SPEED_XSBZ0")

src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/TestSpeedJob.java → src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/TestSpeedResultJob.java

@@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j;
 import net.vtstar.user.mybatis.provider.Operation;
 import net.vtstar.user.mybatis.provider.WhereFilter;
 import net.vtstar.utils.DateUtils;
-import net.vtstar.zhongtong.avi.sqlserver.domain.TestLineResult;
 import net.vtstar.zhongtong.avi.sqlserver.domain.TestSpeedResult;
 import net.vtstar.zhongtong.avi.sqlserver.mapper.TestSpeedMapper;
 import net.vtstar.zhongtong.avi.utils.PingIpUtils;
@@ -30,7 +29,7 @@ import java.util.List;
 @Slf4j
 @Component
 @DisallowConcurrentExecution
-public class TestSpeedJob extends QuartzJobBean {
+public class TestSpeedResultJob extends QuartzJobBean {
 
     @Resource(name = "speedSqlServerJdbcTemplate")
     private JdbcTemplate speedSqlServerJdbcTemplate;
@@ -55,7 +54,7 @@ public class TestSpeedJob extends QuartzJobBean {
         Date startOfDay = DateUtils.getStartOfDay(0);
         String dateString = DateUtils.parseDateToString(startOfDay, "yyyy-MM-dd HH:mm:ss");
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT vin, MODEL_ID, testDate, SPEED_MAX, SPEED_XSBZ0, SPEED_XSBZ1 FROM CARTEST_SPEED_RESULT WHERE testDate > '");
+        sql.append("SELECT vin, MODEL_ID, testDate, SPEED_MAX, SPEED_XSDG, SPEED_XSBZ0, SPEED_XSBZ1 FROM CARTEST_SPEED_RESULT WHERE testDate > '");
         sql.append(dateString);
         sql.append("'");
         List<TestSpeedResult> query = speedSqlServerJdbcTemplate.query(sql.toString(), (rs, rowNum) -> {
@@ -64,6 +63,7 @@ public class TestSpeedJob extends QuartzJobBean {
             map.setMODEL_ID(rs.getString("MODEL_ID"));
             map.setTestDate(rs.getTimestamp("testDate"));
             map.setSPEED_MAX(rs.getFloat("SPEED_MAX"));
+            map.setSPEEDXSDG(rs.getString("SPEED_XSDG"));
             map.setSPEED_XSBZ0(rs.getFloat("SPEED_XSBZ0"));
             map.setSPEED_XSBZ1(rs.getFloat("SPEED_XSBZ1"));
             return map;
@@ -76,7 +76,7 @@ public class TestSpeedJob extends QuartzJobBean {
         }
         testSpeedMapper.delByFilter(new WhereFilter() {{
             addFilter("test_date", Operation.GREATER_THAN, dateString);
-        }}, TestLineResult.class);
+        }}, TestSpeedResult.class);
         testSpeedMapper.insertList(query);
         log.info("--------同步试交车间限速值数据结束--------");
     }

src/main/java/net/vtstar/zhongtong/avi/utils/SmbFileUtil.java

@@ -36,10 +36,14 @@ public class SmbFileUtil {
         OutputStream out = null;
         try {
             SmbFile remoteFile = new SmbFile(remoteUrl);
-            if (remoteFile == null) {
+            if (!remoteFile.exists()) {
                 System.out.println("共享文件不存在");
                 return;
             }
+            File file = new File(localDir);
+            if (!file.exists()) {
+                file.mkdirs();
+            }
             String fileName = remoteFile.getName();
             File localFile = new File(localDir + File.separator + fileName);
             in = new BufferedInputStream(new SmbFileInputStream(remoteFile));
@@ -53,8 +57,12 @@ public class SmbFileUtil {
             e.printStackTrace();
         } finally {
             try {
+                if (out != null) {
                     out.close();
+                }
+                if (in != null) {
                     in.close();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -81,8 +89,12 @@ public class SmbFileUtil {
             e.printStackTrace();
         } finally {
             try {
+                if (out != null) {
                     out.close();
+                }
+                if (in != null) {
                     in.close();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }

src/main/resources/config/application-quartz.properties

@@ -30,8 +30,8 @@ quartz.job.taskInfos[1].jobName=net.vtstar.zhongtong.avi.equipment.job.CleanStat
 quartz.job.taskInfos[1].jobGroup=CleanStatusDataJob
 quartz.job.taskInfos[1].jobDescription=\u6E05\u6D17\u8BBE\u5907\u72B6\u6001Job
 #quartz.job.taskInfos[1].cronExpression=0 0 0 * * ?
-quartz.job.taskInfos[1].cronExpression=0 0/1 * * * ?
-quartz.job.taskInfos[1].start=false
+quartz.job.taskInfos[1].cronExpression=0/15 * * * * ?
+quartz.job.taskInfos[1].start=true
 
 quartz.job.taskInfos[2].jobName=net.vtstar.zhongtong.avi.equipment.job.StatisticsTimeJob
 quartz.job.taskInfos[2].jobGroup=StatisticsTimeJob
@@ -44,21 +44,21 @@ quartz.job.taskInfos[2].start=false
 quartz.job.taskInfos[8].jobName=net.vtstar.zhongtong.avi.gateway.parts.job.DustingLineMachineJob
 quartz.job.taskInfos[8].jobGroup=DustingLineMachineJob
 quartz.job.taskInfos[8].jobDescription=\u55b7\u7c89\u7ebfJob
-quartz.job.taskInfos[8].cronExpression=0 0/5 * * * ?
+quartz.job.taskInfos[8].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[8].start=false
 
 #前处理
 quartz.job.taskInfos[9].jobName=net.vtstar.zhongtong.avi.gateway.parts.job.PretreamentMachineJob
 quartz.job.taskInfos[9].jobGroup=PretreamentMachineJob
 quartz.job.taskInfos[9].jobDescription=\u55b7\u7c89\u7ebfJob
-quartz.job.taskInfos[9].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[9].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[9].start=false
 
 #型钢下料
 quartz.job.taskInfos[10].jobName=net.vtstar.zhongtong.avi.gateway.parts.job.SteelCncCuttingMachineJob
 quartz.job.taskInfos[10].jobGroup=SteelCncCuttingMachineJob
 quartz.job.taskInfos[10].jobDescription=\u578b\u94a2\u4e0b\u6599Job
-quartz.job.taskInfos[10].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[10].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[10].start=false
 
 #焊接机器人
@@ -73,14 +73,14 @@ quartz.job.taskInfos[21].start=false
 quartz.job.taskInfos[11].jobName=net.vtstar.zhongtong.avi.gateway.welding.job.PlateChainMachineJob
 quartz.job.taskInfos[11].jobGroup=PlateChainMachineJob
 quartz.job.taskInfos[11].jobDescription=\u710a\u88c5\u677f\u94feJob
-quartz.job.taskInfos[11].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[11].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[11].start=false
 
 #PLC数控合装胎(串口)
 quartz.job.taskInfos[12].jobName=net.vtstar.zhongtong.avi.gateway.welding.job.PlcControlTireMachine1Job
 quartz.job.taskInfos[12].jobGroup=PlcControlTireMachine1Job
 quartz.job.taskInfos[12].jobDescription=\u6E05\u6D17\u8BBE\u5907\u72B6\u6001Job
-quartz.job.taskInfos[12].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[12].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[12].start=false
 
 #PLC数控合装胎(网口)
@@ -114,6 +114,13 @@ quartz.job.taskInfos[7].cronExpression=0 0/15 * * * ?
 quartz.job.taskInfos[7].start=false
 
 #总装车间(ASSEMBLY)
+#板链测试量采集
+quartz.job.taskInfos[22].jobName=net.vtstar.zhongtong.avi.gateway.assembly.job.PlateChainStateMachineJob
+quartz.job.taskInfos[22].jobGroup=PlateChainStateMachineJob
+quartz.job.taskInfos[22].jobDescription=\u677f\u94feJob
+quartz.job.taskInfos[22].cronExpression=0/5 * * * * ?
+quartz.job.taskInfos[22].start=false
+
 #离合油加注机
 quartz.job.taskInfos[16].jobName=net.vtstar.zhongtong.avi.gateway.assembly.job.CentralizedFillingClutchMachineJob
 quartz.job.taskInfos[16].jobGroup=CentralizedFillingClutchMachineJob
@@ -139,7 +146,7 @@ quartz.job.taskInfos[18].start=false
 quartz.job.taskInfos[19].jobName=net.vtstar.zhongtong.avi.gateway.assembly.job.FloorLeatherHotMachineJob
 quartz.job.taskInfos[19].jobGroup=FloorLeatherHotMachineJob
 quartz.job.taskInfos[19].jobDescription=\u5730\u677f\u9694\u70ed\u7194\u8bbe\u5907Job
-quartz.job.taskInfos[19].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[19].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[19].start=false
 
 #智能扭力扳手
@@ -168,7 +175,7 @@ quartz.job.taskInfos[3].start=false
 quartz.job.taskInfos[4].jobName=net.vtstar.zhongtong.avi.sqlserver.job.TestSpeedResultJob
 quartz.job.taskInfos[4].jobGroup=TestSpeedResultJob
 quartz.job.taskInfos[4].jobDescription=\u9650\u901f\u503cJob
-quartz.job.taskInfos[4].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[4].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[4].start=false
 
 #充电桩

src/main/resources/config/application-xdw.properties

@@ -19,7 +19,7 @@ spring.test.sqlserver.password=123456
 
 # sql server(试交车间--限速值)
 spring.speed.sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.speed.sqlserver.jdbc-url=jdbc:sqlserver://127.0.0.1:1433;DatabaseName=localdb
+spring.speed.sqlserver.jdbc-url=jdbc:sqlserver://10.1.25.134:1433;DatabaseName=localdb
 spring.speed.sqlserver.username=admin
 spring.speed.sqlserver.password=123456
 

src/main/resources/config/application-ztip.properties

@@ -25,7 +25,7 @@ zt.ip.wheelalignment3=10.1.25.87
 #试交车间--检测线
 zt.ip.testlineresult=10.100.172.150
 #试交车间--限速值
-zt.ip.testspeedresult=10.100.172.150
+zt.ip.testspeedresult=10.1.25.134
 #总装车间--智能扭力扳手
 zt.ip.assemblytorquewrench=10.100.172.150