shenzhouyu
/
modbus-collector
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

三色灯修改

master
shenzhouyu 1 month ago
parent
8f7d698f2d
commit
83f1121023
2 changed files with 17 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java
  2. 4
      threecolor-modbus-collector/src/main/resources/application-dev.yml

18
threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java
View File

@ -321,17 +321,23 @@ public class ModbusCollectServiceImpl
SfdcTimeHist sfdcTimeHistByGreen = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), resourceScheduled.getSeqNo(), "自动停机");
if(sfdcTimeHistByGreen != null){
boolean skipReopenHist = false;
logger.info("能否获取到派工单:{},{}", sfdcTimeHistByGreen.getEventTime(),resourceScheduled.getSeqNo());
if (sfdcTimeHistByGreen.getEventTime() != null && StringUtils.isNotBlank(resourceScheduled.getSeqNo())) {
logger.info("进来了吗");
int longGreenCount = threeColorLampDownlogMapper.countDownlogLamp100ExceedingRuntimeAfterHistEvent(
folderLocation.getSite(),
resourceScheduled.getSeqNo(),
sfdcTimeHistByGreen.getEventTime(),
runTime);
logger.info("longGreenCount:{}", longGreenCount);
if (longGreenCount > 0) {
skipReopenHist = true;
logger.info("hist event_time 之后存在 lamp=100 且持续超过 runTime({} 分钟) 的 downlog，跳过清空 hist，histId:{}",
runTime, sfdcTimeHistByGreen.getId());
}
}else{
logger.info("直接没进去");
break;
}
if (!skipReopenHist) {
sfdcTimeHistByGreen.setTillTime(null);
@ -379,6 +385,7 @@ public class ModbusCollectServiceImpl
if(!"X".equals(resourceScheduled.getIssend())){
SfdcTimeHist timeHist = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), resourceScheduled.getSeqNo(), "自动停机");
if(timeHist == null){
logger.info("开始空空插入前红灯寻找 sfdc_time_hist, seq_no:{}", resourceScheduled.getSeqNo());
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
if(soscheduled != null){
int histSeqno = threeColorLampMapper.selectHistSeqno(folderLocation.getSite(), resourceScheduled.getSeqNo());
@ -416,7 +423,7 @@ public class ModbusCollectServiceImpl
sfdcTimeHist.setBatchNo(null);
sfdcTimeHist.setRemark(null);
int insert = sfdcTimeHistMapper.insert(sfdcTimeHist);
logger.info("停机红灯插入数据: {}", sfdcTimeHist);
logger.info("新停机红灯插入数据: {}", sfdcTimeHist);
if(insert >0){
UpdateWrapper<ResourceScheduled> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("site", folderLocation.getSite());
@ -434,6 +441,7 @@ public class ModbusCollectServiceImpl
}
}else{
logger.info("开始插入前红灯寻找 sfdc_time_hist, seq_no:{},completedFlag:{}", resourceScheduled.getSeqNo(),timeHist.getCompletedFlag());
if( "Y".equals(timeHist.getCompletedFlag())){
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
if(soscheduled != null){
@ -525,6 +533,7 @@ public class ModbusCollectServiceImpl
if(!"X".equals(resourceScheduled.getIssend())){
SfdcTimeHist timeHist = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), resourceScheduled.getSeqNo(), "自动停机");
if(timeHist == null){
logger.info("开始插入空空前黄灯寻找 sfdc_time_hist, seq_no:{}", resourceScheduled.getSeqNo());
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
if(soscheduled != null){
int histSeqno = threeColorLampMapper.selectHistSeqno(folderLocation.getSite(), resourceScheduled.getSeqNo());
@ -562,7 +571,7 @@ public class ModbusCollectServiceImpl
sfdcTimeHist.setBatchNo(null);
sfdcTimeHist.setRemark(null);
int insert = sfdcTimeHistMapper.insert(sfdcTimeHist);
logger.info("停机红灯插入数据: {}", sfdcTimeHist);
logger.info("新停机红灯插入数据: {}", sfdcTimeHist);
if(insert >0){
UpdateWrapper<ResourceScheduled> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("site", folderLocation.getSite());
@ -581,6 +590,7 @@ public class ModbusCollectServiceImpl
}else{
if( "Y".equals(timeHist.getCompletedFlag())){
logger.info("开始插入前黄灯寻找 sfdc_time_hist, seq_no:{},completedFlag:{}", resourceScheduled.getSeqNo(),timeHist.getCompletedFlag());
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
if(soscheduled != null){
int histSeqno = threeColorLampMapper.selectHistSeqno(folderLocation.getSite(), resourceScheduled.getSeqNo());
@ -671,6 +681,7 @@ public class ModbusCollectServiceImpl
if(!"X".equals(resourceScheduled.getIssend())){
SfdcTimeHist timeHist = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), resourceScheduled.getSeqNo(), "自动停机");
if(timeHist == null){
logger.info("开始插入空空前白灯寻找 sfdc_time_hist, seq_no:{}", resourceScheduled.getSeqNo());
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
if(soscheduled != null){
int histSeqno = threeColorLampMapper.selectHistSeqno(folderLocation.getSite(), resourceScheduled.getSeqNo());
@ -708,7 +719,7 @@ public class ModbusCollectServiceImpl
sfdcTimeHist.setBatchNo(null);
sfdcTimeHist.setRemark(null);
int insert = sfdcTimeHistMapper.insert(sfdcTimeHist);
logger.info("停机红灯插入数据: {}", sfdcTimeHist);
logger.info("新停机红灯插入数据: {}", sfdcTimeHist);
if(insert >0){
UpdateWrapper<ResourceScheduled> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("site", folderLocation.getSite());
@ -728,6 +739,7 @@ public class ModbusCollectServiceImpl
}else{
if( "Y".equals(timeHist.getCompletedFlag())){
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
logger.info("开始插入前红灯寻找 sfdc_time_hist, seq_no:{},completedFlag:{}", resourceScheduled.getSeqNo(),timeHist.getCompletedFlag());
if(soscheduled != null){
int histSeqno = threeColorLampMapper.selectHistSeqno(folderLocation.getSite(), resourceScheduled.getSeqNo());
SfdcTimeHist sfdcTimeHist = new SfdcTimeHist();

4
threecolor-modbus-collector/src/main/resources/application-dev.yml
View File

@ -42,8 +42,8 @@ sys-file:
oss-url: 'http://192.168.1.160:9000/'
task:
data:
threecolortime: 0 */1 * * * ?
threecolortime1: 0 0 0 29 2 ?
threecolortime1: 0 */1 * * * ?
threecolortime: 0 0 0 29 2 ?
# MES 停机事件同步（POST）
mes:

Write Preview
Loading…
Cancel
Save