update...

潘钊
1 parent 33f20edb
Showing 7 changed files with 75 additions and 16 deletions
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/data/schedule/thread/SubmitToTrafficManage.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -44,4 +44,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public LineConfig getByLineCode(@RequestParam String lineCode){
 		return lineConfigService.getByLineCode(lineCode);
 	}
+
+	@RequestMapping(value = "/bufferTimeDiff", method = RequestMethod.POST)
+	public Map<String, Object> bufferTimeDiff(@RequestParam String lineCode, @RequestParam String field,@RequestParam String value){
+		return lineConfigService.bufferTimeDiff(lineCode, field, value);
+	}
 }
@@ -8,10 +8,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
-import com.bsth.data.schedule.thread.ScheduleLateThread;
-import com.bsth.data.schedule.thread.SchedulePstThread;
-import com.bsth.data.schedule.thread.ScheduleRefreshThread;
-import com.bsth.data.schedule.thread.SubmitToTrafficManage;
+import com.bsth.data.schedule.thread.*;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -129,6 +126,9 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     DirectivesPstThread directivesPstThread;
+    @Autowired
+    CalcOilThread calcOilThread;
+
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     @Override
@@ -140,7 +140,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //翻班线程
         Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
-//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
 //        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
@@ -152,6 +152,9 @@ public class DayOfSchedule implements CommandLineRunner {
         logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
         //Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //计算油、公里加注
+        Application.mainServices.scheduleWithFixedDelay(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
         //指令持久化线程
         Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
     }
+package com.bsth.data.schedule.thread;
+
+import com.bsth.service.oil.YlbService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 计算油、公里加注量 线程
+ * Created by panzhao on 2017/3/7.
+ */
+@Component
+public class CalcOilThread extends Thread{
+
+    @Autowired
+    YlbService ylbService;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            logger.info("开始计算路单里程加注量....");
+            ylbService.obtainDsq();
+            logger.info("计算路单里程加注量结束！");
+        } catch(Exception e){
+            logger.error("计算路单里程加注量失败",e);
+        }
+    }
+}
 package com.bsth.data.schedule.thread;
 import com.bsth.service.TrafficManageService;
-import com.bsth.service.oil.YlbService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,18 +17,10 @@ public class SubmitToTrafficManage extends Thread{
     @Autowired
     TrafficManageService trafficManageService;
-    
-    @Autowired
-    YlbService YlbService;
     @Override
     public void run() {
         logger.info("开始提交数据到运管处...");
-        try{
-        	YlbService.obtainDsq();
-        } catch(Exception e){
-        	logger.error("计算路单里程加注量失败",e);
-        }
         try {
             //路单
@@ -18,4 +18,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     LineConfig getByLineCode(String lineCode);
     Map<String,Object> enableInParkForSource(String lineCode, int enable);
+
+    Map<String,Object> bufferTimeDiff(String lineCode, String field, String value);
 }
@@ -116,4 +116,25 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> bufferTimeDiff(String lineCode, String field, String value) {
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+
+            conf.getClass().getField(field).set(conf, value);
+            lineConfigData.set(conf);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("field", field);
+            rs.put("value", value);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }
@@ -2339,6 +2339,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
             }
+            dayOfSchedule.save(sch);
+
         }
         rs.put("ts", set);
         rs.put("status", ResponseCode.SUCCESS);
@@ -2354,7 +2356,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             return;
         String jName = BasicData.allPerson.get(jGh);
         if (StringUtils.isNotEmpty(jName)) {
-            sch.setjGh(jGh);
+
+            if(jGh.indexOf("-") != -1)
+                sch.setjGh(jGh.substring(jGh.indexOf("-") + 1));
+            else
+                sch.setjGh(jGh);
+
             sch.setjName(jName);
         }
     }