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

三色灯修改（原因维护）

master
shenzhouyu 6 days ago
parent
e83708959e
commit
18646bfbe1
3 changed files with 55 additions and 21 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. 2
      threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/ThreeColorLampDownlogMapper.java
  2. 45
      threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java
  3. 1
      threecolor-modbus-collector/src/main/resources/dao/ThreeColorLampDownlogMapper.xml

2
threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/ThreeColorLampDownlogMapper.java
View File

@ -46,4 +46,6 @@ public interface ThreeColorLampDownlogMapper extends BaseMapper<ThreeColorLampDo
@Param("seqNo") String seqNo,
@Param("orderNo") String orderNo,
@Param("runTime") int runTime);
ThreeColorLampDownlog selectDownlogLastBySeqNo(String site, String resourceId);
}

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

@ -859,9 +859,14 @@ public class ModbusCollectServiceImpl
Date LampDownlogEndTime = new Date();
if(downlogChangeLast != null){
SfdcTimeHist timeHist = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), resourceScheduled.getSeqNo(), "自动停机");
if("Y".equals(timeHist.getCompletedFlag())){
if(timeHist != null && "Y".equals(timeHist.getCompletedFlag()) && resourceScheduled.getSfdcid() != null){
ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), resourceScheduled.getSeqNo());
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlogChangeLast.setEventDesc(timeHist.getEventDesc()+"(手动结束停机)");
}else{
downlogChangeLast.setEventDesc(timeHist.getEventDesc());
}
}
downlogChangeLast.setEndDate(LampDownlogEndTime);
threeColorLampDownlogMapper.updateById(downlogChangeLast);
}
@ -954,7 +959,7 @@ public class ModbusCollectServiceImpl
if(StringUtils.isNotBlank(sfdcTimeHist1.getEventDesc())){
String startTime = sdf.format(sfdcTimeHist1.getEventTime());
String endTime = sdf.format(sfdcTimeHist1.getTillTime());
threeColorLampDownlogMapper.updateDownLogEventDescByCreateDate(startTime,
int sa = threeColorLampDownlogMapper.updateDownLogEventDescByCreateDate(startTime,
endTime,
sfdcTimeHist1.getEventDesc(),
folderLocation.getSite(),
@ -962,6 +967,7 @@ public class ModbusCollectServiceImpl
sfdcTimeHist1.getSeqNo(),
sfdcTimeHist1.getOrderNo(),
runTime);
logger.info("更新了downlog表，几条sa:{}",sa);
/*threeColorLampDownlogMapper.updateDownLogEventDesc(
startTime,
endTime,
@ -1024,7 +1030,7 @@ public class ModbusCollectServiceImpl
threeColorLampDownlogMapper.insert(downlog);
}else{
//如果有最后一条，并且灯是100并是无工单运作做试验,就去更新那最后一条数据
if(1 == registerData.get(0) && 0 == registerData.get(1) && 0 == registerData.get(2) && "做试验".equals(downlogChangeLast.getEventDesc())){
/*if(1 == registerData.get(0) && 0 == registerData.get(1) && 0 == registerData.get(2) && "做试验".equals(downlogChangeLast.getEventDesc())){
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
downlogChangeLast.setWorkShop(soscheduled.getSWorkcenterno() == null ? null : soscheduled.getSWorkcenterno());
downlogChangeLast.setOrderNo(soscheduled.getOrderno()== null ? null : soscheduled.getOrderno());
@ -1032,13 +1038,24 @@ public class ModbusCollectServiceImpl
downlogChangeLast.setSShiftno(soscheduled.getSShiftno()== null ? null : soscheduled.getSShiftno());
downlogChangeLast.setEventDesc("正常运作");
threeColorLampDownlogMapper.updateById(downlogChangeLast);
}
}*/
//如果是999，并且工单是同一个，则结束
if("999".equals(downlogChangeLast.getLamp()) && folderLocation.getResourceId().equals(downlogChangeLast.getResourceId())){
downlogChangeLast.setEndDate(new Date());
threeColorLampDownlogMapper.updateById(downlogChangeLast);
}
if(!downlogChangeLast.getSeqNo().equals(resourceScheduled.getSeqNo())){
SfdcTimeHist sfdcTimeHistNew = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), downlogChangeLast.getSeqNo(), "自动停机");
if(sfdcTimeHistNew != null && "Y".equals(sfdcTimeHistNew.getCompletedFlag())){
ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), resourceScheduled.getSeqNo());
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc()+"(手动结束停机)");
}else{
downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc());
}
}else{
downlogChangeLast.setEventDesc("换规格");
}
downlogChangeLast.setEndDate(new Date());
threeColorLampDownlogMapper.updateById(downlogChangeLast);
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
@ -1093,7 +1110,7 @@ public class ModbusCollectServiceImpl
downlog.setSite(folderLocation.getSite());
downlog.setResourceId(folderLocation.getResourceId());
if(registerData.get(0) == 1){
downlog.setEventDesc("做试验");
downlog.setEventDesc("正常运作");
}else{
downlog.setEventDesc("计划停机");
}
@ -1108,7 +1125,7 @@ public class ModbusCollectServiceImpl
downlog.setSite(folderLocation.getSite());
downlog.setResourceId(folderLocation.getResourceId());
if(registerData.get(0) == 1){
downlog.setEventDesc("做试验");
downlog.setEventDesc("正常运作");
}else{
downlog.setEventDesc("计划停机");
}
@ -1118,13 +1135,26 @@ public class ModbusCollectServiceImpl
downlog.setLamp(nowlamp);
threeColorLampDownlogMapper.insert(downlog);
}else{
if(StringUtils.isNotBlank(downlogChangeLast.getSeqNo())){
SfdcTimeHist sfdcTimeHistNew = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), downlogChangeLast.getSeqNo(), "自动停机");
if(sfdcTimeHistNew != null && "Y".equals(sfdcTimeHistNew.getCompletedFlag())){
ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), downlogChangeLast.getSeqNo());
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc()+"(手动结束停机)");
}else{
downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc());
}
}else{
downlogChangeLast.setEventDesc("换规格");
}
downlogChangeLast.setEndDate(new Date());
threeColorLampDownlogMapper.updateById(downlogChangeLast);
ThreeColorLampDownlog downlog = new ThreeColorLampDownlog();
downlog.setSite(folderLocation.getSite());
downlog.setResourceId(folderLocation.getResourceId());
if(registerData.get(0) == 1){
downlog.setEventDesc("做试验");
downlog.setEventDesc("正常运作");
}else{
downlog.setEventDesc("计划停机");
}
@ -1133,6 +1163,7 @@ public class ModbusCollectServiceImpl
String nowlamp = registerData.get(0)+"" + registerData.get(1) + ""+registerData.get(2);
downlog.setLamp(nowlamp);
threeColorLampDownlogMapper.insert(downlog);
}
if("999".equals(downlogChangeLast.getLamp()) && folderLocation.getResourceId().equals(downlogChangeLast.getResourceId())){
ThreeColorLampDownlog downlogChangeLast1 = threeColorLampDownlogMapper.selectDownlogLast(folderLocation.getSite(),folderLocation.getResourceId());

1
threecolor-modbus-collector/src/main/resources/dao/ThreeColorLampDownlogMapper.xml
View File

@ -79,6 +79,7 @@
update three_color_lamp_downlog
set event_desc = #{eventDesc}
where FORMAT(start_date, 'yyyy-MM-dd HH:mm') >= #{startTime}
and FORMAT(start_date, 'yyyy-MM-dd HH:mm') &lt;= #{endTime}
and site = #{site}
and resource_id = #{resourceId}
and seq_no = #{seqNo}

Write Preview
Loading…
Cancel
Save