1.解决一个问题

王通
1 parent c92c7a0e
Showing 2 changed files with 19 additions and 3 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/application-prod.properties
@@ -13,6 +13,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
+import com.bsth.util.ConfigUtil;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
@@ -82,7 +83,7 @@ public class DayOfSchedule {
     private static ScheduleComparator.DFSJ schDFSJComparator;
-    private static Long sch_max_id=-1L;
+    private static Long sch_max_id=Long.parseLong(ConfigUtil.get("auto_increment_offset"));
     @Autowired
     LineConfigData lineConfigData;
@@ -407,14 +408,27 @@ public class DayOfSchedule {
     public synchronized long getId(){
-        if(sch_max_id==-1){
+    	long temp = sch_max_id;
+    	if (sch_max_id < 0) {
+    		sch_max_id = schRepository.getMaxId();
+            if(null == sch_max_id)
+                sch_max_id = 3000L;//留一点空间补数据用
+            if (temp == -1) {
+            	sch_max_id += sch_max_id % 2 == 0 ? 1 : 0;
+            } else if (temp == -2) {
+            	sch_max_id += sch_max_id % 2 == 0 ? 0 : 1;
+            }
+    	} else {
+    		sch_max_id += 2;
+    	}
+        /*if(sch_max_id==-1){
             sch_max_id = schRepository.getMaxId();
             if(null == sch_max_id)
                 sch_max_id = 3000L;//留一点空间补数据用
             sch_max_id += 5;
         }
         else
-            sch_max_id ++;
+            sch_max_id++;*/
         return sch_max_id;
     }
@@ -29,3 +29,5 @@ spring.datasource.validation-query=select 1
 http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
 http.send.directive = http://192.168.168.171:8080/transport_server/message/
+## increment offset
+auto_increment_offset= -1