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

三色灯修改

master
shenzhouyu 3 weeks ago
parent
b2503dcbc8
commit
e83708959e
3 changed files with 115 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/ThreeColorLampDownlogMapper.java
  2. 100
      threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java
  3. 9
      threecolor-modbus-collector/src/main/resources/dao/ThreeColorLampDownlogMapper.xml

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

@ -38,4 +38,12 @@ public interface ThreeColorLampDownlogMapper extends BaseMapper<ThreeColorLampDo
@Param("seqNo") String seqNo, @Param("seqNo") String seqNo,
@Param("lampEarliestCreateDate") Date lampEarliestCreateDate); @Param("lampEarliestCreateDate") Date lampEarliestCreateDate);
int updateDownLogEventDescByCreateDate(@Param("startTime") String startTime,
@Param("endTime") String endTime,
@Param("eventDesc") String eventDesc,
@Param("site") String site,
@Param("resourceId") String resourceId,
@Param("seqNo") String seqNo,
@Param("orderNo") String orderNo,
@Param("runTime") int runTime);
} }

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

@ -352,15 +352,16 @@ public class ModbusCollectServiceImpl
} }
if (!skipReopenHist) { if (!skipReopenHist) {
ResourceScheduled getone = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(),folderLocation.getResourceId(),sfdcTimeHistByGreen.getSeqNo()); ResourceScheduled getone = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(),folderLocation.getResourceId(),sfdcTimeHistByGreen.getSeqNo());
if(!"Y".equals(getone.getOriCloseFlag())){
logger.info("不等于Y时才回写",sfdcTimeHistByGreen.getId());
UpdateWrapper<ResourceScheduled> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<ResourceScheduled> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("site", folderLocation.getSite()); updateWrapper.eq("site", folderLocation.getSite());
updateWrapper.eq("resource_id", folderLocation.getResourceId()); updateWrapper.eq("resource_id", folderLocation.getResourceId());
updateWrapper.eq("seq_no", sfdcTimeHistByGreen.getSeqNo()); updateWrapper.eq("seq_no", sfdcTimeHistByGreen.getSeqNo());
updateWrapper.set("issend", "Y"); updateWrapper.set("issend", "Y");
updateWrapper.set("sfdcid",sfdcTimeHistByGreen.getId()); updateWrapper.set("sfdcid",sfdcTimeHistByGreen.getId());
updateWrapper.set("close_flag",getone.getOriCloseFlag());
resourceScheduledMapper.update(updateWrapper); resourceScheduledMapper.update(updateWrapper);
ResourceScheduled getoneTwo = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(),folderLocation.getResourceId(),sfdcTimeHistByGreen.getSeqNo());
/*ResourceScheduled getoneTwo = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(),folderLocation.getResourceId(),sfdcTimeHistByGreen.getSeqNo());
if(!"Y".equals(getoneTwo.getCloseFlag())){ if(!"Y".equals(getoneTwo.getCloseFlag())){
sfdcTimeHistByGreen.setTillTime(null); sfdcTimeHistByGreen.setTillTime(null);
sfdcTimeHistByGreen.setTillenteredTime(null); sfdcTimeHistByGreen.setTillenteredTime(null);
@ -372,6 +373,19 @@ public class ModbusCollectServiceImpl
syncMesFormStop(folderLocation.getSite(), sfdcTimeHistByGreen.getSeqNo(), syncMesFormStop(folderLocation.getSite(), sfdcTimeHistByGreen.getSeqNo(),
sfdcTimeHistByGreen.getId(), sfdcTimeHistByGreen.getEventTime())); sfdcTimeHistByGreen.getId(), sfdcTimeHistByGreen.getEventTime()));
} }
}*/
sfdcTimeHistByGreen.setTillTime(null);
sfdcTimeHistByGreen.setTillenteredTime(null);
sfdcTimeHistByGreen.setCompletedFlag("N");
int i = sfdcTimeHistMapper.updateById(sfdcTimeHistByGreen);
if(i>0){
logger.info("停机恢复后正常运行时间未到指定时间，sfdcid变为之前的，id:{}",sfdcTimeHistByGreen.getId());
fireAndForget("syncMesFormStop", () ->
syncMesFormStop(folderLocation.getSite(), sfdcTimeHistByGreen.getSeqNo(),
sfdcTimeHistByGreen.getId(), sfdcTimeHistByGreen.getEventTime()));
}
}else{
logger.info("等于Y时不回写",getone.getOriCloseFlag());
} }
} }
@ -844,6 +858,10 @@ public class ModbusCollectServiceImpl
if(!mapValueToString(registerData.get(0)).equals(colorLamp.getGreen()) || !mapValueToString(registerData.get(1)).equals(colorLamp.getOrange())|| !mapValueToString(registerData.get(2)).equals(colorLamp.getRed())){ if(!mapValueToString(registerData.get(0)).equals(colorLamp.getGreen()) || !mapValueToString(registerData.get(1)).equals(colorLamp.getOrange())|| !mapValueToString(registerData.get(2)).equals(colorLamp.getRed())){
Date LampDownlogEndTime = new Date(); Date LampDownlogEndTime = new Date();
if(downlogChangeLast != null){ if(downlogChangeLast != null){
SfdcTimeHist timeHist = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), resourceScheduled.getSeqNo(), "自动停机");
if("Y".equals(timeHist.getCompletedFlag())){
downlogChangeLast.setEventDesc(timeHist.getEventDesc());
}
downlogChangeLast.setEndDate(LampDownlogEndTime); downlogChangeLast.setEndDate(LampDownlogEndTime);
threeColorLampDownlogMapper.updateById(downlogChangeLast); threeColorLampDownlogMapper.updateById(downlogChangeLast);
} }
@ -868,11 +886,9 @@ public class ModbusCollectServiceImpl
} }
if(registerData.get(0) == 1){ if(registerData.get(0) == 1){
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlog.setEventDesc("正常运作(手动结束停机)");
}else {
downlog.setEventDesc("正常运作"); downlog.setEventDesc("正常运作");
}
} }
if(registerData.get(0) == 0 && registerData.get(1) == 0 && registerData.get(2) == 0){ if(registerData.get(0) == 0 && registerData.get(1) == 0 && registerData.get(2) == 0){
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){ if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
@ -938,7 +954,15 @@ public class ModbusCollectServiceImpl
if(StringUtils.isNotBlank(sfdcTimeHist1.getEventDesc())){ if(StringUtils.isNotBlank(sfdcTimeHist1.getEventDesc())){
String startTime = sdf.format(sfdcTimeHist1.getEventTime()); String startTime = sdf.format(sfdcTimeHist1.getEventTime());
String endTime = sdf.format(sfdcTimeHist1.getTillTime()); String endTime = sdf.format(sfdcTimeHist1.getTillTime());
threeColorLampDownlogMapper.updateDownLogEventDesc(
threeColorLampDownlogMapper.updateDownLogEventDescByCreateDate(startTime,
endTime,
sfdcTimeHist1.getEventDesc(),
folderLocation.getSite(),
folderLocation.getResourceId(),
sfdcTimeHist1.getSeqNo(),
sfdcTimeHist1.getOrderNo(),
runTime);
/*threeColorLampDownlogMapper.updateDownLogEventDesc(
startTime, startTime,
endTime, endTime,
sfdcTimeHist1.getEventDesc(), sfdcTimeHist1.getEventDesc(),
@ -947,7 +971,7 @@ public class ModbusCollectServiceImpl
sfdcTimeHist1.getSeqNo(), sfdcTimeHist1.getSeqNo(),
sfdcTimeHist1.getOrderNo(), sfdcTimeHist1.getOrderNo(),
runTime runTime
);
);*/
} }
} }
@ -984,12 +1008,8 @@ public class ModbusCollectServiceImpl
} }
} }
if(registerData.get(0) == 1){ if(registerData.get(0) == 1){
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlog.setEventDesc("正常运作(手动结束停机)");
}else {
downlog.setEventDesc("正常运作"); downlog.setEventDesc("正常运作");
} }
}
if(registerData.get(0) == 0 && registerData.get(1) == 0 && registerData.get(2) == 0){ if(registerData.get(0) == 0 && registerData.get(1) == 0 && registerData.get(2) == 0){
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){ if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlog.setEventDesc("设备离线(手动结束停机)"); downlog.setEventDesc("设备离线(手动结束停机)");
@ -1018,6 +1038,41 @@ public class ModbusCollectServiceImpl
downlogChangeLast.setEndDate(new Date()); downlogChangeLast.setEndDate(new Date());
threeColorLampDownlogMapper.updateById(downlogChangeLast); threeColorLampDownlogMapper.updateById(downlogChangeLast);
} }
if(!downlogChangeLast.getSeqNo().equals(resourceScheduled.getSeqNo())){
downlogChangeLast.setEndDate(new Date());
threeColorLampDownlogMapper.updateById(downlogChangeLast);
SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
ThreeColorLampDownlog downlog = new ThreeColorLampDownlog();
downlog.setSite(folderLocation.getSite());
downlog.setResourceId(soscheduled.getSResourceid() == null ? folderLocation.getResourceId() : soscheduled.getSResourceid());
downlog.setWorkShop(soscheduled.getSWorkcenterno() == null ? null : soscheduled.getSWorkcenterno());
downlog.setOrderNo(soscheduled.getOrderno()== null ? null : soscheduled.getOrderno());
downlog.setSeqNo(soscheduled.getSeqno()== null ? null : soscheduled.getSeqno());
downlog.setSShiftno(soscheduled.getSShiftno()== null ? null : soscheduled.getSShiftno());
ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), resourceScheduled.getSeqNo());
if(registerData.get(2) == 1){
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlog.setEventDesc("短暂停(手动结束停机)");
}else{
downlog.setEventDesc("短暂停");
}
}
if(registerData.get(0) == 1){
downlog.setEventDesc("正常运作");
}
if(registerData.get(0) == 0 && registerData.get(1) == 0 && registerData.get(2) == 0){
if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
downlog.setEventDesc("设备离线(手动结束停机)");
}else{
downlog.setEventDesc("设备离线");
}
}
downlog.setStartDate(new Date());
downlog.setCreateDate(new Date());
String nowlamp = registerData.get(0)+"" + registerData.get(1) + ""+registerData.get(2);
downlog.setLamp(nowlamp);
threeColorLampDownlogMapper.insert(downlog);
}
} }
} }
} }
@ -1063,10 +1118,29 @@ public class ModbusCollectServiceImpl
downlog.setLamp(nowlamp); downlog.setLamp(nowlamp);
threeColorLampDownlogMapper.insert(downlog); threeColorLampDownlogMapper.insert(downlog);
}else{ }else{
if("999".equals(downlogChangeLast.getLamp()) && folderLocation.getResourceId().equals(downlogChangeLast.getResourceId())){
downlogChangeLast.setEndDate(new Date()); downlogChangeLast.setEndDate(new Date());
threeColorLampDownlogMapper.updateById(downlogChangeLast); threeColorLampDownlogMapper.updateById(downlogChangeLast);
ThreeColorLampDownlog downlog = new ThreeColorLampDownlog();
downlog.setSite(folderLocation.getSite());
downlog.setResourceId(folderLocation.getResourceId());
if(registerData.get(0) == 1){
downlog.setEventDesc("做试验");
}else{
downlog.setEventDesc("计划停机");
} }
downlog.setStartDate(new Date());
downlog.setCreateDate(new Date());
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());
downlogChangeLast1.setEndDate(new Date());
threeColorLampDownlogMapper.updateById(downlogChangeLast1);
}
} }
} }
} }

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

@ -75,4 +75,13 @@
</otherwise> </otherwise>
</choose> </choose>
</select> </select>
<update id="updateDownLogEventDescByCreateDate">
update three_color_lamp_downlog
set event_desc = #{eventDesc}
where FORMAT(start_date, 'yyyy-MM-dd HH:mm') >= #{startTime}
and site = #{site}
and resource_id = #{resourceId}
and seq_no = #{seqNo}
and order_no = #{orderNo}
</update>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save