三色灯修改逻辑

threecolor-modbus-collector/src/main/java/com/xujie/modbus/entity/ResourceScheduled.java

@@ -20,4 +20,6 @@ public class ResourceScheduled {
     private String status;
 
     private String issend;
+
+    private Integer sfdcid;
 }

threecolor-modbus-collector/src/main/java/com/xujie/modbus/entity/SfdcTimeHist.java

@@ -3,7 +3,9 @@ package com.xujie.modbus.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -35,8 +37,12 @@ public class SfdcTimeHist {
 
     private Integer linkhistSeqno;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date tillTime;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date tillenteredTime;
 
     private String tillenteredBy;

threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/SfdcTimeHistMapper.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xujie.modbus.entity.SfdcTimeHist;
 import com.xujie.modbus.entity.ThreeColorLamp;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface SfdcTimeHistMapper extends BaseMapper<SfdcTimeHist> {
+    int updatesfdcTimeHistById(@Param("sfdcTimeHist") SfdcTimeHist sfdcTimeHist);
+
 }

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

@@ -290,9 +290,9 @@ public class ModbusCollectServiceImpl
                                 sfdcTimeHist.setTillenteredBy(null);
                                 sfdcTimeHist.setCompletedFlag("N");
                                 if("T".equals(resourceScheduled.getStatus())){
-                                    sfdcTimeHist.setDowntimePhasein("开始调机");
+                                    sfdcTimeHist.setDowntimePhasein("调机");
                                 }else{
-                                    sfdcTimeHist.setDowntimePhasein("开始生产");
+                                    sfdcTimeHist.setDowntimePhasein("生产");
                                 }
 
                                 sfdcTimeHist.setRollNo(soscheduled.getRollNo());
@@ -311,17 +311,20 @@ public class ModbusCollectServiceImpl
                                 updateWrapper.eq("resource_id", folderLocation.getResourceId());
                                 updateWrapper.eq("seq_no", resourceScheduled.getSeqNo());
                                 updateWrapper.set("issend", "X");
+                                updateWrapper.set("sfdcid",sfdcTimeHist.getId());
                                 resourceScheduledMapper.update(updateWrapper);
                             }
 
                         }
                     }else{
+                        //只在绿灯的时候改变状态
                         UpdateWrapper<ResourceScheduled> updateWrapper = new UpdateWrapper<>();
                         updateWrapper.eq("site", folderLocation.getSite());
                         updateWrapper.eq("resource_id", folderLocation.getResourceId());
                         updateWrapper.eq("seq_no", resourceScheduled.getSeqNo());
                         updateWrapper.set("issend", "Y");
                         resourceScheduledMapper.update(updateWrapper);
+
                     }
                 }
 
@@ -359,6 +362,25 @@ public class ModbusCollectServiceImpl
                         String nowlamp = registerData.get(0)+"" + registerData.get(1) + ""+registerData.get(2);
                         downlog.setLamp(nowlamp);
                         threeColorLampDownlogMapper.insert(downlog);
+                        if(1 == registerData.get(0) && 0 == registerData.get(1) && 0 == registerData.get(2)){
+                            if(StringUtils.isNotBlank(resourceScheduled.getIssend()) && resourceScheduled.getSfdcid() == null){
+                                SfdcTimeHist sfdcTimeHist = new SfdcTimeHist();
+                                sfdcTimeHist.setId(resourceScheduled.getSfdcid());
+                                sfdcTimeHist.setSite(folderLocation.getSite());
+                                sfdcTimeHist.setTillTime(new Date());
+                                sfdcTimeHist.setTillenteredTime(new Date());
+                                sfdcTimeHist.setCompletedFlag("Y");
+                                sfdcTimeHistMapper.updatesfdcTimeHistById(sfdcTimeHist);
+
+                                UpdateWrapper<ResourceScheduled> updateWrapper = new UpdateWrapper<>();
+                                updateWrapper.eq("site", folderLocation.getSite());
+                                updateWrapper.eq("resource_id", folderLocation.getResourceId());
+                                updateWrapper.eq("seq_no", resourceScheduled.getSeqNo());
+                                updateWrapper.set("issend", "");
+                                updateWrapper.set("sfdcid","");
+                                resourceScheduledMapper.update(updateWrapper);
+                            }
+                        }
                     }else{
                         if(downlogChangeLast == null){
                             SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());

threecolor-modbus-collector/src/main/resources/dao/SfdcTimeHistMapper.xml

@@ -0,0 +1,9 @@
+<?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="com.xujie.modbus.mapper.SfdcTimeHistMapper">
+
+    <update id="updatesfdcTimeHistById">
+        UPDATE sfdc_time_hist SET till_time = #{sfdcTimeHist.totalTime}, tillentered_time = #{sfdcTimeHist.tillenteredTime},
+                                  completed_flag = #{sfdcTimeHist.completedFlag},total_time = DATEDIFF(MINUTE, event_time, #{sfdcTimeHist.totalTime})  WHERE id = #{sfdcTimeHist.id};
+    </update>
+</mapper>