scada调试

src/main/java/net/vtstar/zhongtong/avi/access/job/AssemblyNewEnergyJob.java

@@ -73,7 +73,7 @@ public class AssemblyNewEnergyJob extends QuartzJobBean {
             try {
                 file = new SmbFile(url);
                 if (file.exists()) {
-                    SmbFileUtil.smbGet(url, baseUrl + "testdata@" + dateString + ".mdb");
+                    SmbFileUtil.smbGet(url, baseUrl + ipAddress);
                 }else {
                     log.error("日期: {} 的总装车间新能源检测点共享文件不存在!", dateString);
                     continue;
@@ -81,7 +81,7 @@ public class AssemblyNewEnergyJob extends QuartzJobBean {
                 Database db;
                 List<AssemblyNewEnergy> list = new ArrayList<>();;
                 try {
-                    db = DatabaseBuilder.open(new File(baseUrl + "testdata@" + dateString + ".mdb"));
+                    db = DatabaseBuilder.open(new File(baseUrl + ipAddress + "/" + "testdata@" + dateString + ".mdb"));
                     Set<String> tableNames = db.getTableNames();
                     for (String tableName : tableNames) {
                         if (!"TestConditionResult".equals(tableName)){

src/main/java/net/vtstar/zhongtong/avi/access/job/WheelAlignmentJob.java

@@ -77,11 +77,11 @@ public class WheelAlignmentJob extends QuartzJobBean {
                 url = "smb://wanteng:wanteng@" + ipAddress + "/Database/" + dataBaseFileName + ".mdb";
             }
             SmbFile file = null;
-            String dateFile = baseUrl + newDateString + "-" + ipAddress + ".mdb";
+            String dateFile = baseUrl + ipAddress + "/" + newDateString + ".mdb";
             try {
                 file = new SmbFile(url);
                 if (file.exists()) {
-                    SmbFileUtil.smbGet(url, dateFile);
+                    SmbFileUtil.smbGet(url, baseUrl + ipAddress);
                 }else {
                     log.error("日期: {} 的底盘车间四轮定位共享数据库文件不存在!", url);
                     continue;

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

@@ -26,6 +26,7 @@ public class CentralizedFillingClutchMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
+    @Search
     private String equipCode;
 
     @Show(label = "加注量(ml)")
@@ -46,5 +47,6 @@ public class CentralizedFillingClutchMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 }

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

@@ -101,5 +101,6 @@ public class FloorLeatherHotMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 }

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

@@ -26,6 +26,7 @@ public class FocusAddingRefrigerantMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
+    @Search
     private String equipCode;
 
     @Show(label = "加注量(ml)")
@@ -46,5 +47,6 @@ public class FocusAddingRefrigerantMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 }

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

@@ -26,6 +26,7 @@ public class FocusBoosterOilMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
+    @Search
     private String equipCode;
 
     @Show(label = "枪1加注量(ml)")
@@ -46,5 +47,6 @@ public class FocusBoosterOilMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 }

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

@@ -25,6 +25,7 @@ public class PlateChainMachine{
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
+    @Search
     private String equipCode;
 
     @Show(label = "当班平均运行间隔时间")
@@ -35,5 +36,6 @@ public class PlateChainMachine{
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 }

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

@@ -34,6 +34,10 @@ public class FocusAddingRefrigerantMachineJob extends GatherJob {
         if (state != null && state == 0) {
             return false;
         }
+        if (null == ((FocusAddingRefrigerantMachine) equipmentData).getFillingAmount() ||
+                ((FocusAddingRefrigerantMachine) equipmentData).getFillingAmount().intValue() == 0){
+            return false;
+        }
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
         return true;
     }

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

@@ -33,6 +33,7 @@ public class PlateChainStateMachineJob extends GatherJob {
         super.gatherByModbus(NAME, PlateChainStateMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         PlateChainStateMachine data = (PlateChainStateMachine) equipmentData;
         Integer state = data.getState();
@@ -41,15 +42,13 @@ public class PlateChainStateMachineJob extends GatherJob {
         }
         String key = EquipDataUtil.getTestValueKey(equipmentData.getEquipCode());
         Object value = testValueOperations.get(key);
-        if (value == null){
-            equipmentData.setEquipStatus(EquipStatusEnum.RUN);
+        if (value == null || "".equals(value.toString())){
+            equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
             testValueOperations.set(key, state);
             return true;
         }
         if (state.equals(value)){
-            equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
-            testValueOperations.set(key, state);
-            return true;
+            return false;
         }
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
         testValueOperations.set(key, state);

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

@@ -26,6 +26,7 @@ public class ChassisTorqueWrench  extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
+    @Search
     private String equipCode;
 
     @Show(label = "一轴扭矩")
@@ -56,5 +57,6 @@ public class ChassisTorqueWrench  extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 }

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

@@ -21,6 +21,7 @@ public class PaintingRobotMachine extends EquipmentData {
     @Show(label = "设备编号")
     @Column(name = "eqp_code")
     @ApiModelProperty(notes = "设备编号")
+    @Search
     private String equipCode;
 
     @Show(label = "系统是否运行")
@@ -41,6 +42,7 @@ public class PaintingRobotMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 
 }

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

@@ -27,19 +27,26 @@ public class PaintingRobotMachineJob extends GatherJob {
         super.gatherByModbus(NAME, PaintingRobotMachine.class);
     }
 
+    @Override
     public boolean handleObject(EquipmentData equipmentData) {
         PaintingRobotMachine data = (PaintingRobotMachine) equipmentData;
         Integer state = data.getStatus();
         if (state != null && state == 0) {
             return false;
         }
-        equipmentData.setEquipStatus(EquipStatusEnum.RUN);
+        if(data.getRunState() == 1){
+            equipmentData.setEquipStatus(EquipStatusEnum.RUN);
+        }else{
+            equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
+        }
+
         return true;
     }
 
     @Override
     public Object handleValue(String fieldName, Object value) {
-        return value;
+        Integer valueInt = Integer.valueOf(value.toString());
+        return (valueInt & 0x01);
     }
 
     @Override

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

@@ -41,6 +41,7 @@ public class DustingLineMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 
     private Integer status;

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

@@ -101,6 +101,7 @@ public class PretreatmentMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 
     private Integer status;

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

@@ -31,6 +31,7 @@ public class SteelCncCuttingMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 
     private Integer state;

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

@@ -39,5 +39,6 @@ public class WeldingRobotMachine{
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 }

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

@@ -31,6 +31,7 @@ public class ChargingPileMachine extends EquipmentData {
     @Show(label = "车辆编号")
     @ApiModelProperty(notes = "车辆编号")
     @Column(name = "bus_code")
+    @Search
     private String busCode;
 
     @Show(label = "输出电压(V)")

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

@@ -33,6 +33,10 @@ public class ChargingPileMachineJob extends GatherJob {
         if (state != null && state == 0) {
             return false;
         }
+        if (null == ((ChargingPileMachine) equipmentData).getBusCode()
+                || "".equals(((ChargingPileMachine) equipmentData).getBusCode())){
+            return false;
+        }
         equipmentData.setEquipStatus(EquipStatusEnum.RUN);
         return true;
     }

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

@@ -36,6 +36,7 @@ public class PlateChainMachine extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 
     private Integer status;

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

@@ -97,7 +97,8 @@ public class PlcControlTireMachine1 extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
-    private Date createTime
-            ;
+    @Search
+    private Date createTime;
+
     private Integer status;
 }

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

@@ -71,6 +71,7 @@ public class PlcControlTireMachine2 extends EquipmentData {
     @Show(label = "时间",dataType = FieldType.DATETIME)
     @ApiModelProperty("时间")
     @Column(name = "create_time")
+    @Search
     private Date createTime;
 
     @ApiModelProperty(notes = "系统运行(1,0)")

src/main/java/net/vtstar/zhongtong/avi/global/config/DataSourceConfig.java

@@ -80,4 +80,22 @@ public class DataSourceConfig {
         }
         return jdbcTemplate;
     }
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.mes.sqlserver")
+    DataSource mesSqlServerDatasource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean
+    JdbcTemplate mesSqlServerJdbcTemplate(JdbcProperties properties) {
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(mesSqlServerDatasource());
+        JdbcProperties.Template template = properties.getTemplate();
+        jdbcTemplate.setFetchSize(template.getFetchSize());
+        jdbcTemplate.setMaxRows(template.getMaxRows());
+        if (template.getQueryTimeout() != null) {
+            jdbcTemplate.setQueryTimeout((int) template.getQueryTimeout().getSeconds());
+        }
+        return jdbcTemplate;
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/global/config/MybatisMySQLConfig.java

@@ -24,7 +24,8 @@ import javax.sql.DataSource;
                 "net.vtstar.zhongtong.avi.access.mapper",
                 "net.vtstar.zhongtong.avi.laboratory.mapper",
                 "net.vtstar.zhongtong.avi.gateway.parts.mapper",
-                "net.vtstar.zhongtong.avi.monitoring.mapper"
+                "net.vtstar.zhongtong.avi.monitoring.mapper",
+                "net.vtstar.zhongtong.avi.gateway.painting.mapper"
         },
         sqlSessionFactoryRef = "sqlSessionFactoryMySQL")
 public class MybatisMySQLConfig {

src/main/java/net/vtstar/zhongtong/avi/ledlamp/test/ExcelTest.java

 package net.vtstar.zhongtong.avi.ledlamp.test;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.imageio.ImageIO;
-
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -29,6 +13,16 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
 public class ExcelTest {
 
     public static void test(String path) throws Exception {

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

@@ -62,5 +62,5 @@ public class TestSpeedResult {
     @Show(label = "错误帧")
     @ApiModelProperty(notes = "错误帧")
     @Column(name = "error_frame")
-    private Float error_frame;
+    private Integer errorFrame;
 }

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

@@ -2,4 +2,28 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://10.100.172.135:3306/zhongtong_dev?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
 spring.datasource.username=zhongtongdev
-spring.datasource.password=123456
\ No newline at end of file
+spring.datasource.password=123456
+
+# sql server(试交车间--检测线192.168.1.200)
+spring.test.sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+spring.test.sqlserver.jdbc-url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=CARTEST_ZTKC
+spring.test.sqlserver.username=admin
+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://10.1.25.134:1433;DatabaseName=localdb
+spring.speed.sqlserver.username=admin
+spring.speed.sqlserver.password=123456
+
+# sql server(总装车间--智能扭力扳手)
+spring.torque.sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+spring.torque.sqlserver.jdbc-url=jdbc:sqlserver://10.1.25.116:1433;DatabaseName=AtlasCopco_ToolsNet_Database
+spring.torque.sqlserver.username=admin
+spring.torque.sqlserver.password=123456
+
+# sql server(MES)
+spring.mes.sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+spring.mes.sqlserver.jdbc-url=jdbc:sqlserver://192.168.100.226:1433;DatabaseName=PaintingPlan
+spring.mes.sqlserver.username=wanteng
+spring.mes.sqlserver.password=wanteng@2019
\ No newline at end of file

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

-spring.profiles.include=mybatis,quartz,swagger,security,ztip,mqtt
+spring.profiles.include=mybatis,quartz,swagger,security,ztip,mqtt,datasource
 
 # Mysql
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.100.172.135:3306/zhongtong_dev?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://localhost:3306/zhongtong_dev?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
 spring.datasource.username=zhongtongdev
 spring.datasource.password=123456
 
 # redis
-#spring.redis.host=172.16.0.252
-#spring.redis.port=6379
-#spring.redis.password=)OKM1qaz
\ No newline at end of file
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=

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

@@ -31,7 +31,7 @@ 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/10 * * * * ?
-quartz.job.taskInfos[1].start=false
+quartz.job.taskInfos[1].start=true
 
 quartz.job.taskInfos[2].jobName=net.vtstar.zhongtong.avi.equipment.job.StatisticsTimeJob
 quartz.job.taskInfos[2].jobGroup=StatisticsTimeJob
@@ -95,8 +95,8 @@ quartz.job.taskInfos[13].start=false
 quartz.job.taskInfos[14].jobName=net.vtstar.zhongtong.avi.gateway.painting.job.PaintingRobotMachineJob
 quartz.job.taskInfos[14].jobGroup=PaintingRobotMachineJob
 quartz.job.taskInfos[14].jobDescription=\u55b7\u6d82\u673a\u5668\u4ebaJob
-quartz.job.taskInfos[14].cronExpression=0 0/15 * * * ?
-quartz.job.taskInfos[14].start=false
+quartz.job.taskInfos[14].cronExpression=0/5 * * * * ?
+quartz.job.taskInfos[14].start=true
 
 #喷涂喷涂室
 quartz.job.taskInfos[23].jobName=net.vtstar.zhongtong.avi.gateway.painting.job.SprayBoothStateMachineJob
@@ -110,7 +110,7 @@ quartz.job.taskInfos[23].start=false
 quartz.job.taskInfos[15].jobName=net.vtstar.zhongtong.avi.gateway.chassis.job.ChassisTorqueMachineJob
 quartz.job.taskInfos[15].jobGroup=ChassisTorqueMachineJob
 quartz.job.taskInfos[15].jobDescription=\u667a\u80fd\u626d\u529b\u6273\u624bJob
-quartz.job.taskInfos[15].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[15].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[15].start=false
 
 #四轮定位同步
@@ -139,14 +139,14 @@ quartz.job.taskInfos[16].start=false
 quartz.job.taskInfos[17].jobName=net.vtstar.zhongtong.avi.gateway.assembly.job.FocusAddingRefrigerantMachineJob
 quartz.job.taskInfos[17].jobGroup=FocusAddingRefrigerantMachineJob
 quartz.job.taskInfos[17].jobDescription=\u51b7\u5a92\u52a0\u6ce8\u673aJob
-quartz.job.taskInfos[17].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[17].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[17].start=false
 
 #助力油加注
 quartz.job.taskInfos[18].jobName=net.vtstar.zhongtong.avi.gateway.assembly.job.FocusBoosterOilMachineJob
 quartz.job.taskInfos[18].jobGroup=FocusBoosterOilMachineJob
 quartz.job.taskInfos[18].jobDescription=\u52a9\u529b\u6cb9\u52a0\u6ce8\u673aJob
-quartz.job.taskInfos[18].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[18].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[18].start=false
 
 #地板革热熔涂胶
@@ -185,11 +185,18 @@ quartz.job.taskInfos[4].jobDescription=\u9650\u901f\u503cJob
 quartz.job.taskInfos[4].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[4].start=false
 
+#错误帧
+quartz.job.taskInfos[25].jobName=net.vtstar.zhongtong.avi.gateway.trial.job.ErrorFrameJob
+quartz.job.taskInfos[25].jobGroup=ErrorFrameJob
+quartz.job.taskInfos[25].jobDescription=\u9519\u8bef\u5e27Job
+quartz.job.taskInfos[25].cronExpression=0/5 * * * * ?
+quartz.job.taskInfos[25].start=false
+
 #充电桩
 quartz.job.taskInfos[20].jobName=net.vtstar.zhongtong.avi.gateway.trial.job.ChargingPileMachineJob
 quartz.job.taskInfos[20].jobGroup=ChargingPileMachineJob
 quartz.job.taskInfos[20].jobDescription=\u5145\u7535\u6869Job
-quartz.job.taskInfos[20].cronExpression=0 0/15 * * * ?
+quartz.job.taskInfos[20].cronExpression=0/5 * * * * ?
 quartz.job.taskInfos[20].start=false
 
 #AVI plc 采集
@@ -199,6 +206,13 @@ quartz.job.taskInfos[24].jobDescription=\u76d1\u63a7\u0041\u0056\u0049Job
 quartz.job.taskInfos[24].cronExpression=0/10 * * * * ?
 quartz.job.taskInfos[24].start=false
 
+#mes 工单同步
+quartz.job.taskInfos[26].jobName=net.vtstar.zhongtong.avi.sqlserver.job.MesWorkOrderJob
+quartz.job.taskInfos[26].jobGroup=MesWorkOrderJob
+quartz.job.taskInfos[26].jobDescription=\u004d\u0045\u0053\u5de5\u5355\u540c\u6b65Job
+quartz.job.taskInfos[26].cronExpression=0/10 * * * * ?
+quartz.job.taskInfos[26].start=false
+
 
 #quartz.job.taskInfos[8].jobName=net.vtstar.scada.base.equipmgt.job.CleanEquipStatusJob
 ##quartz.job.taskInfos[8].jobGroup=CleanEquipStatusJob

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

@@ -13,7 +13,7 @@ spring.redis.password=
 
 # sql server(试交车间--检测线192.168.1.200)
 spring.test.sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.test.sqlserver.jdbc-url=jdbc:sqlserver://127.0.0.1:1433;DatabaseName=CARTEST_ZTKC
+spring.test.sqlserver.jdbc-url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=CARTEST_ZTKC
 spring.test.sqlserver.username=admin
 spring.test.sqlserver.password=123456
 
@@ -25,8 +25,14 @@ spring.speed.sqlserver.password=123456
 
 # sql server(总装车间--智能扭力扳手)
 spring.torque.sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.torque.sqlserver.jdbc-url=jdbc:sqlserver://127.0.0.1:1433;DatabaseName=AtlasCopco_ToolsNet_Database
+spring.torque.sqlserver.jdbc-url=jdbc:sqlserver://10.1.25.116:1433;DatabaseName=AtlasCopco_ToolsNet_Database
 spring.torque.sqlserver.username=admin
 spring.torque.sqlserver.password=123456
 
+# sql server(MES)
+spring.mes.sqlserver.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+spring.mes.sqlserver.jdbc-url=jdbc:sqlserver://192.168.100.226:1433;DatabaseName=PaintingPlan
+spring.mes.sqlserver.username=wanteng
+spring.mes.sqlserver.password=wanteng@2019
+
 server.port=8888

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

@@ -22,12 +22,20 @@ zt.ip.wheelalignment2=10.1.25.86
 #底盘车间--四轮定位3
 zt.ip.wheelalignment3=10.1.25.87
 
-#试交车间]====================--检测线
+#试交车间
+#检测线
 zt.ip.testlineresult=10.100.172.150
 #试交车间--限速值
 zt.ip.testspeedresult=10.1.25.134
+#试交车间--错误帧
+zt.ip.errorframe=10.1.25.141
+
 #总装车间--智能扭力扳手
 zt.ip.assemblytorquewrench=10.100.172.150
 
+#mes
+zt.ip.mes=192.168.100.226
+
+
 zt.ip.pingtimes=2
 zt.ip.timeout=500
\ No newline at end of file