Skip to content

Z
zhongtong-avi-service
Commit 2bc23d54 authored by 夏东伟's avatar 夏东伟
Browse files
Options

现场调试

parent 0a2377c1
Hide whitespace changes
Inline Side-by-side
Showing with 402 additions and 244 deletions
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/CentralizedFillingClutchMachine.java
View file @ 2bc23d54
......@@ -24,15 +24,15 @@ import java.util.Date;
@Table(name = "eqp_data_centralized_filling_clutch")
public class CentralizedFillingClutchMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
......@@ -46,7 +46,7 @@ public class CentralizedFillingClutchMachine extends EquipmentData {
@Column(name = "filling_amount")
private Long fillingAmount;
@Show(label = "压力设定值")
@Show(label = "压力设定值(bar)")
@ApiModelProperty(notes = "压力设定值")
@Column(name = "pressure_settings")
private Long pressureSettings;
......@@ -65,7 +65,6 @@ public class CentralizedFillingClutchMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FloorLeatherHotMachine.java
View file @ 2bc23d54
......@@ -24,78 +24,78 @@ import java.util.Date;
@Table(name = "eqp_data_floor_leather_hot")
public class FloorLeatherHotMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
@Show(label = "模头1区温度")
@Show(label = "模头1区温度(℃)")
@ApiModelProperty(notes = "模头1区温度")
@Column(name = "die_temperature1")
private Integer dieTemperature1;
@Show(label = "模头2区温度")
@Show(label = "模头2区温度(℃)")
@ApiModelProperty(notes = "模头2区温度")
@Column(name = "die_temperature2")
private Integer dieTemperature2;
@Show(label = "模头3区温度")
@Show(label = "模头3区温度(℃)")
@ApiModelProperty(notes = "模头3区温度")
@Column(name = "die_temperature3")
private Integer dieTemperature3;
@Show(label = "模头4区温度")
@Show(label = "模头4区温度(℃)")
@ApiModelProperty(notes = "模头4区温度")
@Column(name = "die_temperature4")
private Integer dieTemperature4;
@Show(label = "模头5区温度")
@Show(label = "模头5区温度(℃)")
@ApiModelProperty(notes = "模头5区温度")
@Column(name = "die_temperature5")
private Integer dieTemperature5;
@Show(label = "模头6区温度")
@Show(label = "模头6区温度(℃)")
@ApiModelProperty(notes = "模头6区温度")
@Column(name = "die_temperature6")
private Integer dieTemperature6;
@Show(label = "模头7区温度")
@Show(label = "模头7区温度(℃)")
@ApiModelProperty(notes = "模头7区温度")
@Column(name = "die_temperature7")
private Integer dieTemperature7;
@Show(label = "模头8区温度")
@Show(label = "模头8区温度(℃)")
@ApiModelProperty(notes = "模头8区温度")
@Column(name = "die_temperature8")
private Integer dieTemperature8;
@Show(label = "模头9区温度")
@Show(label = "模头9区温度(℃)")
@ApiModelProperty(notes = "模头9区温度")
@Column(name = "die_temperature9")
private Integer dieTemperature9;
@Show(label = "模头10区温度")
@Show(label = "模头10区温度(℃)")
@ApiModelProperty(notes = "模头10区温度")
@Column(name = "die_temperature10")
private Integer dieTemperature10;
@Show(label = "模头11区温度")
@Show(label = "模头11区温度(℃)")
@ApiModelProperty(notes = "模头11区温度")
@Column(name = "die_temperature11")
private Integer dieTemperature11;
@Show(label = "当前产量")
@Show(label = "当前产量(m)")
@ApiModelProperty(notes = "当前产量")
@Column(name = "current_yield")
private Float currentYield;
@Show(label = "上胶量")
@Show(label = "上胶量(g/㎡)")
@ApiModelProperty(notes = "上胶量")
@Column(name = "gluing_amount")
private Float gluingAmount;
......@@ -109,7 +109,6 @@ public class FloorLeatherHotMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FocusAddingRefrigerantMachine.java
View file @ 2bc23d54
......@@ -24,15 +24,15 @@ import java.util.Date;
@Table(name = "eqp_data_focus_adding_refrigerant")
public class FocusAddingRefrigerantMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
......@@ -60,7 +60,6 @@ public class FocusAddingRefrigerantMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FocusBoosterOilMachine.java
View file @ 2bc23d54
......@@ -24,15 +24,15 @@ import java.util.Date;
@Table(name = "eqp_data_focus_booster_oil")
public class FocusBoosterOilMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
......@@ -75,7 +75,6 @@ public class FocusBoosterOilMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/PlateChainMachine.java
View file @ 2bc23d54
......@@ -23,15 +23,15 @@ import java.util.Date;
@Table(name = "eqp_data_assembly_plate_chain")
public class PlateChainMachine{
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
......@@ -49,7 +49,6 @@ public class PlateChainMachine{
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/PlateChainTimeMachineJob.java
View file @ 2bc23d54
......@@ -9,7 +9,6 @@ import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.equipment.mapper.EquipmentDataMapper;
import net.vtstar.zhongtong.avi.gateway.assembly.domain.PlateChainMachine;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -25,7 +24,6 @@ import java.util.List;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class PlateChainTimeMachineJob extends QuartzJobBean {
@Autowired
......
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/domain/ChassisTorqueWrench.java
View file @ 2bc23d54
......@@ -24,34 +24,34 @@ import java.util.Date;
@Table(name = "eqp_data_chassis_torque_wrench")
public class ChassisTorqueWrench extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
@Show(label = "一轴扭矩")
@Show(label = "一轴扭矩(N.m)")
@ApiModelProperty(notes = "一轴扭矩")
@Column(name = "shaft_torque_1")
private Integer shaftTorque1;
@Show(label = "二轴扭矩")
@Show(label = "二轴扭矩(N.m)")
@ApiModelProperty(notes = "二轴扭矩")
@Column(name = "shaft_torque_2")
private Integer shaftTorque2;
@Show(label = "三轴扭矩")
@Show(label = "三轴扭矩(N.m)")
@ApiModelProperty(notes = "三轴扭矩")
@Column(name = "shaft_torque_3")
private Integer shaftTorque3;
@Show(label = "四轴扭矩")
@Show(label = "四轴扭矩(N.m)")
@ApiModelProperty(notes = "四轴扭矩")
@Column(name = "shaft_torque_4")
private Integer shaftTorque4;
......@@ -65,7 +65,6 @@ public class ChassisTorqueWrench extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/domain/LubricatingOilConcentrateMachine.java
View file @ 2bc23d54
......@@ -45,7 +45,6 @@ public class LubricatingOilConcentrateMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/domain/RicetingEquipmentMachine.java
View file @ 2bc23d54
......@@ -45,7 +45,6 @@ public class RicetingEquipmentMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/job/ChassisTorqueMachineJob.java
View file @ 2bc23d54
......@@ -45,6 +45,9 @@ public class ChassisTorqueMachineJob extends GatherJob {
@Override
public Object handleValue(String fieldName, Object value) {
if (fieldName.startsWith("shaftTorque")){
return Integer.valueOf(value.toString()) / 10;
}
return value;
}
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/DryingRoomTempMachine.java
View file @ 2bc23d54
......@@ -44,7 +44,6 @@ public class DryingRoomTempMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/ElectrophoresisMachine.java
View file @ 2bc23d54
......@@ -20,9 +20,9 @@ import java.util.Date;
@Table(name = "eqp_data_rectification_out")
public class ElectrophoresisMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "上升时间(min)")
......@@ -50,7 +50,6 @@ public class ElectrophoresisMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/ElectrophoresisRectificationMachine.java
View file @ 2bc23d54
......@@ -42,7 +42,6 @@ public class ElectrophoresisRectificationMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/PaintingPretreatmentMachine.java
View file @ 2bc23d54
......@@ -23,23 +23,23 @@ public class PaintingPretreatmentMachine extends EquipmentData {
@ApiModelProperty(notes = "设备编号")
private String equipCode;
@Show(label = "预脱脂温度")
@Show(label = "预脱脂温度(℃)")
@Column(name = "cataphoresis_temperature")
@ApiModelProperty(notes = "预脱脂温度")
private Integer cataphoresisTemperature;
@Show(label = "脱脂槽温度")
@Show(label = "脱脂槽温度(℃)")
@Column(name = "degrease_temperature")
@ApiModelProperty(notes = "脱脂温度")
private Integer degreaseTemperature;
@Show(label = "磷化槽温度")
@Show(label = "磷化槽温度(℃)")
@Column(name = "phosphatizing_temperature")
@ApiModelProperty(notes = "磷化温度")
private Integer phosphatizingTemperature;
@Show(label = "磷化热水温度")
@Show(label = "磷化热水温度(℃)")
@Column(name = "lhrs_temperature")
@ApiModelProperty(notes = "磷化热水温度")
private Integer lhrsTemperature;
......@@ -53,7 +53,6 @@ public class PaintingPretreatmentMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/PaintingRobotMachine.java
View file @ 2bc23d54
......@@ -19,21 +19,21 @@ import java.util.Date;
@Table(name = "eqp_data_painting_robot")
public class PaintingRobotMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "系统是否运行")
@Column(name = "run_state")
@ApiModelProperty(notes = "系统是否运行")
private int runState;
private String runState;
@Show(label = "系统是否报警")
@Column(name = "error_state")
@ApiModelProperty(notes = "系统是否报警")
private int errorState;
private String errorState;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
......@@ -44,7 +44,6 @@ public class PaintingRobotMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/PolishingRoomMachine.java
View file @ 2bc23d54
......@@ -29,13 +29,13 @@ public class PolishingRoomMachine{
@Column(name = "machine_id")
private Long machineId;
@Show(label = "设备编号")
@ApiModelProperty(notes = "设备编号")
@Show(label = "设备名称")
@ApiModelProperty(notes = "设备名称")
@JoinColumn(tableName = EquipInfo.class, name = "equip_code")
private String equipCode;
@Show(label = "设备编号")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@JoinColumn(tableName = EquipInfo.class, name = "alias")
@Search
private String alias;
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/PolishingRoomStateMachine.java
View file @ 2bc23d54
......@@ -40,7 +40,6 @@ public class PolishingRoomStateMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/RotaryRollerBedMachine.java
View file @ 2bc23d54
......@@ -19,22 +19,22 @@ import java.util.Date;
@Table(name = "eqp_data_rotary_roller_red")
public class RotaryRollerBedMachine extends EquipmentData {
@Show(label = "当班运行(焊装)")
@Show(label = "当班运行次数(焊装)")
@Column(name = "run_num_welding")
@ApiModelProperty(notes = "当班运行(焊装)")
private Integer runNumWelding;
@Show(label = "当班运行(涂装进)")
@Show(label = "当班运行次数(涂装进)")
@Column(name = "run_num_painting_1")
@ApiModelProperty(notes = "当班运行(涂装进)")
private Integer runNumPainting1;
@Show(label = "当班运行(涂装出)")
@Show(label = "当班运行次数(涂装出)")
@Column(name = "run_num_painting_2")
@ApiModelProperty(notes = "当班运行(涂装出)")
private Integer runNumPainting2;
@Show(label = "当班运行(底盘)")
@Show(label = "当班运行次数(底盘)")
@Column(name = "run_num_chassis")
@ApiModelProperty(notes = "当班运行(底盘)")
private Integer runNumChassis;
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/SprayBoothMachine.java
View file @ 2bc23d54
......@@ -19,18 +19,18 @@ import java.util.Date;
@Table(name = "eqp_data_spray_booth")
public class SprayBoothMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "温度")
@Show(label = "温度(℃)")
@Column(name = "temperature")
@ApiModelProperty(notes = "温度")
private Float temperature;
@Show(label = "湿度")
@Show(label = "湿度(%)")
@Column(name = "humidity")
@ApiModelProperty(notes = "湿度")
private Float humidity;
......@@ -44,7 +44,6 @@ public class SprayBoothMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/VocMachine.java
View file @ 2bc23d54
......@@ -19,23 +19,23 @@ import java.util.Date;
@Table(name = "eqp_data_voc")
public class VocMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "北进口VOC浓度")
@Show(label = "北进口VOC浓度(mg/l)")
@Column(name = "concentration1")
@ApiModelProperty(notes = "VOC浓度")
private Float concentration1;
@Show(label = "南进口VOC浓度")
@Show(label = "南进口VOC浓度(mg/l)")
@Column(name = "concentration2")
@ApiModelProperty(notes = "VOC浓度")
private Float concentration2;
@Show(label = "出口VOC浓度")
@Show(label = "出口VOC浓度(mg/l)")
@Column(name = "concentration3")
@ApiModelProperty(notes = "VOC浓度")
private Float concentration3;
......@@ -49,7 +49,6 @@ public class VocMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/ElectrophoresisMachineJob.java
View file @ 2bc23d54
......@@ -8,7 +8,6 @@ import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.gateway.painting.domain.ElectrophoresisMachine;
import net.vtstar.zhongtong.avi.gateway.painting.mapper.ElectrophoresisMapper;
import net.vtstar.zhongtong.avi.global.constant.Constant;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/PaintingRobotMachineJob.java
View file @ 2bc23d54
......@@ -34,7 +34,7 @@ public class PaintingRobotMachineJob extends GatherJob {
if (state == null || "0".equals(state)) {
return false;
}
if(data.getRunState() == 1){
if("是".equals(data.getRunState())){
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
}else{
equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
......@@ -46,7 +46,7 @@ public class PaintingRobotMachineJob extends GatherJob {
@Override
public Object handleValue(String fieldName, Object value) {
Integer valueInt = Integer.valueOf(value.toString());
return (valueInt & 0x01);
return (valueInt & 0x01) == 1 ? "是" : "否";
}
@Override
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/RotaryRollerBedMachineJob.java
View file @ 2bc23d54
......@@ -9,7 +9,6 @@ import net.vtstar.zhongtong.avi.gateway.painting.domain.RotaryRollerBedMachine;
import net.vtstar.zhongtong.avi.gateway.painting.mapper.RotaryRollerBedMapper;
import net.vtstar.zhongtong.avi.global.constant.Constant;
import net.vtstar.zhongtong.avi.utils.EquipDataUtil;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,7 +25,6 @@ import java.util.List;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class RotaryRollerBedMachineJob extends QuartzJobBean {
@Resource(name = "redisTemplate")
......@@ -64,7 +62,7 @@ public class RotaryRollerBedMachineJob extends QuartzJobBean {
machine.setRunNumWelding(Integer.valueOf(testValueOperations.get(keyW).toString()));
machine.setRunNumPainting1(Integer.valueOf(testValueOperations.get(keyP1).toString()));
machine.setRunNumPainting2(Integer.valueOf(testValueOperations.get(keyP2).toString()));
machine.setRunNumChassis(Integer.valueOf(testValueOperations.get(keyC).toString()) - Integer.valueOf(testValueOperations.get(keyW).toString()));
machine.setRunNumChassis(Integer.valueOf(testValueOperations.get(keyC).toString()));
machine.setCreateTime(new Date());
mapper.insert(machine);
}else {
......@@ -72,7 +70,7 @@ public class RotaryRollerBedMachineJob extends QuartzJobBean {
machine.setRunNumWelding(Integer.valueOf(testValueOperations.get(keyW).toString()));
machine.setRunNumPainting1(Integer.valueOf(testValueOperations.get(keyP1).toString()));
machine.setRunNumPainting2(Integer.valueOf(testValueOperations.get(keyP2).toString()));
machine.setRunNumChassis(Integer.valueOf(testValueOperations.get(keyC).toString()) - Integer.valueOf(testValueOperations.get(keyW).toString()));
machine.setRunNumChassis(Integer.valueOf(testValueOperations.get(keyC).toString()));
machine.setCreateTime(new Date());
mapper.update(machine);
}
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/RotaryRollerBedRestartJob.java 0 → 100644
View file @ 2bc23d54
package net.vtstar.zhongtong.avi.gateway.painting.job;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.zhongtong.avi.gateway.painting.mapper.RotaryRollerBedMapper;
import net.vtstar.zhongtong.avi.global.constant.Constant;
import net.vtstar.zhongtong.avi.utils.EquipDataUtil;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.scheduling.quartz.QuartzJobBean;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
* 旋转辊床重置数据JOB
*/
@Slf4j
@Component
public class RotaryRollerBedRestartJob extends QuartzJobBean {
@Resource(name = "redisTemplate")
protected ValueOperations testValueOperations;
@Override
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
String keyW = EquipDataUtil.getTestValueKey(Constant.ROTARY_ROLLER_BED_W);
String keyP1 = EquipDataUtil.getTestValueKey(Constant.ROTARY_ROLLER_BED_P1);
String keyP2 = EquipDataUtil.getTestValueKey(Constant.ROTARY_ROLLER_BED_P2);
String keyC = EquipDataUtil.getTestValueKey(Constant.ROTARY_ROLLER_BED_C);
if (testValueOperations.get(keyW) != null){
testValueOperations.set(keyW, 0);
}
if (testValueOperations.get(keyP1) != null){
testValueOperations.set(keyP1, 0);
}
if (testValueOperations.get(keyP2) != null){
testValueOperations.set(keyP2, 0);
}
if (testValueOperations.get(keyC) != null){
testValueOperations.set(keyC, 0);
}
}
}
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/listener/SprayBoothListener.java
View file @ 2bc23d54
......@@ -41,7 +41,6 @@ public class SprayBoothListener implements CommandLineRunner {
rsServer.addDataListener(new MyIDataListener() {
@Override
public void receiveRealtimeData(RealTimeData data) {
super.receiveRealtimeData(data);
List<SprayBoothMachine> list = new ArrayList<>();
int deviceId = data.getDeviceId();
String name = "";
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/DustingLineMachine.java
View file @ 2bc23d54
......@@ -19,9 +19,9 @@ import java.util.Date;
@Table(name = "eqp_data_dusting_line")
public class DustingLineMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "链速")
......@@ -48,7 +48,6 @@ public class DustingLineMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/PretreatmentMachine.java
View file @ 2bc23d54
......@@ -19,37 +19,37 @@ import java.util.Date;
@Table(name = "eqp_data_pretreatment")
public class PretreatmentMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "电动三通阀温度")
@Show(label = "电动三通阀温度(℃)")
@Column(name = "ddst_temperature")
@ApiModelProperty(notes = "电动三通阀温度")
private String ddstTemperature;
@Show(label = "预脱脂温度")
@Show(label = "预脱脂温度(℃)")
@Column(name = "ytz_temperature")
@ApiModelProperty(notes = "预脱脂电动三通阀温度")
private String ytzTemperature;
@Show(label = "脱脂温度")
@Show(label = "脱脂温度(℃)")
@Column(name = "tz_temperature")
@ApiModelProperty(notes = "脱脂电动三通阀温度")
private String tzTemperature;
@Show(label = "磷化温度")
@Show(label = "磷化温度(℃)")
@Column(name = "lh_temperature")
@ApiModelProperty(notes = "磷化热说泵温度")
private String lhTemperature;
@Show(label = "热纯水温度")
@Show(label = "热纯水温度(℃)")
@Column(name = "rcs_temperature")
@ApiModelProperty(notes = "热纯水燃烧机温度")
private String rcsTemperature;
@Show(label = "防锈工位温度")
@Show(label = "防锈工位温度(℃)")
@Column(name = "fxgw_temperature")
@ApiModelProperty(notes = "防锈工位燃烧机温度")
private String fxgwTemperature;
......@@ -108,7 +108,6 @@ public class PretreatmentMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/SteelCncCuttingMachine.java
View file @ 2bc23d54
......@@ -19,11 +19,17 @@ import java.util.Date;
@Table(name = "eqp_data_steel_cnc_cutting")
public class SteelCncCuttingMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
@Show(label = "设备状态")
@Column(name = "state")
@ApiModelProperty(notes = "设备状态")
......@@ -38,7 +44,6 @@ public class SteelCncCuttingMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
private Integer state;
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/WeldingRobotMachine.java
View file @ 2bc23d54
......@@ -21,14 +21,14 @@ public class WeldingRobotMachine{
@Id
private Long id;
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
......@@ -51,7 +51,6 @@ public class WeldingRobotMachine{
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@ApiModelProperty("采集状态")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/WeldingRobotMachineJob.java
View file @ 2bc23d54
......@@ -7,7 +7,6 @@ import net.vtstar.scada.base.global.service.ModbusService;
import net.vtstar.zhongtong.avi.gateway.parts.domain.WeldingRobotMachine;
import net.vtstar.zhongtong.avi.gateway.parts.mapper.WeldingRobotMapper;
import net.vtstar.zhongtong.avi.utils.PingIpUtils;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -25,7 +24,6 @@ import java.util.List;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class WeldingRobotMachineJob extends QuartzJobBean {
@Value("${zt.ip.weldingrobot1}")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/trial/domain/ChargingPileMachine.java
View file @ 2bc23d54
......@@ -24,17 +24,17 @@ import java.util.Date;
@Table(name = "eqp_data_charging_pile")
public class ChargingPileMachine extends EquipmentData {
@Show(label = "设备编号")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
private String equipCode;
@Show(label = "设备名称")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@Search
private String alias;
@Show(label = "设备编号")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
private String equipCode;
@Show(label = "车辆编号")
@ApiModelProperty(notes = "车辆编号")
@Column(name = "bus_code")
......@@ -51,17 +51,17 @@ public class ChargingPileMachine extends EquipmentData {
@Column(name = "output_current")
private Float outputCurrent;
@Show(label = "直流电量")
/*@Show(label = "直流电量")
@ApiModelProperty(notes = "直流电量")
@Column(name = "dc_power")
private Integer dcPower;
private Integer dcPower;*/
@Show(label = "使用电量")
@Show(label = "直流电量(度)")
@ApiModelProperty(notes = "使用电量")
@Column(name = "use_power")
private Float usePower;
@Show(label = "最高单体蓄电池温度")
@Show(label = "最高单体蓄电池温度(℃)")
@ApiModelProperty(notes = "最高单体蓄电池温度")
@Column(name = "max_temperature")
private Integer maxTemperature;
......@@ -71,7 +71,7 @@ public class ChargingPileMachine extends EquipmentData {
@Column(name = "max_temperature_code")
private Integer maxTemperatureCode;
@Show(label = "最低单体蓄电池温度")
@Show(label = "最低单体蓄电池温度(℃)")
@ApiModelProperty(notes = "最低单体蓄电池温度")
@Column(name = "min_temperature")
private Integer minTemperature;
......@@ -94,7 +94,6 @@ public class ChargingPileMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/trial/domain/HydrogenStationVocMachine.java
View file @ 2bc23d54
......@@ -72,7 +72,6 @@ public class HydrogenStationVocMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@ApiModelProperty("采集状态")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/trial/job/ChargingPileMachineJob.java
View file @ 2bc23d54
......@@ -36,7 +36,7 @@ public class ChargingPileMachineJob extends GatherJob {
if (null == data.getBusCode() || "".equals(data.getBusCode())){
return false;
}
if (null == data.getUsePower() || data.getSoc() == 0){
if (null == data.getUsePower() || data.getUsePower() <= 0 || data.getSoc() == 0){
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/AutomaticSpotWeldingMachine.java
View file @ 2bc23d54
......@@ -19,23 +19,23 @@ import java.util.Date;
@Table(name = "eqp_data_automatic_spot_welding")
public class AutomaticSpotWeldingMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
@Show(label = "焊点1电流")
@Show(label = "焊点1电流(A)")
@Column(name = "welding_spot_A_1")
@ApiModelProperty(notes = "焊点1电流")
private Integer weldingSpotA1;
@Show(label = "焊点2电流")
@Show(label = "焊点2电流(A)")
@Column(name = "welding_spot_A_2")
@ApiModelProperty(notes = "焊点2电流")
private Integer weldingSpotA2;
......@@ -54,7 +54,6 @@ public class AutomaticSpotWeldingMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlcControlTireMachine1.java
View file @ 2bc23d54
......@@ -19,77 +19,77 @@ import java.util.Date;
@Table(name = "eqp_data_control_tire_1")
public class PlcControlTireMachine1 extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "1#上车长宽")
@Show(label = "1#上车长宽(mm)")
@Column(name = "top_bus_width")
@ApiModelProperty(notes = "1#上车长宽")
private Float topBusWidth;
@Show(label = "1#上车长高")
@Show(label = "1#上车长高(mm)")
@Column(name = "top_bus_height")
@ApiModelProperty(notes = "1#上车长高")
private Float topBusHeight;
@Show(label = "1#上车长长")
@Show(label = "1#上车长长(mm)")
@Column(name = "top_bus_length")
@ApiModelProperty(notes = "1#上车长长")
private Float topBusLength;
@Show(label = "1#前围宽")
@Show(label = "1#前围宽(mm)")
@Column(name = "front_bus_width")
@ApiModelProperty(notes = "1#前围宽")
private Float frontBusWidth;
@Show(label = "1#前围高")
@Show(label = "1#前围高(mm)")
@Column(name = "front_bus_height")
@ApiModelProperty(notes = "1#前围高")
private Float frontBusHeight;
@Show(label = "1#下车长宽")
@Show(label = "1#下车长宽(mm)")
@Column(name = "bottom_bus_width")
@ApiModelProperty(notes = "1#下车长宽")
private Float bottomBusWidth;
@Show(label = "1#下车长长")
@Show(label = "1#下车长长(mm)")
@Column(name = "bottom_bus_length")
@ApiModelProperty(notes = "1#下车长长")
private Float bottomBusLength;
@Show(label = "窗立柱宽")
@Show(label = "窗立柱宽(mm)")
@Column(name = "column_width")
@ApiModelProperty(notes = "窗立柱宽")
private Float columnWidth;
@Show(label = "窗立柱高")
@Show(label = "窗立柱高(mm)")
@Column(name = "column_height")
@ApiModelProperty(notes = "窗立柱高")
private Float columnHeight;
@Show(label = "窗下梁高")
@Show(label = "窗下梁高(mm)")
@Column(name = "underbeam_heigth")
@ApiModelProperty(notes = "窗下梁高")
private Float underbeamHeigth;
@Show(label = "腰梁高")
@Show(label = "腰梁高(mm)")
@Column(name = "waist_heigth")
@ApiModelProperty(notes = "腰梁高")
private Float waistHeigth;
@Show(label = "裙边宽")
@Show(label = "裙边宽(mm)")
@Column(name = "skirt_width")
@ApiModelProperty(notes = "裙边宽")
private Float skirtWidth;
@Show(label = "车型宽")
@Show(label = "车型宽(mm)")
@Column(name = "vehicle_width")
@ApiModelProperty(notes = "车型宽")
private Float vehicleWidth;
@Show(label = "地板高度")
@Show(label = "地板高度(mm)")
@Column(name = "floor_height")
@ApiModelProperty(notes = "地板高度")
private Float floorHeight;
......@@ -103,7 +103,6 @@ public class PlcControlTireMachine1 extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlcControlTireMachine2.java
View file @ 2bc23d54
......@@ -19,52 +19,52 @@ import java.util.Date;
@Table(name = "eqp_data_control_tire_2")
public class PlcControlTireMachine2 extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "上梁宽")
@Show(label = "上梁宽(mm)")
@Column(name = "top_bus_width")
@ApiModelProperty(notes = "上梁宽")
private Float topBusWidth;
@Show(label = "上梁高")
@Show(label = "上梁高(mm)")
@Column(name = "top_bus_height")
@ApiModelProperty(notes = "上梁高")
private Float topBusHeight;
@Show(label = "下梁宽")
@Show(label = "下梁宽(mm)")
@Column(name = "bottom_bus_width")
@ApiModelProperty(notes = "下梁宽")
private Float bottomBusWidth;
@Show(label = "上/下车长")
@Show(label = "上/下车长(mm)")
@Column(name = "bus_length")
@ApiModelProperty(notes = "上/下车长")
private Float busLength;
@Show(label = "上/下车宽")
@Show(label = "上/下车宽(mm)")
@Column(name = "bus_width")
@ApiModelProperty(notes = "上/下车宽")
private Float busWidth;
@Show(label = "裙边宽")
@Show(label = "裙边宽(mm)")
@Column(name = "skirt_width")
@ApiModelProperty(notes = "裙边宽")
private Float skirtWidth;
@Show(label = "裙边高")
@Show(label = "裙边高(mm)")
@Column(name = "skirt_height")
@ApiModelProperty(notes = "裙边高")
private Float skirtHeight;
@Show(label = "腰梁高")
@Show(label = "腰梁高(mm)")
@Column(name = "waist_height")
@ApiModelProperty(notes = "腰梁高")
private Float waistHeight;
@Show(label = "地盘高")
@Show(label = "地盘高(mm)")
@Column(name = "site_height")
@ApiModelProperty(notes = "地盘高")
private Float siteHeight;
......@@ -78,7 +78,6 @@ public class PlcControlTireMachine2 extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/WeldingPlateChainMachine.java
View file @ 2bc23d54
......@@ -18,14 +18,14 @@ import java.util.Date;
@Table(name = "eqp_data_plate_chain")
public class WeldingPlateChainMachine extends EquipmentData {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
......@@ -48,7 +48,6 @@ public class WeldingPlateChainMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/WeldingPlateChainTimeMachine.java
View file @ 2bc23d54
......@@ -23,15 +23,15 @@ import java.util.Date;
@Table(name = "eqp_data_welding_plate_chain_time")
public class WeldingPlateChainTimeMachine {
@Show(label = "设备编号")
@Show(label = "设备名称")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@ApiModelProperty(notes = "设备名称")
@Search
private String equipCode;
@Show(label = "设备名称")
@Show(label = "设备编号")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@ApiModelProperty(notes = "设备编号")
@Search
private String alias;
......@@ -49,7 +49,6 @@ public class WeldingPlateChainTimeMachine {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@Id
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/WeldingPlateChainTimeMachineJob.java
View file @ 2bc23d54
......@@ -9,7 +9,6 @@ import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.equipment.mapper.EquipmentDataMapper;
import net.vtstar.zhongtong.avi.gateway.welding.domain.WeldingPlateChainTimeMachine;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -25,7 +24,6 @@ import java.util.List;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class WeldingPlateChainTimeMachineJob extends QuartzJobBean {
@Autowired
......
src/main/java/net/vtstar/zhongtong/avi/global/constant/Constant.java
View file @ 2bc23d54
......@@ -41,6 +41,8 @@ public class Constant {
public static final String TUZHUANG_VEHICLE2_RFID = "rfid72";
//涂装末工位
public static final String TUZHUANG_VEHICLE3_RFID = "rfid67";
//底盘读写头
public static final String TUZHUANG_VEHICLE4_RFID = "rfid66";
//焊装平移车道车身号
public static final String HANZHUANG_VEHICLE_BUSNO_KEY = "HZ:BUSNO:";
......
src/main/java/net/vtstar/zhongtong/avi/laboratory/controller/DailyCheckController.java
View file @ 2bc23d54
......@@ -7,14 +7,20 @@ import lombok.extern.slf4j.Slf4j;
import net.vtstar.user.search.controller.vo.SearchVo;
import net.vtstar.utils.asserts.ParamAssert;
import net.vtstar.utils.domain.Return;
import net.vtstar.zhongtong.avi.laboratory.domain.DailyCheckModel;
import net.vtstar.zhongtong.avi.laboratory.domain.DailyItemModel;
import net.vtstar.zhongtong.avi.laboratory.domain.DailyItemRecord;
import net.vtstar.zhongtong.avi.laboratory.domain.vo.CheckRecordVo;
import net.vtstar.zhongtong.avi.laboratory.service.DailyCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @Author: xiadongwei
......@@ -31,10 +37,10 @@ public class DailyCheckController {
@ApiOperation(value = "根据化验室类型查询检测模板, 关联查询点检项模板", notes =
"入参字段：\n{\n" +
" \"酸洗\": \"PICKLING\",\n" +
" \"电泳槽\": \"ELECTROPHORESIS\",\n" +
" \"前处理\": \"PRETREATMENT\"\n" +
"}")
" \"酸洗\": \"PICKLING\",\n" +
" \"电泳槽\": \"ELECTROPHORESIS\",\n" +
" \"前处理\": \"PRETREATMENT\"\n" +
"}")
@GetMapping("/getCheckByType")
public Return getCheckByType(@RequestParam String type) {
ParamAssert.notNull(type, "检测类型不能为空!");
......@@ -93,7 +99,38 @@ public class DailyCheckController {
@ApiOperation("打印")
@GetMapping("/expert")
public void expert(@RequestParam("recordId") Long recordId, HttpServletResponse response){
public void expert(@RequestParam("recordId") Long recordId, HttpServletResponse response) {
service.expert(recordId, response);
}
@ApiOperation("查询所有检测模板")
@GetMapping("/getCheckModel")
public Return getCheckModel() {
List<DailyCheckModel> list = service.getCheckModel();
return Return.success(list);
}
@ApiOperation("根据模板ID查询所有检项模板")
@GetMapping("/getCheckItemModelById/{id}")
public Return getCheckItemModelById(@PathVariable("id") Long id) {
List<DailyItemModel> list = service.getCheckItemModelById(id);
return Return.success(list);
}
@ApiOperation(value = "根据模板项ID查询所有检项记录", notes =
"入参字段：\n{\n" +
" \"modelId\": \"模板ID\",\n" +
" \"itemNames\": \"检测项名称数组, 多选\",\n" +
" \"beginTime\": \"开始时间\"\n" +
" \"endTime\": \"结束时间\"\n" +
"}")
@GetMapping("/getCheckItemRecord")
public Return getCheckItemRecord(@RequestParam(value = "modelId") Long modelId,
@RequestParam(value = "itemNames", required = false) String[] itemNames,
@RequestParam(value = "beginTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Date beginTime,
@RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Date endTime) {
ParamAssert.notNull(modelId, "模板ID不能为空!");
Map<String, List<DailyItemRecord>> map = service.getCheckItemRecord(modelId, itemNames, beginTime, endTime);
return Return.success(map);
}
}
src/main/java/net/vtstar/zhongtong/avi/laboratory/service/DailyCheckService.java
View file @ 2bc23d54
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.user.mybatis.provider.Operation;
import net.vtstar.user.mybatis.provider.OrderBy;
import net.vtstar.user.mybatis.provider.WhereFilter;
import net.vtstar.user.search.service.SearchService;
import net.vtstar.user.util.UserUtil;
......@@ -32,6 +33,7 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Author: xiadongwei
......@@ -223,4 +225,54 @@ public class DailyCheckService {
log.error("检测报告模板导出失败!原因: {}", e.getMessage());
}
}
public List<DailyCheckModel> getCheckModel() {
return checkModelMapper.findList(new WhereFilter() {}, DailyCheckModel.class);
}
public List<DailyItemModel> getCheckItemModelById(Long id) {
return itemModelMapper.findList(new WhereFilter(){{
addFilter("check_model_id", Operation.EQUAL, id);
}}, DailyItemModel.class);
}
public Map<String, List<DailyItemRecord>> getCheckItemRecord(Long modelId, String[] itemNames, Date beginTime, Date endTime) {
if (null == beginTime || null == endTime){
beginTime = DateUtils.getMonthStart(0, new Date());
endTime = DateUtils.getMonthEnd(0, new Date());
}
String startTimeStr = DateUtils.parseDateToString(beginTime, "yyyy-MM-dd HH:mm:ss");
String endTimeStr = DateUtils.parseDateToString(endTime, "yyyy-MM-dd HH:mm:ss");
if (null == itemNames || itemNames.length == 0){
List<DailyItemModel> itemModels = itemModelMapper.findList(new WhereFilter() {{
addFilter("check_model_id", Operation.EQUAL, modelId);
}}, DailyItemModel.class);
StringBuffer sbuffer= new StringBuffer();
for (DailyItemModel itemModel : itemModels){
sbuffer.append("'");
sbuffer.append(itemModel.getName());
sbuffer.append("',");
}
List<DailyItemRecord> list = itemRecordMapper.findList(new WhereFilter() {{
addFilter("name", Operation.IN, sbuffer.substring(1, sbuffer.length()-2));
addFilter("create_time", Operation.GREATER_THAN, startTimeStr);
addFilter("create_time", Operation.LESS_THAN, endTimeStr);
addOrderBy("create_time", OrderBy.ASC);
}}, DailyItemRecord.class);
return list.stream().collect(Collectors.groupingBy(DailyItemRecord :: getName));
}
StringBuffer sbuffer= new StringBuffer();
for (String itemName : itemNames){
sbuffer.append("'");
sbuffer.append(itemName);
sbuffer.append("',");
}
List<DailyItemRecord> list = itemRecordMapper.findList(new WhereFilter() {{
addFilter("name", Operation.IN, sbuffer.substring(1, sbuffer.length()-2));
addFilter("create_time", Operation.GREATER_THAN, startTimeStr);
addFilter("create_time", Operation.LESS_THAN, endTimeStr);
addOrderBy("create_time", OrderBy.ASC);
}}, DailyItemRecord.class);
return list.stream().collect(Collectors.groupingBy(DailyItemRecord :: getName));
}
}
src/main/java/net/vtstar/zhongtong/avi/ledlamp/controller/LedController.java
View file @ 2bc23d54
......@@ -96,8 +96,6 @@ public class LedController {
vocVO.setExitCONC(new BigDecimal(map.get("concentration3").toString()));
}
}
//TODO: voc进出口浓度 真实数据
return Return.success(vocVO);
}
......
src/main/java/net/vtstar/zhongtong/avi/ledlamp/service/LedService.java
View file @ 2bc23d54
......@@ -66,7 +66,7 @@ public class LedService {
}
}
}
//TODO:临时的假数据, 进车数 = 当前小时 * 5;
/*//TODO:临时的假数据, 进车数 = 当前小时 * 5;
int hours = new Date().getHours();
int minutes = new Date().getMinutes();
if (hours > 6){
......@@ -74,7 +74,7 @@ public class LedService {
if (vo.getBusIn().intValue() > 12){
vo.setBusOut(new BigDecimal((hours - 6) * 4 + minutes / 15 - Integer.valueOf(ledNo) - 7));
}
}
}*/
if (ledNo.equals("1") || ledNo.equals("2") || ledNo.equals("3") || ledNo.equals("4")) {
vo.setRoomInfoList(new ArrayList<>());
......@@ -103,13 +103,15 @@ public class LedService {
room.add(item);
continue;
}
long workTime = System.currentTimeMillis() - lastEquipData.getBeginTime().getTime();
if ("RUN".equals(lastEquipData.getEquipStatus().name())) {
item.setStationState(StationState.USE);
item.setWorkingHours(new BigDecimal(workTime / 1000 / 60f).setScale(2, BigDecimal.ROUND_HALF_UP));
} else {
item.setStationState(StationState.FREE);
item.setWorkingHours(new BigDecimal(0));
}
long workTime = System.currentTimeMillis() - lastEquipData.getBeginTime().getTime();
item.setWorkingHours(new BigDecimal(workTime / 1000 / 60f).setScale(2, BigDecimal.ROUND_HALF_UP));
room.add(item);
}
vo.setRoomInfoList(room);
......
src/main/java/net/vtstar/zhongtong/avi/monitoring/controller/AreaController.java
View file @ 2bc23d54
......@@ -147,7 +147,7 @@ public class AreaController {
@ApiOperation(value = "根据车身号获得当前车体信息", response = Bus.class)
@GetMapping("/detail/busNo")
private Return getBusDetail(@RequestParam("busNo") String busNo) {
private Return getBusDetail(@RequestParam(value = "busNo", required = false) String busNo) {
Bus bus = areaService.getByBusNo(busNo);
return Return.success(bus);
......
src/main/java/net/vtstar/zhongtong/avi/monitoring/job/RedisToCacheJob.java
View file @ 2bc23d54
......@@ -74,7 +74,7 @@ public class RedisToCacheJob extends GatherJob {
warningCache.put(Constant.LED_PREFIX + key, warnings);
list.addAll(warnings);
}
log.error("当前检测到异常报警: {}条", list.size());
log.debug("当前检测到异常报警: {}条", list.size());
warningCache.put(Constant.LED_PREFIX + "ALL", list);
runRecordService.refreshWarning(list);
//处理进出车信息
......
src/main/java/net/vtstar/zhongtong/avi/monitoring/service/AreaService.java
View file @ 2bc23d54
......@@ -5,6 +5,7 @@ import net.vtstar.user.mybatis.provider.WhereFilter;
import net.vtstar.zhongtong.avi.equipment.domain.PaintshopArea;
import net.vtstar.zhongtong.avi.equipment.domain.PaintshopStation;
import net.vtstar.zhongtong.avi.monitoring.domain.Bus;
import net.vtstar.zhongtong.avi.monitoring.domain.enums.StationState;
import net.vtstar.zhongtong.avi.monitoring.domain.vo.CarStatisticsVO;
import net.vtstar.zhongtong.avi.sqlserver.domain.MesWorkOrderInfo;
import net.vtstar.zhongtong.avi.sqlserver.mapper.MesWorkOrderMapper;
......@@ -40,7 +41,15 @@ public class AreaService {
if (null != areaNo) {
for (PaintshopArea area : areas) {
if (areaNo.equals(area.getCode())) {
int num = 0;
for (Map.Entry<String, PaintshopStation> entry : area.getStationMap().entrySet()){
PaintshopStation value = entry.getValue();
if (StationState.USE.equals(value.getState())){
num ++;
}
}
ArrayList<PaintshopArea> paintshopAreas = new ArrayList<>();
area.setOnlineNum(String.valueOf(num));
paintshopAreas.add(area);
return paintshopAreas;
}
......
src/main/java/net/vtstar/zhongtong/avi/monitoring/service/PDAService.java
View file @ 2bc23d54
......@@ -85,12 +85,14 @@ public class PDAService {
tem.setState(tem2.getState());
tem.setSkid(tem2.getSkid());
tem.setWorkOrderNo(tem2.getWorkOrderNo());
tem.setBusType(tem2.getBusType());
tem.setBusNo(tem2.getBusNo());
}
end.setInTime(new Date());
end.setBusNo(sourceSkid.getBusNo());
end.setWorkOrderNo(sourceSkid.getWorkOrderNo());
end.setState(StationState.USE);
end.setBusType(sourceSkid.getBusType());
end.setSkid(null);
for (PaintshopStation station : lands){
valueOperations.set(Constant.STATION_PREFIX + station.getCode(), station);
......@@ -101,7 +103,8 @@ public class PDAService {
source.setWorkOrderNo(null);
sourceSkid.setBusNo(null);
sourceSkid.setWorkOrderNo(null);
source.setSkid(sourceSkid);
source.setSkid(null);
source.setState(StationState.FREE);
valueOperations.set(Constant.SKID_PREFIX + sourceSkid.getRfid(), sourceSkid);
valueOperations.set(Constant.STATION_PREFIX + sourceStation, source);
}
......
src/main/java/net/vtstar/zhongtong/avi/monitoring/service/StationPassInfoService.java
View file @ 2bc23d54
......@@ -24,7 +24,7 @@ public class StationPassInfoService {
@Autowired
private StationPassInfoMapper passInfoMapper;
//创建过站信息记录
/*//创建过站信息记录
public Long createPassInfo(String workOrderNo, String rfid, String areaNo, String stationNo){
StationPassInfo info = new StationPassInfo();
info.setVIN(workOrderNo);
......@@ -46,9 +46,46 @@ public class StationPassInfoService {
}
passInfo.setOutTime(new Date());
passInfoMapper.update(passInfo);
//todo:!!!!!!!!!!!!!!!!
String sql = "INSERT INTO VEHICLE_PASSING_INFO VALUES (?,?,?,?,?,?,?)";
mesSqlServerJdbcTemplate.update(sql, new Object[]{passInfo.getVIN(), passInfo.getRfid(), passInfo.getAreaNo(),
passInfo.getStationNo(), DateUtils.parseDateToString(passInfo.getInTime(), "yyyy-MM-dd HH:mm:ss"),
DateUtils.parseDateToString(passInfo.getOutTime(), "yyyy-MM-dd HH:mm:ss"), 1});
}*/
//创建过站信息记录
public Long createPassInfo(String workOrderNo, String rfid, String areaNo, String stationNo){
StationPassInfo info = new StationPassInfo();
info.setVIN(workOrderNo);
if (null == workOrderNo){
info.setVIN("");
}
info.setRfid(rfid);
info.setAreaNo(areaNo);
info.setStationNo(stationNo);
info.setInTime(new Date());
passInfoMapper.insert(info);
String sql = "INSERT INTO VEHICLE_PASSING_INFO VALUES (?,?,?,?,?,?,?)";
mesSqlServerJdbcTemplate.update(sql, new Object[]{info.getVIN(), info.getRfid(), info.getAreaNo(),
info.getStationNo(), DateUtils.parseDateToString(info.getInTime(), "yyyy-MM-dd HH:mm:ss"),
info.getOutTime(), 1});
return info.getId();
}
public void endPassInfo(PaintshopStation station){
StationPassInfo info = new StationPassInfo();
info.setVIN(station.getSkid().getWorkOrderNo());
if (null == station.getSkid().getWorkOrderNo()){
info.setVIN("");
}
info.setRfid(station.getSkid().getRfid());
info.setAreaNo(station.getAreaName());
info.setStationNo(station.getCode());
info.setOutTime(new Date());
passInfoMapper.insert(info);
//todo:!!!!!!!!!!!!!!!!
String sql = "INSERT INTO VEHICLE_PASSING_INFO VALUES (?,?,?,?,?,?,?)";
mesSqlServerJdbcTemplate.update(sql, new Object[]{info.getVIN(), info.getRfid(), info.getAreaNo(),
info.getStationNo(), info.getInTime(),
DateUtils.parseDateToString(info.getOutTime(), "yyyy-MM-dd HH:mm:ss"), 1});
}
}
src/main/java/net/vtstar/zhongtong/avi/mqtt/handle/RfidMessageHandler.java
View file @ 2bc23d54
......@@ -25,6 +25,7 @@ import net.vtstar.zhongtong.avi.monitoring.service.StationPassInfoService;
import net.vtstar.zhongtong.avi.utils.EquipDataUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
import org.springframework.core.annotation.Order;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.ListOperations;
import org.springframework.data.redis.core.RedisTemplate;
......@@ -41,7 +42,8 @@ import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@Component
@Order(value = 99)
//@Component
public class RfidMessageHandler extends AbstractTesterMessageHandler {
public static MQTTMessageBO messageBO = new MQTTMessageBO();
......@@ -144,9 +146,8 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
}else {
size ++;
}
//TODO: size是否需要++
valueOperations.set(key, size);
String keyW = EquipDataUtil.getTestValueKey("ROTARY_ROLLER_BED_C");
String keyW = EquipDataUtil.getTestValueKey(Constant.ROTARY_ROLLER_BED_C);
testValueOperations.set(keyW, null == testValueOperations.get(keyW) ? 0 : ((int)testValueOperations.get(keyW)) + 1);
return;
}
......@@ -168,8 +169,8 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
Date occurTime = vehicle.getOccurTime();
if (null != occurTime) {
long l = (date.getTime() - occurTime.getTime()) / 1000;
if (l < 60) {
log.error("{} 平移车发生重发现象 ,滑撬id {}", vehicleCode, id);
if (l < 30) {
// log.error("{} 平移车发生重发现象 ,滑撬id {}", vehicleCode, id);
vehicle.setOccurTime(date);
valueOperations.set(Constant.VEHICLE_PREFIX + vehicleCode, vehicle);
return;
......@@ -182,6 +183,9 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
if (state == 0) {
vehicle.setState(false);
if (null != skid){
vehicle.setSkid(skid);
}
vehicle.setOccurTime(new Date());
valueOperations.set(Constant.VEHICLE_PREFIX + vehicleCode, vehicle);
return;
......@@ -190,7 +194,7 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
if (null == skid){
skid = new Skid();
skid.setRfid(id);
skid.setBusNo("123456");
skid.setBusNo("");
skid.setWorkOrderNo("TZ0010051107_0011");
skid.setBusType(ProductionType.OWN);
valueOperations.set(Constant.SKID_PREFIX + id, skid);
......@@ -203,8 +207,14 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
List<PaintshopArea> areas = webStationCache.get("stationList", ArrayList.class);
if (null == areas){
return;
}
for (PaintshopArea area : areas) {
Map<String, PaintshopStation> stationMap = area.getStationMap();
if (null == stationMap){
continue;
}
for (Map.Entry<String, PaintshopStation> entry : stationMap.entrySet()) {
PaintshopStation value = entry.getValue();
//因目前无法保证上撬工位一定位于平移车道两侧, 所以不再判断车道信息
......@@ -233,10 +243,13 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
PaintshopStation end = lands.get(lands.size() - 1);
if (start.getCode().equals(value.getCode())) {
if(null == start.getSkid()){
start.setSkid(value.getSkid());
}
vehicle.setSkid(start.getSkid());
vehicle.setCurrentRfid(start.getSkid().getRfid());
for (int j = 1; j < lands.size() - 2; j++) {
for (int j = 1; j <= lands.size() - 2; j++) {
PaintshopStation tem = lands.get(j);
PaintshopStation tem2 = lands.get(j - 1);
if (tem.getSkid() != null) {
......@@ -246,11 +259,16 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
tem2.setState(StationState.FREE);
tem2.setSkid(null);
}
tem.setState(StationState.FREE);
tem.setSkid(null);
}
if (null != start.getPassInfoId()){
passInfoService.endPassInfo(start);
}
} else if (end.getCode().equals(value.getCode())) {
if(null == end.getSkid()){
end.setSkid(value.getSkid());
}
vehicle.setSkid(end.getSkid());
vehicle.setCurrentRfid(end.getSkid().getRfid());
......@@ -264,10 +282,23 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
tem2.setState(StationState.FREE);
tem2.setSkid(null);
}
tem.setState(StationState.FREE);
tem.setSkid(null);
}
if (null != end.getPassInfoId()){
passInfoService.endPassInfo(end);
}
}else{
//因现场错误干扰, 导致滑撬不在两端工位
for (PaintshopStation land : lands) {
if (land.getSkid() != null && id.equals(land.getSkid().getRfid())){
land.setSkid(null);
land.setState(StationState.FREE);
if (null != land.getPassInfoId()){
passInfoService.endPassInfo(land);
}
}
}
}
//TODO: 记录过站信息
......@@ -293,12 +324,20 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
//若为涂装首工位上车, 且为焊装刚刚过来的, 此时无法从工位列表中找到滑撬信息, 所以单独处理
if (vehicleCode.equals(Constant.TUZHUANG_VEHICLE1_RFID)){
valueOperations.set(Constant.VEHICLE_PREFIX + vehicleCode, vehicle);
String keyW = EquipDataUtil.getTestValueKey("ROTARY_ROLLER_BED_P1");
String keyW = EquipDataUtil.getTestValueKey(Constant.ROTARY_ROLLER_BED_P1);
testValueOperations.set(keyW, null == testValueOperations.get(keyW) ? 0 : ((int)testValueOperations.get(keyW)) + 1);
}
if (vehicleCode.equals("rfid67")){
String keyW = EquipDataUtil.getTestValueKey("ROTARY_ROLLER_BED_P2");
String keyW = EquipDataUtil.getTestValueKey(Constant.ROTARY_ROLLER_BED_P2);
testValueOperations.set(keyW, null == testValueOperations.get(keyW) ? 0 : ((int)testValueOperations.get(keyW)) + 1);
String areaKey = Constant.BUS_SIZE_OUT + "1" + ":" + today;
Integer size = (Integer) valueOperations.get(areaKey);
if (null == size) {
size = 1;
} else {
size++;
}
valueOperations.set(areaKey, size);
}
// // TODO: 2019-11-02 获得正反转信息，以及相邻的工位
......@@ -412,22 +451,4 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
// }
}
private void savePassInfo(String today, String currentDate, Skid skid, PaintshopStation sourceStation) {
String key = Constant.BUS_SIZE_OUT + sourceStation.getAreaId().toString() + ":" + today;
Integer size = (Integer) valueOperations.get(key);
if (null == size) {
size = 0;
} else {
size++;
}
valueOperations.set(key, size);
StationPassInfo info = new StationPassInfo();
info.setAreaNo(sourceStation.getAreaId().toString());
info.setRfid(skid.getRfid());
info.setVIN(skid.getWorkOrderNo());
// info.setInTime(currentDate);
info.setStationNo(sourceStation.getCode());
passInfoMapper.insert(info);
}
}
src/main/java/net/vtstar/zhongtong/avi/report/controller/ReportController.java
View file @ 2bc23d54
......@@ -19,7 +19,6 @@ import net.vtstar.zhongtong.avi.report.domain.vo.TrendVO;
import net.vtstar.zhongtong.avi.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -207,14 +206,7 @@ public class ReportController {
@ApiOperation("设备运行时间统计")
@GetMapping("/runTimeList")
private Return getMachineRunTime(@RequestParam String workshopCode){
//TODO:
List<RuntimeRecord> list = new ArrayList<>();
/*for (int i = 0; i < 10; i++){
RuntimeRecord runtimeRecord = new RuntimeRecord();
runtimeRecord.setEquipCode("喷涂室00" + i);
runtimeRecord.setCurrentRuntime(new BigDecimal(5));
list.add(runtimeRecord);
}*/
String startOfDay = DateUtils.parseDateToString(DateUtils.getStartOfDay(0), "yyyy-MM-dd HH:mm:ss");
String endOfDay = DateUtils.parseDateToString(DateUtils.getEndOfDay(0), "yyyy-MM-dd HH:mm:ss");
list = runtimeRecordMapper.findList(new WhereFilter() {{
......
src/main/java/net/vtstar/zhongtong/avi/sqlserver/domain/TestLineResult.java
View file @ 2bc23d54
......@@ -26,11 +26,10 @@ public class TestLineResult {
@Show(label = "PID")
@ApiModelProperty(notes = "PID")
@Column(name = "PID")
@Search
private String PID;
@Show(label = "VIN")
@ApiModelProperty(notes = "车身号")
@ApiModelProperty(notes = "VIN")
@Column(name = "VIN")
@Search
private String VIN;
......@@ -38,6 +37,7 @@ public class TestLineResult {
@Show(label = "测试时间", dataType = FieldType.DATETIME)
@ApiModelProperty(notes = "测试时间")
@Column(name = "TEST_TIME")
@Search
private Date TEST_TIME;
@Show(label = "一轴轴重")
......
src/main/java/net/vtstar/zhongtong/avi/sqlserver/domain/TestSpeedResult.java
View file @ 2bc23d54
......@@ -40,7 +40,7 @@ public class TestSpeedResult {
@Column(name = "test_date")
private Date testDate;
@Show(label = "限速值")
@Show(label = "限速值(km/h)")
@ApiModelProperty(notes = "限速值")
@Column(name = "SPEED_MAX")
private Float SPEED_MAX;
......@@ -50,12 +50,12 @@ public class TestSpeedResult {
@Column(name = "SPEED_XSDG")
private String SPEEDXSDG;
@Show(label = "速度下限")
@Show(label = "速度下限(km/h)")
@ApiModelProperty(notes = "速度下限")
@Column(name = "SPEED_XSBZ0")
private Float SPEED_XSBZ0;
@Show(label = "速度上限")
@Show(label = "速度上限(km/h)")
@ApiModelProperty(notes = "速度上限")
@Column(name = "SPEED_XSBZ1")
private Float SPEED_XSBZ1;
......
src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/MesWorkOrderJob.java
View file @ 2bc23d54
......@@ -8,7 +8,6 @@ import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.sqlserver.domain.MesWorkOrderInfo;
import net.vtstar.zhongtong.avi.sqlserver.mapper.MesWorkOrderMapper;
import net.vtstar.zhongtong.avi.utils.PingIpUtils;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -29,7 +28,6 @@ import java.util.List;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class MesWorkOrderJob extends QuartzJobBean {
@Resource(name = "mesSqlServerJdbcTemplate")
......
src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/TestLineResultJob.java
View file @ 2bc23d54
......@@ -7,7 +7,6 @@ import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.sqlserver.domain.TestLineResult;
import net.vtstar.zhongtong.avi.sqlserver.mapper.TestLineResultMapper;
import net.vtstar.zhongtong.avi.utils.PingIpUtils;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,7 +27,6 @@ import java.util.List;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class TestLineResultJob extends QuartzJobBean {
@Resource(name = "testSqlServerJdbcTemplate")
......
src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/TestSpeedResultJob.java
View file @ 2bc23d54
......@@ -7,7 +7,6 @@ import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.sqlserver.domain.TestSpeedResult;
import net.vtstar.zhongtong.avi.sqlserver.mapper.TestSpeedMapper;
import net.vtstar.zhongtong.avi.utils.PingIpUtils;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,7 +27,6 @@ import java.util.List;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class TestSpeedResultJob extends QuartzJobBean {
@Resource(name = "speedSqlServerJdbcTemplate")
......
src/main/java/net/vtstar/zhongtong/avi/stamping/domain/FlatLaserCuttingMachine.java
View file @ 2bc23d54
......@@ -46,6 +46,5 @@ public class FlatLaserCuttingMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
}
src/main/java/net/vtstar/zhongtong/avi/stamping/domain/LaserCutting3DMachine.java
View file @ 2bc23d54
......@@ -63,7 +63,6 @@ public class LaserCutting3DMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
@ApiModelProperty("采集状态")
......
src/main/java/net/vtstar/zhongtong/avi/stamping/domain/LaserCuttingMachine.java
View file @ 2bc23d54
......@@ -46,6 +46,5 @@ public class LaserCuttingMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
}
src/main/java/net/vtstar/zhongtong/avi/stamping/domain/PlasmaCuttingMachine.java
View file @ 2bc23d54
......@@ -46,6 +46,5 @@ public class PlasmaCuttingMachine extends EquipmentData {
@Show(label = "设备位置")
@Column(name = "equip_factory")
@ApiModelProperty(notes = "设备位置")
@Search
private String equipFactory;
}
src/main/java/net/vtstar/zhongtong/avi/stamping/job/LaserCuttingMachineJob.java
View file @ 2bc23d54
......@@ -5,7 +5,6 @@ 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.stamping.domain.LaserCutting3DMachine;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.stereotype.Component;
......@@ -15,7 +14,6 @@ import org.springframework.stereotype.Component;
*/
@Slf4j
@Component
@DisallowConcurrentExecution
public class LaserCuttingMachineJob extends GatherJob {
private static final String NAME = "3D_LASER_CUTTING";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment