Skip to content

Z
zhongtong-avi-service
Commit 63b592ba authored by 喻训浩's avatar 喻训浩
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents dfb42cdc df94b74b
Hide whitespace changes
Inline Side-by-side
Showing with 576 additions and 166 deletions
pom.xml
View file @ 63b592ba
......@@ -137,11 +137,21 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources/lib</directory>
<targetPath>BOOT-INF/lib/</targetPath>
<includes>
<include>**/*.jar</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
<plugin>
......
src/main/java/net/vtstar/zhongtong/avi/access/job/AssemblyNewEnergyJob.java
View file @ 63b592ba
......@@ -11,7 +11,6 @@ import net.vtstar.user.mybatis.provider.WhereFilter;
import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.access.domain.AssemblyNewEnergy;
import net.vtstar.zhongtong.avi.access.mapper.AssemblyNewEnergyMapper;
import net.vtstar.zhongtong.avi.sqlserver.domain.TestLineResult;
import net.vtstar.zhongtong.avi.utils.PingIpUtils;
import net.vtstar.zhongtong.avi.utils.SmbFileUtil;
import org.quartz.DisallowConcurrentExecution;
......@@ -24,6 +23,7 @@ import org.springframework.stereotype.Component;
import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.*;
/**
......@@ -69,7 +69,7 @@ public class AssemblyNewEnergyJob extends QuartzJobBean {
}
//todo:账户, 密码需要变
String url = "smb://admin:123456@" + ipAddress + "/AN9637H/testdata@" + dateString + ".mdb";
// String url = "smb://admin:123456@10.1.25.128/an9637h/testdata@2018-05-04.mdb";
// String url = "smb://admin:123456@10.1.25.128/an9637h/test/data@2018-05-04.mdb";
SmbFile file = null;
try {
file = new SmbFile(url);
......@@ -80,7 +80,7 @@ public class AssemblyNewEnergyJob extends QuartzJobBean {
continue;
}
Database db;
List<AssemblyNewEnergy> list = new ArrayList<>();;
List<AssemblyNewEnergy> list = new ArrayList<>();
try {
db = DatabaseBuilder.open(new File(baseUrl + ipAddress + "/" + "testdata@" + dateString + ".mdb"));
Set<String> tableNames = db.getTableNames();
......@@ -93,11 +93,11 @@ public class AssemblyNewEnergyJob extends QuartzJobBean {
AssemblyNewEnergy map = new AssemblyNewEnergy();
map.setSerialNo(row.getString("SerialNo"));
map.setTIName(row.getString("TIName"));
map.setResultValue(row.getDouble("ResultValue"));
map.setResultValue(new BigDecimal(row.getDouble("ResultValue")).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue());
map.setResultUnit(row.getString("ResultUnit"));
map.setSystemTime(dateString + row.getString("SystemTime"));
map.setSystemTime(dateString + " " + row.getString("SystemTime"));
map.setIpAddress(ipAddress);
map.setCreateTime(new Date());
map.setCreateTime(DateUtils.parse(dateString + " " + row.getString("SystemTime"), "yyyy-MM-dd HH:mm:ss"));
list.add(map);
}
}
......@@ -108,7 +108,7 @@ public class AssemblyNewEnergyJob extends QuartzJobBean {
assemblyNewEnergyMapper.delByFilter(new WhereFilter() {{
addFilter("SystemTime", Operation.LIKE, dateString);
addFilter("ipAddress", Operation.EQUAL, ipAddress);
}}, TestLineResult.class);
}}, AssemblyNewEnergy.class);
assemblyNewEnergyMapper.insertList(list);
log.info("更新新能源检测点: {} 数据: {}条", ipAddress, list.size());
} catch (Exception e) {
......
src/main/java/net/vtstar/zhongtong/avi/access/job/WheelAlignmentJob.java
View file @ 63b592ba
......@@ -43,9 +43,9 @@ public class WheelAlignmentJob extends QuartzJobBean {
@Value("${zt.ip.wheelalignment1}")
private String ipAddress1;
@Value("${zt.ip.wheelalignment1}")
@Value("${zt.ip.wheelalignment2}")
private String ipAddress2;
@Value("${zt.ip.wheelalignment1}")
@Value("${zt.ip.wheelalignment3}")
private String ipAddress3;
@Value("${zt.ip.pingtimes}")
private int pingTimes;
......@@ -70,18 +70,13 @@ public class WheelAlignmentJob extends QuartzJobBean {
continue;
}
//todo:账户, 密码, 文件位置需要变 BL_Align(数据库文件)
String url;
if (ipAddress.equals(ipAddress1)){
url = "smb://wanteng:wanteng@" + ipAddress + "/AN9637H/" + newDateString + ".mdb";
}else {
url = "smb://wanteng:wanteng@" + ipAddress + "/Database/" + dataBaseFileName + ".mdb";
}
String url = "smb://" + ipAddress + "/Database/" + dataBaseFileName + ".mdb";
SmbFile file = null;
String dateFile = baseUrl + ipAddress + "/" + newDateString + ".mdb";
String dateFile = baseUrl + ipAddress + "/" + newDateString + "/" + "BL_Align.mdb";
try {
file = new SmbFile(url);
if (file.exists()) {
SmbFileUtil.smbGet(url, baseUrl + ipAddress);
SmbFileUtil.smbGet(url, baseUrl + ipAddress + "/" + newDateString);
}else {
log.error("日期: {} 的底盘车间四轮定位共享数据库文件不存在!", url);
continue;
......@@ -92,10 +87,10 @@ public class WheelAlignmentJob extends QuartzJobBean {
db = DatabaseBuilder.open(new File(dateFile));
Set<String> tableNames = db.getTableNames();
for (String tableName : tableNames) {
if ("LEGEND-5214E5AF".equals(tableName)){
/*if ("LEGEND-5214E5AF".equals(tableName)){
saveData(ipAddress, db, list, tableName);
}
if (newDateString.equals(tableName)){
}*/
if ("2019Oct06".equals(tableName)){
saveData(ipAddress, db, list, tableName);
}
}
......@@ -103,10 +98,13 @@ public class WheelAlignmentJob extends QuartzJobBean {
log.error("读取日期: {} 的数据库文件失败!ip: {}", dateString, ipAddress);
continue;
}
if (list.size() == 0){
continue;
}
mapper.delByFilter(new WhereFilter() {{
addFilter("create_time", Operation.GREATER_THAN, dateString);
addFilter("ipAddress", Operation.EQUAL, ipAddress);
}}, TestLineResult.class);
}}, WheelAlignment.class);
mapper.insertList(list);
log.info("更新四轮定位: {} 数据: {}条", ipAddress, list.size());
} catch (Exception e) {
......@@ -126,50 +124,50 @@ public class WheelAlignmentJob extends QuartzJobBean {
map.setMake(row.getString("Make"));
map.setModel(row.getString("Model"));
map.setVIN(row.getString("VIN"));
map.setLFToeI(row.getInt("LFToeI") / 51.2 + "mm");
map.setLFToeF(row.getInt("LFToeF") / 51.2 + "mm");
map.setRFToeI(row.getInt("RFToeI") / 51.2 + "mm");
map.setRFToeF(row.getInt("RFToeF") / 51.2 + "mm");
map.setLFCamI((row.getInt("LFCamI") / 1000) + "°" + (Math.round((row.getInt("LFCamI") % 1000 * 60 / 1000f))) + "′");
map.setLFCamF((row.getInt("LFCamF") / 1000) + "°" + (Math.round((row.getInt("LFCamF") % 1000 * 60 / 1000f))) + "′");
map.setRFCamI((row.getInt("RFCamI") / 1000) + "°" + (Math.round((row.getInt("RFCamI") % 1000 * 60 / 1000f))) + "′");
map.setRFCamF((row.getInt("RFCamF") / 1000) + "°" + (Math.round((row.getInt("RFCamF") % 1000 * 60 / 1000f))) + "′");
map.setLCasI((row.getInt("LCasI") / 1000) + "°" + (Math.round((row.getInt("LCasI") % 1000 * 60 / 1000f))) + "′");
map.setLCasF((row.getInt("LCasF") / 1000) + "°" + (Math.round((row.getInt("LCasF") % 1000 * 60 / 1000f))) + "′");
map.setRCasI((row.getInt("RCasI") / 1000) + "°" + (Math.round((row.getInt("RCasI") % 1000 * 60 / 1000f))) + "′");
map.setRCasF((row.getInt("RCasF") / 1000) + "°" + (Math.round((row.getInt("RCasF") % 1000 * 60 / 1000f))) + "′");
map.setLFToeI(row.getInt("LFToeI") == 99999 ? "" : new BigDecimal(row.getInt("LFToeI") / 51.2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "mm");
map.setLFToeF(row.getInt("LFToeF") == 99999 ? "" : new BigDecimal(row.getInt("LFToeF") / 51.2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "mm");
map.setRFToeI(row.getInt("RFToeI") == 99999 ? "" : new BigDecimal(row.getInt("RFToeI") / 51.2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "mm");
map.setRFToeF(row.getInt("RFToeF") == 99999 ? "" : new BigDecimal(row.getInt("RFToeF") / 51.2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "mm");
map.setLFCamI(row.getInt("LFCamI") == 99999 ? "" : (row.getInt("LFCamI") / 1000) + "°" + (Math.round((row.getInt("LFCamI") % 1000 * 60 / 1000f))) + "′");
map.setLFCamF(row.getInt("LFCamF") == 99999 ? "" : (row.getInt("LFCamF") / 1000) + "°" + (Math.round((row.getInt("LFCamF") % 1000 * 60 / 1000f))) + "′");
map.setRFCamI(row.getInt("RFCamI") == 99999 ? "" : (row.getInt("RFCamI") / 1000) + "°" + (Math.round((row.getInt("RFCamI") % 1000 * 60 / 1000f))) + "′");
map.setRFCamF(row.getInt("RFCamF") == 99999 ? "" : (row.getInt("RFCamF") / 1000) + "°" + (Math.round((row.getInt("RFCamF") % 1000 * 60 / 1000f))) + "′");
map.setLCasI(row.getInt("LCasI") == 99999 ? "" : (row.getInt("LCasI") / 1000) + "°" + (Math.round((row.getInt("LCasI") % 1000 * 60 / 1000f))) + "′");
map.setLCasF(row.getInt("LCasF") == 99999 ? "" : (row.getInt("LCasF") / 1000) + "°" + (Math.round((row.getInt("LCasF") % 1000 * 60 / 1000f))) + "′");
map.setRCasI(row.getInt("RCasI") == 99999 ? "" : (row.getInt("RCasI") / 1000) + "°" + (Math.round((row.getInt("RCasI") % 1000 * 60 / 1000f))) + "′");
map.setRCasF(row.getInt("RCasF") == 99999 ? "" : (row.getInt("RCasF") / 1000) + "°" + (Math.round((row.getInt("RCasF") % 1000 * 60 / 1000f))) + "′");
//TODO:LKpiI/256*15′
int lKpiI = Math.round(row.getInt("LKpiI") % 1000 / 250f);
if (lKpiI == 4){
map.setLKpiI((row.getInt("LKpiI") / 1000 + 1) + "°" + "0′");
map.setLKpiI(row.getInt("LKpiI") == 99999 ? "" : (row.getInt("LKpiI") / 1000 + 1) + "°" + "0′");
}else{
map.setLKpiI((row.getInt("LKpiI") / 1000 + 1) + "°" + (lKpiI * 15) + "′");
map.setLKpiI(row.getInt("LKpiI") == 99999 ? "" : (row.getInt("LKpiI") / 1000 + 1) + "°" + (lKpiI * 15) + "′");
}
int lKpiF = Math.round(row.getInt("LKpiF") % 1000 / 250f);
if (lKpiF == 4){
map.setLKpiF((row.getInt("LKpiF") / 1000 + 1) + "°" + "0′");
map.setLKpiF(row.getInt("LKpiF") == 99999 ? "" : (row.getInt("LKpiF") / 1000 + 1) + "°" + "0′");
}else{
map.setLKpiF((row.getInt("LKpiF") / 1000) + "°" + (lKpiF * 15) + "′");
map.setLKpiF(row.getInt("LKpiF") == 99999 ? "" : (row.getInt("LKpiF") / 1000) + "°" + (lKpiF * 15) + "′");
}
int rKpiI = Math.round(row.getInt("RKpiI") % 1000 / 250f);
if (rKpiI == 4){
map.setRKpiI((row.getInt("RKpiI") / 1000 + 1) + "°" + "0′");
map.setRKpiI(row.getInt("RKpiI") == 99999 ? "" : (row.getInt("RKpiI") / 1000 + 1) + "°" + "0′");
}else{
map.setRKpiI((row.getInt("RKpiI") / 1000) + "°" + (rKpiI * 15) + "′");
map.setRKpiI(row.getInt("RKpiI") == 99999 ? "" : (row.getInt("RKpiI") / 1000) + "°" + (rKpiI * 15) + "′");
}
int rKpiF = Math.round(row.getInt("RKpiF") % 1000 / 250f);
if (rKpiF == 4){
map.setRKpiF((row.getInt("RKpiF") / 1000 + 1) + "°" + "0′");
map.setRKpiF(row.getInt("RKpiF") == 99999 ? "" : (row.getInt("RKpiF") / 1000 + 1) + "°" + "0′");
}else{
map.setRKpiF((row.getInt("RKpiF") / 1000) + "°" + (rKpiF * 15) + "′");
map.setRKpiF(row.getInt("RKpiF") == 99999 ? "" : (row.getInt("RKpiF") / 1000) + "°" + (rKpiF * 15) + "′");
}
map.setLAckermanF(String.valueOf(new BigDecimal(row.getDouble("LAckermanF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setRAckermanF(String.valueOf(new BigDecimal(row.getDouble("RAckermanF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setLMaxTurnF(String.valueOf(new BigDecimal(row.getDouble("LMaxTurnF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setRMaxTurnF(String.valueOf(new BigDecimal(row.getDouble("RMaxTurnF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setTandem0I((row.getInt("Tandem0I") / 47.5) + "mm");
map.setTandem0D1I((row.getInt("Tandem0D1I") / 115.926) + "mm");
map.setLAckermanF(row.getDouble("LAckermanF") == 99999.1 ? "" : String.valueOf(new BigDecimal(row.getDouble("LAckermanF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setRAckermanF(row.getDouble("RAckermanF") == 99999.1 ? "" : String.valueOf(new BigDecimal(row.getDouble("RAckermanF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setLMaxTurnF(row.getDouble("LMaxTurnF") == 99999.1 ? "" : String.valueOf(new BigDecimal(row.getDouble("LMaxTurnF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setRMaxTurnF(row.getDouble("RMaxTurnF") == 99999.1 ? "" : String.valueOf(new BigDecimal(row.getDouble("RMaxTurnF")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()) + "°");
map.setTandem0I(row.getInt("Tandem0I") == 99999 ? "0" : new BigDecimal((row.getInt("Tandem0I") / 47.5)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "mm");
map.setTandem0D1I(row.getInt("Tandem0D1I") == 99999 ? "0" : new BigDecimal((row.getInt("Tandem0D1I") / 115.926)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "mm");
map.setIpAddress(ipAddress);
map.setCreateTime(new Date());
list.add(map);
......
src/main/java/net/vtstar/zhongtong/avi/equipment/controller/DryingRoomTempController.java 0 → 100644
View file @ 63b592ba
package net.vtstar.zhongtong.avi.equipment.controller;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.utils.domain.Return;
import net.vtstar.zhongtong.avi.equipment.domain.EquipInfo;
import net.vtstar.zhongtong.avi.equipment.service.DryingRoomTempService;
import net.vtstar.zhongtong.avi.gateway.painting.domain.DryingRoomTempMachine;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
/**
* @Author: xiadongwei
* @Date: 2019/11/15 9:54
*/
@Slf4j
@Api(description = "烘干室温度模块")
@RequestMapping("/api/dryingRoom")
@RestController
public class DryingRoomTempController {
@Autowired
private DryingRoomTempService service;
@ApiOperation(value = "查询温度状态列表", response = EquipInfo.class, responseContainer = "List", notes =
"入参：\n{\n" +
" \"equipCode\": \"设备编号，字符串类型, 可以为空\",\n" +
" \"beginTime\": \"指定日期，Data类型, (yyyy-MM-dd), 可以为空, 默认当天\",\n" +
"}")
@GetMapping("/equipPage")
public Return getDryingRoomState(@RequestParam(value = "equipCode", required = false) String equipCode,
@RequestParam(value = "beginTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) Date beginTime){
return Return.success(new PageInfo<>(service.findPageEquip(equipCode, beginTime)));
}
@ApiOperation(value = "获取指定时间内的温度表", response = DryingRoomTempMachine.class, responseContainer = "List", notes =
"入参：\n{\n" +
" \"beginTime\": \"开始时间，String类型, (yyyy-MM-dd HH:mm:ss)\",\n" +
" \"endTime\": \"结束时间，String类型, (yyyy-MM-dd HH:mm:ss)\"\n" +
"}")
@GetMapping("/temp")
public Return getTempByStateId(@RequestParam(value = "beginTime")String beginTime,
@RequestParam(value = "endTime") String endTime){
return Return.success(service.getTempByStateId(beginTime, endTime));
}
}
src/main/java/net/vtstar/zhongtong/avi/equipment/controller/EquipmentController.java
View file @ 63b592ba
......@@ -50,6 +50,7 @@ public class EquipmentController {
@PostMapping("/program/transfer")
private Return programTransfer(@RequestBody ProgramTransferVO transferVO){
//TODO:
equipmentService.putFile(transferVO);
return Return.success();
}
......
src/main/java/net/vtstar/zhongtong/avi/equipment/domain/EquipInfo.java
View file @ 63b592ba
......@@ -71,4 +71,7 @@ public class EquipInfo {
@ApiModelProperty(notes = "更新时间")
@Column(name = "update_time")
private Date updateTime;
@Column(name = "alias")
private String equipName;
}
src/main/java/net/vtstar/zhongtong/avi/equipment/job/StatisticsTimeJob.java
View file @ 63b592ba
......@@ -5,6 +5,7 @@ import net.vtstar.scada.base.equipmgt.service.EquipDataService;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.user.mybatis.provider.Operation;
import net.vtstar.user.mybatis.provider.WhereFilter;
import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.equipment.domain.EquipInfo;
import net.vtstar.zhongtong.avi.equipment.domain.RuntimeRecord;
import net.vtstar.zhongtong.avi.equipment.mapper.BasicInfoMapper;
......@@ -44,6 +45,9 @@ public class StatisticsTimeJob extends QuartzJobBean {
instance.add(Calendar.DATE, -1);
Date yesterday = instance.getTime();
String startOfDay = DateUtils.parseDateToString(DateUtils.getStartOfDay(-1), "yyyy-MM-dd HH:mm:ss");
String endOfDay = DateUtils.parseDateToString(DateUtils.getEndOfDay(-1), "yyyy-MM-dd HH:mm:ss");
//拿到所有设备
List<EquipInfo> equipInfo = basicInfoMapper.findList(new WhereFilter(),EquipInfo.class);
......@@ -51,7 +55,7 @@ public class StatisticsTimeJob extends QuartzJobBean {
String equipCode = info.getEquipCode();
long totalRuntime = 0;
//查询今日设备所有运行状态数据
List<EquipmentData> runData = equipDataService.findRunByCodeAndDate(equipCode, yesterday);
List<EquipmentData> runData = equipDataService.findRunByCodeAndDate2(equipCode, startOfDay, endOfDay);
if (CollectionUtils.isEmpty(runData)) {
continue;
}
......
src/main/java/net/vtstar/zhongtong/avi/equipment/service/BasicInfoService.java
View file @ 63b592ba
......@@ -10,6 +10,8 @@ import net.vtstar.user.search.service.SearchService;
import net.vtstar.utils.asserts.ParamAssert;
import net.vtstar.zhongtong.avi.equipment.domain.*;
import net.vtstar.zhongtong.avi.equipment.mapper.*;
import net.vtstar.zhongtong.avi.sqlserver.domain.MesWorkOrderInfo;
import net.vtstar.zhongtong.avi.sqlserver.mapper.MesWorkOrderMapper;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
......
src/main/java/net/vtstar/zhongtong/avi/equipment/service/DryingRoomTempService.java 0 → 100644
View file @ 63b592ba
package net.vtstar.zhongtong.avi.equipment.service;
import com.alibaba.excel.util.StringUtils;
import com.github.pagehelper.PageHelper;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.scada.base.equipmgt.service.EquipDataService;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.user.mybatis.provider.Operation;
import net.vtstar.user.mybatis.provider.WhereFilter;
import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.equipment.mapper.EquipmentDataMapper;
import net.vtstar.zhongtong.avi.gateway.painting.domain.DryingRoomTempMachine;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Author: xiadongwei
* @Date: 2019/9/20 9:31
*/
@Slf4j
@Service
public class DryingRoomTempService {
@Autowired
private EquipDataService equipDataService;
@Autowired
private EquipmentDataMapper dataMapper;
/**
* 查询温度状态列表
*/
public List<EquipmentData> findPageEquip(String equipCode, Date beginTime) {
PageHelper.startPage(1, 20);
if (null == beginTime){
beginTime = new Date();
}
if (StringUtils.isEmpty(equipCode)){
return equipDataService.findRunByType("DRYING_ROOM_TEMP");
}
String startOfDay = DateUtils.parseDateToString(DateUtils.getStartOfDay(0, beginTime), "yyyy-MM-dd HH:mm:ss");
String endOfDay = DateUtils.parseDateToString(DateUtils.getEndOfDay(0, beginTime), "yyyy-MM-dd HH:mm:ss");
return equipDataService.findRunByCodeAndDate2(equipCode, startOfDay, endOfDay);
}
public List<DryingRoomTempMachine> getTempByStateId(String beginTime, String endTime) {
return dataMapper.findJoin(new WhereFilter() {{
addFilter("create_time", Operation.EQUAL_GREATER_THAN, beginTime);
addFilter("create_time", Operation.EQUAL_LESS_THAN, endTime);
}}, DryingRoomTempMachine.class);
}
}
src/main/java/net/vtstar/zhongtong/avi/equipment/service/EquipmentService.java
View file @ 63b592ba
......@@ -2,15 +2,19 @@ package net.vtstar.zhongtong.avi.equipment.service;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import net.vtstar.scada.base.equipmgt.domain.EquipDataChannel;
import net.vtstar.scada.base.equipmgt.service.EquipDataChannelService;
import net.vtstar.user.mybatis.provider.Operation;
import net.vtstar.user.mybatis.provider.WhereFilter;
import net.vtstar.user.search.service.SearchService;
import net.vtstar.utils.asserts.ParamAssert;
import net.vtstar.zhongtong.avi.equipment.domain.EquipInfo;
import net.vtstar.zhongtong.avi.equipment.domain.Program;
import net.vtstar.zhongtong.avi.equipment.domain.vo.ProgramTransferVO;
import net.vtstar.zhongtong.avi.equipment.mapper.BasicInfoMapper;
import net.vtstar.zhongtong.avi.equipment.mapper.EquipmentDataMapper;
import net.vtstar.zhongtong.avi.global.web.domain.ShowField;
import net.vtstar.zhongtong.avi.utils.SmbFileUtil;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.CellStyle;
......@@ -49,12 +53,17 @@ public class EquipmentService {
private SearchService searchService;
@Autowired
private BasicInfoMapper basicInfoMapper;
@Autowired
private EquipDataChannelService equipDataChannelService;
private String baseUrl = "D:/scada/program/";
public List<Map<String, Object>> findRealTimeData(JSONObject pageFilter) {
PageHelper.startPage(pageFilter.getIntValue("pageNum"), pageFilter.getIntValue("pageSize"));
Class searchCode = classNameCache.get(pageFilter.getString("searchCode"), Class.class);
if(searchCode == null){
return new ArrayList<>();
}
return dataMapper.findJoin(searchService.pageFilter2Filter(pageFilter), searchCode);
}
......@@ -153,4 +162,9 @@ public class EquipmentService {
}
}
}
public void putFile(ProgramTransferVO transferVO) {
EquipDataChannel equipDataChannel = equipDataChannelService.getByEquipCode(transferVO.getEquipCode());
SmbFileUtil.smbPut("smb://10.1.4.107/数控下料/", transferVO.getFilePath());
}
}
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/CentralizedFillingClutchMachine.java
View file @ 63b592ba
......@@ -55,11 +55,6 @@ public class CentralizedFillingClutchMachine extends EquipmentData {
@Column(name = "filling_pressure")
private Integer fillingPressure;
@Show(label = "设备状态")
@Column(name = "state")
@ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
private Integer status;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
@Column(name = "create_time")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FloorLeatherHotMachine.java
View file @ 63b592ba
......@@ -99,11 +99,6 @@ public class FloorLeatherHotMachine extends EquipmentData {
@Column(name = "gluing_amount")
private Float gluingAmount;
@Show(label = "设备状态")
@Column(name = "state")
@ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
private Integer status;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
@Column(name = "create_time")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FocusAddingRefrigerantMachine.java
View file @ 63b592ba
......@@ -50,11 +50,6 @@ public class FocusAddingRefrigerantMachine extends EquipmentData {
@Column(name = "filling_pressure")
private Integer fillingPressure;
@Show(label = "设备状态")
@Column(name = "state")
@ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
private Integer status;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
@Column(name = "create_time")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/domain/FocusBoosterOilMachine.java
View file @ 63b592ba
......@@ -45,10 +45,25 @@ public class FocusBoosterOilMachine extends EquipmentData {
@Column(name = "filling_amount2")
private int fillingAmount2;
@Show(label = "设备状态")
@Column(name = "state")
@ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
private Integer status;
@Show(label = "加注设定值(ml)")
@ApiModelProperty(notes = "加注设定值")
@Column(name = "filling_settings")
private Float fillingSettings;
@Show(label = "加注量(ml)")
@ApiModelProperty(notes = "加注量")
@Column(name = "filling_amount")
private Float fillingAmount;
@Show(label = "压力设定值(mbar)")
@ApiModelProperty(notes = "压力设定值(mbar)")
@Column(name = "pressure_settings")
private Float pressureSettings;
@Show(label = "加注压力(mbar)")
@ApiModelProperty(notes = "加注压力(mbar)")
@Column(name = "filling_pressure")
private Float fillingPressure;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/CentralizedFillingClutchMachineJob.java
View file @ 63b592ba
......@@ -29,8 +29,8 @@ public class CentralizedFillingClutchMachineJob extends GatherJob {
public boolean handleObject(EquipmentData equipmentData) {
CentralizedFillingClutchMachine data = (CentralizedFillingClutchMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/FloorLeatherHotMachineJob.java
View file @ 63b592ba
......@@ -30,8 +30,8 @@ public class FloorLeatherHotMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
FloorLeatherHotMachine data = (FloorLeatherHotMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
if (data.getCurrentYield() == 0){
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/FocusAddingRefrigerantMachineJob.java
View file @ 63b592ba
......@@ -30,8 +30,8 @@ public class FocusAddingRefrigerantMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
FocusAddingRefrigerantMachine data = (FocusAddingRefrigerantMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
/*if (null == ((FocusAddingRefrigerantMachine) equipmentData).getFillingAmount() ||
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/FocusBoosterOilMachineJob.java
View file @ 63b592ba
......@@ -30,8 +30,8 @@ public class FocusBoosterOilMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
FocusBoosterOilMachine data = (FocusBoosterOilMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/gateway/assembly/job/PlateChainTimeMachineJob.java
View file @ 63b592ba
......@@ -3,18 +3,21 @@ package net.vtstar.zhongtong.avi.gateway.assembly.job;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.scada.base.equipmgt.domain.EquipInfo;
import net.vtstar.scada.base.equipmgt.mapper.EquipInfoMapper;
import net.vtstar.scada.base.equipmgt.service.EquipDataService;
import net.vtstar.scada.base.equipmgt.service.EquipInfoService;
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;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.quartz.QuartzJobBean;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
/**
......@@ -28,12 +31,15 @@ public class PlateChainTimeMachineJob extends QuartzJobBean {
@Autowired
EquipInfoMapper equipInfoMapper;
@Resource(name = "jdbcTemplate")
private JdbcTemplate jdbcTemplate;
@Autowired
private EquipInfoService equipInfoService;
@Autowired
private EquipDataService equipDataService;
@Autowired
private EquipmentDataMapper dataMapper;
private static final String NAME = "ASSEMBLY_PLATE_CHAIN";
/**
......@@ -46,9 +52,38 @@ public class PlateChainTimeMachineJob extends QuartzJobBean {
return;
}
for (EquipInfo equipInfo : equipInfoList){
List<EquipmentData> data = jdbcTemplate.queryForList("select id,equip_type,equip_code,equip_status,begin_time,end_time " +
"from equip_status_record " +
"where equip_code = '" + equipInfo.getEquipCode() + "' and DATE(currentDate) = DATE(end_time) and equip_status = 'RUN'", EquipmentData.class);
String startOfDay = DateUtils.parseDateToString(DateUtils.getStartOfDay(0, new Date()), "yyyy-MM-dd HH:mm:ss");
String endOfDay = DateUtils.parseDateToString(DateUtils.getEndOfDay(0, new Date()), "yyyy-MM-dd HH:mm:ss");
List<EquipmentData> runByCodeAndDate = equipDataService.findRunByCodeAndDate2(equipInfo.getEquipCode(), startOfDay, endOfDay);
if (runByCodeAndDate.size() < 2){
continue;
}
Date startTime = null;
//总间隔时间
long totalTime = 0;
for (EquipmentData equipmentData : runByCodeAndDate){
if (null == startTime){
startTime = equipmentData.getEndTime();
continue;
}
//如果记录的开始时间大于上一条记录的结束时间
Date beginTime = equipmentData.getBeginTime();
if (null == beginTime){
continue;
}
if (beginTime.after(startTime)){
totalTime = totalTime + beginTime.getTime() - startTime.getTime();
}
}
if (totalTime != 0){
PlateChainMachine plateChainMachine = new PlateChainMachine();
plateChainMachine.setEquipCode(equipInfo.getEquipCode());
plateChainMachine.setAlias(equipInfo.getAlias());
plateChainMachine.setCreateTime(new Date());
String averageTime = (totalTime / runByCodeAndDate.size() / 1000 / 60) + "min" + (totalTime / runByCodeAndDate.size() / 1000 % 60) + "s";
plateChainMachine.setAverageTime(averageTime);
dataMapper.insert(plateChainMachine);
}
}
}
......
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/domain/ChassisTorqueWrench.java
View file @ 63b592ba
......@@ -55,11 +55,6 @@ public class ChassisTorqueWrench extends EquipmentData {
@Column(name = "shaft_torque_4")
private Integer shaftTorque4;
@Show(label = "设备状态")
@Column(name = "state")
@ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
private Integer status;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
@Column(name = "create_time")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/domain/LubricatingOilConcentrateMachine.java 0 → 100644
View file @ 63b592ba
package net.vtstar.zhongtong.avi.gateway.chassis.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.user.search.Search;
import net.vtstar.zhongtong.avi.global.web.Show;
import net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType;
import javax.persistence.Column;
import javax.persistence.Table;
import java.util.Date;
/**
* @Author: xiadongwei
* @Date: 2019/10/17 11:52
*/
@ApiModel(value = "底盘车间车间--润滑油集中加注", description = "底盘润滑油集中加注监控数据表")
@Data
@Search(code = "LUBRICATING_OIL_CONCENTRATE")
@Table(name = "eqp_data_lubricating_oil_concentrate")
public class LubricatingOilConcentrateMachine extends EquipmentData {
@Show(label = "设备编号")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@Search
private String equipCode;
@Show(label = "设备名称")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@Search
private String alias;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
@Column(name = "create_time")
@Search
private Date createTime;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/domain/RicetingEquipmentMachine.java 0 → 100644
View file @ 63b592ba
package net.vtstar.zhongtong.avi.gateway.chassis.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.user.search.Search;
import net.vtstar.zhongtong.avi.global.web.Show;
import net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType;
import javax.persistence.Column;
import javax.persistence.Table;
import java.util.Date;
/**
* @Author: xiadongwei
* @Date: 2019/10/17 11:52
*/
@ApiModel(value = "底盘车间车间--铆接设备", description = "底盘铆接设备监控数据表")
@Data
@Search(code = "RIVETING_EQUIPMENT")
@Table(name = "eqp_data_riveting_equipment")
public class RicetingEquipmentMachine extends EquipmentData {
@Show(label = "设备编号")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@Search
private String equipCode;
@Show(label = "设备名称")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@Search
private String alias;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
@Column(name = "create_time")
@Search
private Date createTime;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/chassis/job/ChassisTorqueMachineJob.java
View file @ 63b592ba
......@@ -30,8 +30,8 @@ public class ChassisTorqueMachineJob extends GatherJob {
@Override
protected boolean handleObject(EquipmentData equipmentData) {
ChassisTorqueWrench data = (ChassisTorqueWrench) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
if(null == ((ChassisTorqueWrench) equipmentData).getShaftTorque1()
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/DryingRoomTempMachine.java
View file @ 63b592ba
......@@ -22,11 +22,17 @@ public class DryingRoomTempMachine extends EquipmentData {
@ApiModelProperty(notes = "温度")
private Float temperature;
@ApiModelProperty(notes = "燃烧机状态1")
private Integer combustionMachineState1;
@ApiModelProperty(notes = "燃烧机状态2")
private Integer combustionMachineState2;
@ApiModelProperty(notes = "燃烧机状态3")
private Integer combustionMachineState3;
@ApiModelProperty("采集时间")
@Column(name = "create_time")
private Date createTime;
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/PaintingRobotMachine.java
View file @ 63b592ba
......@@ -37,7 +37,7 @@ public class PaintingRobotMachine extends EquipmentData {
@Show(label = "系统状态")
@Column(name = "state")
@ApiModelProperty(notes = "系统状态")
private Integer status;
private Integer state;
@Show(label = "采集时间",dataType = FieldType.DATETIME)
@ApiModelProperty("时间")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/SprayBoothMachine.java
View file @ 63b592ba
......@@ -37,7 +37,4 @@ public class SprayBoothMachine extends EquipmentData {
@ApiModelProperty("时间")
@Column(name = "create_time")
private Date createTime;
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/SprayBoothStateMachine.java
View file @ 63b592ba
......@@ -66,6 +66,4 @@ public class SprayBoothStateMachine extends EquipmentData {
@Column(name = "create_time")
private Date createTime;
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/domain/VocMachine.java 0 → 100644
View file @ 63b592ba
package net.vtstar.zhongtong.avi.gateway.painting.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.user.search.Search;
import net.vtstar.zhongtong.avi.global.web.Show;
import javax.persistence.Column;
import javax.persistence.Table;
import java.util.Date;
@Data
@Search(code = "VOC")
@ApiModel(value = "Voc处理平台", description = "Voc处理平台监控数据表")
@Table(name = "eqp_data_voc")
public class VocMachine extends EquipmentData {
@Show(label = "设备编号")
@Column(name = "eqp_code")
@ApiModelProperty(notes = "设备编号")
@Search
private String equipCode;
@Show(label = "VOC浓度")
@Column(name = "concentration")
@ApiModelProperty(notes = "VOC浓度")
private Float concentration;
@Show(label = "采集时间")
@ApiModelProperty("时间")
@Column(name = "create_time")
private Date createTime;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/DryingRoomTempMachineJob.java
View file @ 63b592ba
package net.vtstar.zhongtong.avi.gateway.painting.job;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.scada.base.gather.job.GatherJob;
import net.vtstar.zhongtong.avi.gateway.painting.domain.DryingRoomTempMachine;
......@@ -27,14 +28,18 @@ public class DryingRoomTempMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
DryingRoomTempMachine data = (DryingRoomTempMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
if (null == data.getTemperature()){
return false;
}
return true;
if (data.getCombustionMachineState1() == 1 || data.getCombustionMachineState2() == 1 || data.getCombustionMachineState3() == 1){
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
return true;
}
return false;
}
@Override
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/PaintingRobotMachineJob.java
View file @ 63b592ba
......@@ -30,8 +30,8 @@ public class PaintingRobotMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
PaintingRobotMachine data = (PaintingRobotMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
if(data.getRunState() == 1){
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/SprayBoothStateMachineJob.java
View file @ 63b592ba
......@@ -30,8 +30,8 @@ public class SprayBoothStateMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
SprayBoothStateMachine data = (SprayBoothStateMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
Integer runState = data.getState();
......
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/job/VocMachineJob.java 0 → 100644
View file @ 63b592ba
package net.vtstar.zhongtong.avi.gateway.painting.job;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.scada.base.gather.job.GatherJob;
import net.vtstar.zhongtong.avi.gateway.painting.domain.VocMachine;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.stereotype.Component;
import java.util.Date;
/**
* 喷涂室状态数据采集JOB
*/
@Slf4j
@Component
public class VocMachineJob extends GatherJob {
private static final String NAME = "VOC";
@Override
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
log.info("JobName: {}", context.getJobDetail().getKey().getName());
super.gatherByModbus(NAME, VocMachine.class);
}
@Override
public boolean handleObject(EquipmentData equipmentData) {
VocMachine data = (VocMachine) equipmentData;
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
if (data.getConcentration() == null || "-1".equals(data.getConcentration().toString())){
equipmentData.setEquipStatus(EquipStatusEnum.ALARM);
return true;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
return true;
}
@Override
public Object handleValue(String fieldName, Object value) {
if (null == value){
return null;
}
if ("concentration".equals(fieldName)){
Long aLong = Long.valueOf(value.toString());
String longStr = Long.toHexString(aLong);
if (longStr.startsWith("0")){
return aLong / 1000;
}
if (longStr.startsWith("4")){
return -1;
}
}
return value;
}
@Override
protected void postHandle(EquipmentData equipmentData) {
((VocMachine)equipmentData).setCreateTime(new Date());
}
}
src/main/java/net/vtstar/zhongtong/avi/gateway/painting/listener/SprayBoothListener.java
View file @ 63b592ba
......@@ -16,6 +16,7 @@ import java.util.List;
/**
* 温度传感器监听
*
* @Author: xiadongwei
* @Date: 2019/11/4 18:55
*/
......@@ -30,13 +31,63 @@ public class SprayBoothListener implements CommandLineRunner {
public void run(String... args) throws Exception {
// 初始化
RSServer rsServer = RSServer.Initiate(2404);
rsServer.addDataListener(new MyIDataListener(){
rsServer.addDataListener(new MyIDataListener() {
@Override
public void receiveRealtimeData(RealTimeData data){
public void receiveRealtimeData(RealTimeData data) {
super.receiveRealtimeData(data);
List<SprayBoothMachine> list = new ArrayList<>();
int deviceId = data.getDeviceId();
String name = "";
switch (deviceId) {
case 30018326:
name = "喷漆室-01";
break;
case 30019151:
name = "喷漆室-02";
break;
case 3:
name = "喷漆室-03";
break;
case 4:
name = "喷漆室-04";
break;
case 5:
name = "喷漆室-05";
break;
case 6:
name = "喷漆室-06";
break;
case 7:
name = "喷漆室-07";
break;
case 8:
name = "喷漆室-08";
break;
case 9:
name = "喷漆室-09";
break;
case 10:
name = "喷漆室-10";
break;
case 11:
name = "喷漆室-11";
break;
case 12:
name = "喷漆室-12";
break;
case 13:
name = "喷漆室-13";
break;
default:
break;
}
for (NodeData nd : data.getNodeList()) {
//TODO: 根据设备地址设置设备编号
if (nd.getTem() == 0f) {
continue;
}
SprayBoothMachine sprayBoothMachine = new SprayBoothMachine();
sprayBoothMachine.setEquipCode(name);
sprayBoothMachine.setTemperature(nd.getTem());
sprayBoothMachine.setHumidity(nd.getHum());
sprayBoothMachine.setCreateTime(new Date());
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/DustingLineMachine.java
View file @ 63b592ba
......@@ -43,6 +43,4 @@ public class DustingLineMachine extends EquipmentData {
@Column(name = "create_time")
@Search
private Date createTime;
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/SteelCncCuttingMachine.java
View file @ 63b592ba
......@@ -23,12 +23,6 @@ public class SteelCncCuttingMachine extends EquipmentData {
@ApiModelProperty(notes = "设备编号")
private String equipCode;
@Show(label = "设备名称")
@Column(name = "eqp_name")
@ApiModelProperty(notes = "设备名称")
@Search
private String alias;
@Show(label = "设备状态")
@Column(name = "state")
@ApiModelProperty(notes = "设备状态")
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/DustingLineMachineJob.java
View file @ 63b592ba
......@@ -31,8 +31,8 @@ public class DustingLineMachineJob extends GatherJob {
public boolean handleObject(EquipmentData equipmentData) {
//0待机，1是喷粉
DustingLineMachine data = (DustingLineMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state ==1) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/PretreamentMachineJob.java
View file @ 63b592ba
......@@ -30,9 +30,8 @@ public class PretreamentMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
PretreatmentMachine data = (PretreatmentMachine) equipmentData;
// Integer state = data.getStatus();
Integer state = 1;
if (state != null && state ==1) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/gateway/trial/domain/ChargingPileMachine.java
View file @ 63b592ba
......@@ -89,8 +89,4 @@ public class ChargingPileMachine extends EquipmentData {
@ApiModelProperty("时间")
@Column(name = "create_time")
private Date createTime;
@Column(name = "state")
@ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/trial/domain/HydrogenStationVocMachine.java
View file @ 63b592ba
......@@ -63,8 +63,4 @@ public class HydrogenStationVocMachine extends EquipmentData {
@ApiModelProperty("时间")
@Column(name = "create_time")
private Date createTime;
@Column(name = "state")
@ApiModelProperty(notes = "设备状态(0是关机，1是运行)")
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/trial/job/ChargingPileMachineJob.java
View file @ 63b592ba
......@@ -29,8 +29,8 @@ public class ChargingPileMachineJob extends GatherJob {
public boolean handleObject(EquipmentData equipmentData) {
ChargingPileMachine data = (ChargingPileMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
if (null == ((ChargingPileMachine) equipmentData).getBusCode()
......
src/main/java/net/vtstar/zhongtong/avi/gateway/trial/job/HydrogenStationVocMachineJob.java
View file @ 63b592ba
......@@ -27,10 +27,11 @@ public class HydrogenStationVocMachineJob extends GatherJob {
super.gatherByModbus(NAME, HydrogenStationVocMachine.class);
}
@Override
public boolean handleObject(EquipmentData equipmentData) {
HydrogenStationVocMachine data = (HydrogenStationVocMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlcControlTireMachine1.java
View file @ 63b592ba
......@@ -100,5 +100,4 @@ public class PlcControlTireMachine1 extends EquipmentData {
@Search
private Date createTime;
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlateChainMachine.java → src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/WeldingPlateChainMachine.java
View file @ 63b592ba
......@@ -16,7 +16,7 @@ import java.util.Date;
@Search(code = "PLATE_CHAIN")
@ApiModel(value = "板链", description = "焊装板链监控数据表")
@Table(name = "eqp_data_plate_chain")
public class PlateChainMachine extends EquipmentData {
public class WeldingPlateChainMachine extends EquipmentData {
@Show(label = "设备编号")
@Column(name = "eqp_code")
......@@ -45,6 +45,4 @@ public class PlateChainMachine extends EquipmentData {
@Search
private Date createTime;
private Integer status;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/AutomaticSpotWeldingMachineJob.java
View file @ 63b592ba
......@@ -30,9 +30,8 @@ public class AutomaticSpotWeldingMachineJob extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
AutomaticSpotWeldingMachine data = (AutomaticSpotWeldingMachine) equipmentData;
// Integer state = data.getStatus();
Integer state = 1;
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
if (data.getWeldingSpotA1() == null || data.getWeldingSpotA2() == null){
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlateChainMachineJob.java
View file @ 63b592ba
......@@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
import net.vtstar.scada.base.gather.domain.EquipmentData;
import net.vtstar.scada.base.gather.job.GatherJob;
import net.vtstar.zhongtong.avi.gateway.welding.domain.PlateChainMachine;
import net.vtstar.zhongtong.avi.gateway.welding.domain.WeldingPlateChainMachine;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.stereotype.Component;
......@@ -24,14 +24,14 @@ public class PlateChainMachineJob extends GatherJob {
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
log.info("JobName: {}", context.getJobDetail().getKey().getName());
super.gatherByModbus(NAME, PlateChainMachine.class);
super.gatherByModbus(NAME, WeldingPlateChainMachine.class);
}
@Override
public boolean handleObject(EquipmentData equipmentData) {
PlateChainMachine data = (PlateChainMachine) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
WeldingPlateChainMachine data = (WeldingPlateChainMachine) equipmentData;
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......@@ -46,6 +46,6 @@ public class PlateChainMachineJob extends GatherJob {
@Override
protected void postHandle(EquipmentData equipmentData) {
((PlateChainMachine)equipmentData).setCreateTime(new Date());
((WeldingPlateChainMachine)equipmentData).setCreateTime(new Date());
}
}
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlcControlTireMachine1Job.java
View file @ 63b592ba
......@@ -30,8 +30,8 @@ public class PlcControlTireMachine1Job extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
PlcControlTireMachine1 data = (PlcControlTireMachine1) equipmentData;
Integer state = data.getStatus();
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlcControlTireMachine2Job.java
View file @ 63b592ba
......@@ -30,9 +30,8 @@ public class PlcControlTireMachine2Job extends GatherJob {
@Override
public boolean handleObject(EquipmentData equipmentData) {
PlcControlTireMachine2 data = (PlcControlTireMachine2) equipmentData;
// Integer state = data.getStatus();
Integer state = 1;
if (state != null && state == 0) {
String state = data.getStatus();
if (state != null && "0".equals(state)) {
return false;
}
equipmentData.setEquipStatus(EquipStatusEnum.RUN);
......
src/main/java/net/vtstar/zhongtong/avi/equipment/domain/MesWorkOrderInfo.java → src/main/java/net/vtstar/zhongtong/avi/sqlserver/domain/MesWorkOrderInfo.java
View file @ 63b592ba
package net.vtstar.zhongtong.avi.equipment.domain;
package net.vtstar.zhongtong.avi.sqlserver.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
src/main/java/net/vtstar/zhongtong/avi/sqlserver/job/MesWorkOrderJob.java
View file @ 63b592ba
......@@ -5,8 +5,8 @@ import net.vtstar.user.mybatis.provider.Operation;
import net.vtstar.user.mybatis.provider.WhereFilter;
import net.vtstar.utils.CollecUtils;
import net.vtstar.utils.DateUtils;
import net.vtstar.zhongtong.avi.equipment.domain.MesWorkOrderInfo;
import net.vtstar.zhongtong.avi.equipment.mapper.MesWorkOrderMapper;
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;
......
src/main/java/net/vtstar/zhongtong/avi/equipment/mapper/MesWorkOrderMapper.java → src/main/java/net/vtstar/zhongtong/avi/sqlserver/mapper/MesWorkOrderMapper.java
View file @ 63b592ba
package net.vtstar.zhongtong.avi.equipment.mapper;
package net.vtstar.zhongtong.avi.sqlserver.mapper;
import net.vtstar.user.mybatis.BaseMapper;
import net.vtstar.zhongtong.avi.equipment.domain.MesWorkOrderInfo;
import net.vtstar.zhongtong.avi.sqlserver.domain.MesWorkOrderInfo;
import org.apache.ibatis.annotations.Mapper;
/**
......
src/main/java/net/vtstar/zhongtong/avi/sqlserver/service/TestDeliverService.java
View file @ 63b592ba
......@@ -151,7 +151,7 @@ public class TestDeliverService {
}
assemblyTorqueWrenchMapper.delByFilter(new WhereFilter() {{
addFilter("ResultDateTime", Operation.GREATER_THAN, timeStr);
}}, TestSpeedResult.class);
}}, AssemblyTorqueWrench.class);
assemblyTorqueWrenchMapper.insertList(query);
log.info("--------同步总装车间智能扭力扳手数据结束--------");
}
......
src/main/resources/config/application-quartz.properties
View file @ 63b592ba
......@@ -87,7 +87,7 @@ quartz.job.taskInfos[12].start=false
quartz.job.taskInfos[13].jobName=net.vtstar.zhongtong.avi.gateway.welding.job.PlcControlTireMachine2Job
quartz.job.taskInfos[13].jobGroup=PlcControlTireMachine2Job
quartz.job.taskInfos[13].jobDescription=\u6E05\u6D17\u8BBE\u5907\u72B6\u6001Job
quartz.job.taskInfos[13].cronExpression=0 0/15 * * * ?
quartz.job.taskInfos[13].cronExpression=0/5 * * * * ?
quartz.job.taskInfos[13].start=false
#涂装车间(PAINTING)
......@@ -105,6 +105,20 @@ quartz.job.taskInfos[23].jobDescription=\u6d82\u88c5\u55b7\u6d82\u5ba4Job
quartz.job.taskInfos[23].cronExpression=0/5 * * * * ?
quartz.job.taskInfos[23].start=false
#烘干室
quartz.job.taskInfos[28].jobName=net.vtstar.zhongtong.avi.gateway.painting.job.DryingRoomTempMachineJob
quartz.job.taskInfos[28].jobGroup=DryingRoomTempMachineJob
quartz.job.taskInfos[28].jobDescription=\u70d8\u5e72\u5ba4Job
quartz.job.taskInfos[28].cronExpression=0/5 * * * * ?
quartz.job.taskInfos[28].start=false
#VOC处理平台
quartz.job.taskInfos[27].jobName=net.vtstar.zhongtong.avi.gateway.painting.job.VocMachineJob
quartz.job.taskInfos[27].jobGroup=VocMachineJob
quartz.job.taskInfos[27].jobDescription=\u0056\u004f\u0043\u5904\u7406\u5e73\u53f0Job
quartz.job.taskInfos[27].cronExpression=0/5 * * * * ?
quartz.job.taskInfos[27].start=false
#底盘车间(CHASSIS)
#底盘智能扭力扳手
quartz.job.taskInfos[15].jobName=net.vtstar.zhongtong.avi.gateway.chassis.job.ChassisTorqueMachineJob
......@@ -117,7 +131,7 @@ quartz.job.taskInfos[15].start=false
quartz.job.taskInfos[7].jobName=net.vtstar.zhongtong.avi.access.job.WheelAlignmentJob
quartz.job.taskInfos[7].jobGroup=WheelAlignmentJob
quartz.job.taskInfos[7].jobDescription=\u56db\u8f6e\u5b9a\u4f4dJob
quartz.job.taskInfos[7].cronExpression=0 0/15 * * * ?
quartz.job.taskInfos[7].cronExpression=0/10 * * * * ?
quartz.job.taskInfos[7].start=false
#总装车间(ASSEMBLY)
......
src/main/resources/config/application-ztip.properties
View file @ 63b592ba
......@@ -15,12 +15,12 @@ zt.ip.assemblynewenergy3=10.1.25.130
#总装车间--新能源检测点4
zt.ip.assemblynewenergy4=10.1.25.131
#底盘车间--四轮定位1
zt.ip.wheelalignment1=10.1.25.85
#底盘车间--四轮定位2
zt.ip.wheelalignment2=10.1.25.86
#底盘车间--四轮定位3
zt.ip.wheelalignment3=10.1.25.87
#底盘车间--四轮定位A线
zt.ip.wheelalignment1=10.1.5.25
#底盘车间--四轮定位B线
zt.ip.wheelalignment2=10.1.5.87
#底盘车间--四轮定位C线
zt.ip.wheelalignment3=10.1.5.33
#试交车间
#检测线
......
src/main/resources/mapper/mysql/MesWorkOrderMapper.xml
View file @ 63b592ba
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="net.vtstar.zhongtong.avi.equipment.mapper.MesWorkOrderMapper">
<mapper namespace="net.vtstar.zhongtong.avi.sqlserver.mapper.MesWorkOrderMapper">
</mapper>
\ No newline at end of file
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