网关采集

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/MesWorkOrderInfo.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.Search;
+import org.hibernate.validator.constraints.Length;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @Author: xiadongwei
+ * @Date: 2019/10/20 9:31
+ */
+@ApiModel("涂装车间工单表")
+@Data
+@Search(code = "MES_WORKORDER_INFO")
+@Table(name = "mes_work_order_info")
+public class MesWorkOrderInfo {
+
+    @Id
+    private Long id;
+
+    @ApiModelProperty(notes = "车间编号")
+    @NotNull(message = "车间编号不能为空")
+    @Length(max = 20, message = "车间编号长度不能大于{max}")
+    @Column(name = "workshop_code")
+    @Search
+    private String workshopCode;
+
+    @ApiModelProperty(notes = "车间名称")
+    @NotNull(message = "车间名称不能为空")
+    @Length(max = 50, message = "车间名称长度不能大于{max}")
+    @Column(name = "workshop_name")
+    @Search
+    private String workshopName;
+
+    @ApiModelProperty(notes = "设备分类")
+    @NotNull(message = "设备分类不能为空")
+    @Length(max = 50, message = "设备分类长度不能大于{max}")
+    @Column(name = "equip_type")
+    @Search
+    private String equipType;
+
+    @ApiModelProperty(notes = "设备编号")
+    @NotNull(message = "设备名称不能为空")
+    @Length(max = 100, message = "设备编号长度不能大于{max}")
+    @Column(name = "equip_code")
+    @Search
+    private String equipCode;
+
+    @ApiModelProperty(notes = "设备名称")
+    @Length(max = 100, message = "设备名称长度不能大于{max}")
+    @Column(name = "alias")
+    @Search
+    private String alias;
+
+    @ApiModelProperty(notes = "设备厂商")
+    @Length(max = 100, message = "设备厂商长度不能大于{max}")
+    @Column(name = "equip_factory")
+    private String equipFactory;
+
+    @ApiModelProperty(notes = "创建时间")
+    @Column(name = "create_time")
+    private Date createTime;
+
+    @ApiModelProperty(notes = "更新时间")
+    @Column(name = "update_time")
+    private Date updateTime;
+}

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

@@ -18,7 +18,7 @@ import java.util.Date;
 @Component
 public class ChassisTorqueMachineJob extends GatherJob {
 
-    private static final String NAME = "PAINTING_ROBOT";
+    private static final String NAME = "CHASSIS_TORQUE_WRENCH";
 
     @Override
     protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
@@ -34,6 +34,11 @@ public class ChassisTorqueMachineJob extends GatherJob {
         if (state != null && state == 0) {
             return false;
         }
+        if(null == ((ChassisTorqueWrench) equipmentData).getShaftTorque1()
+                && null == ((ChassisTorqueWrench) equipmentData).getShaftTorque2()
+                && null == ((ChassisTorqueWrench) equipmentData).getShaftTorque3()){
+            return false;
+        }
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
         return true;
     }

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

@@ -8,6 +8,7 @@ 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.Id;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -17,6 +18,9 @@ import java.util.Date;
 @Table(name = "eqp_data_welding_robot")
 public class WeldingRobotMachine{
 
+    @Id
+    private Long id;
+
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")

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

@@ -72,10 +72,14 @@ public class WeldingRobotMachineJob extends QuartzJobBean {
                 Object secondWelding = service.getSingleValue(poolKey, 1, date * 4 - 4 + 300, "Integer");
                 Object minuteWelding = service.getSingleValue(poolKey, 1, date * 4 - 3 + 300, "Integer");
                 Object hourWelding = service.getSingleValue(poolKey, 1, date * 4 - 2 + 300, "Integer");
+                if (null == minuteWelding || null == secondWelding || null == hourWelding){
+                    log.error("读取焊接机器人数据失败! 时, 分, 秒中有空值!");
+                    continue;
+                }
                 String weldingTime = Integer.valueOf(hourWelding.toString()) + "小时" + Integer.valueOf(minuteWelding.toString()) + "分" +
                         Integer.valueOf(secondWelding.toString()) + "秒";
                 WeldingRobotMachine machine = new WeldingRobotMachine();
-                machine.setEquipCode("焊接机器人");
+                machine.setEquipCode("焊接机器人" + ipAddress.split("\\.")[3]);
                 machine.setTurnOnTime(turnOnTime);
                 machine.setWeldingTime(weldingTime);
                 machine.setCreateTime(new Date());

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

@@ -40,7 +40,8 @@ public class PlateChainMachineJob extends GatherJob {
 
     @Override
     public Object handleValue(String fieldName, Object value) {
-        return value;
+        Integer valueInt = Integer.valueOf(value.toString());
+        return (valueInt & 0x01);
     }
 
     @Override