Merge branch 'lggj' of http://192.168.168.245:8888/panzhaov5/bsth_control into lggj

徐烜
2 parents 8611b6e0 2daaa599
Showing 50 changed files with 2709 additions and 1159 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/lg_travel/RegionConterller.java
src/main/java/com/bsth/controller/lg_travel/RegionLineCarConterller.java
src/main/java/com/bsth/controller/oil/JdlController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/zndd/LoggerZnddController.java
src/main/java/com/bsth/controller/zndd/ZnddStatusController.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/kl/KlData.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/data/zndd/ZnddThread.java
src/main/java/com/bsth/data/zndd/ZnddTwoThread.java
src/main/java/com/bsth/data/zndd/carMonitor.java
src/main/java/com/bsth/data/zndd/voice/GJC.java
src/main/java/com/bsth/data/zndd/voice/UploadVideoServlet.java
src/main/java/com/bsth/data/zndd/voice/VoiceUtil.java
src/main/java/com/bsth/entity/Cars.java
 package com.bsth;
 import com.bsth.data.SystemParamCache;
-import com.bsth.service.SystemParamService;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -23,7 +22,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(21);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(30);
 	@Autowired
 	private SystemParamCache systemParamCache;
@@ -23,6 +23,7 @@ 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.zndd.ZnddThread;
+import com.bsth.data.zndd.ZnddTwoThread;
 import com.bsth.util.DateUtils;
 import com.bsth.util.Tools;
 import org.slf4j.Logger;
@@ -85,6 +86,9 @@ public class XDApplication implements CommandLineRunner {
     FixedEnableVerionsThread fixedEnableVerionsThread;*/
     @Autowired
     ZnddThread znddThread;
+
+    @Autowired
+    ZnddTwoThread ZnddtwoThread;
     @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
@@ -145,8 +149,9 @@ public class XDApplication implements CommandLineRunner {
         //dayOfSchedule.dataRecovery();
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
-
+        sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
+        //智能调度
+        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
@@ -190,10 +195,14 @@ public class XDApplication implements CommandLineRunner {
     public void prodInit(){
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
+
+
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
+        //智能调度
+        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
@@ -237,8 +246,11 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 25, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
+        //智能调度
+        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
         /** 线调业务 */
@@ -260,7 +272,7 @@ public class XDApplication implements CommandLineRunner {
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         /** 线调为其他程序提供的数据 --写入数据库 */
-        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
         sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
@@ -284,7 +296,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 60, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
+package com.bsth.controller.lg_travel;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.lg_travel.Region;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 区域
+ */
+
+@RestController
+@RequestMapping("region")
+public class RegionConterller extends BaseController<Region, Long> {
+    
+ 
+}
+package com.bsth.controller.lg_travel;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.lg_travel.RegionLineCar;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 区域
+ */
+
+@RestController
+@RequestMapping("regionLineCar")
+public class RegionLineCarConterller extends BaseController<RegionLineCar, Long> {
+    
+ 
+}
@@ -2,21 +2,22 @@ package com.bsth.controller.oil;
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.JdlConnector;
+import com.bsth.entity.oil.JdlReception;
 import com.bsth.service.oil.JdlService;
 import com.google.common.io.Files;
@@ -46,9 +47,87 @@ public class JdlController extends BaseController&lt;Jdl, Integer&gt; {
 		return "{\"result\":" + "\""+result+"\"}";
 	}
+	/** 24年12月工单更新电量导入  */
+	@RequestMapping(value = "/uploadFile_2412",method = RequestMethod.POST)
+	public String uploadFile_2412(MultipartFile file, String gsbm_, String gsName,
+											String fgsbm_, String fgsName, String stationName) throws Exception{
+        File newFile = new File(
+        		getDataImportClasspath() + File.separator +
+                        file.getOriginalFilename());
+        Files.write(file.getBytes(), newFile);
+        
+		String result = jdlService.importExcel_2412(newFile, gsbm_, gsName, fgsbm_, fgsName, stationName);
+		return "{\"result\":" + "\""+result+"\"}";
+	}
+	
 	@RequestMapping(value = "/query",method = RequestMethod.GET)
 	public Map<String, Object> query(@RequestParam Map<String, Object> map) throws Exception{
 		return jdlService.query(map);
 	}
+	@RequestMapping(value = "/query_2412",method = RequestMethod.GET)
+	public Map<String, Object> query_2412(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.query_2412(map);
+	}
+	
+	@RequestMapping(value = "/queryJdlReception",method = RequestMethod.GET)
+	public List<JdlReception> queryJdlReception(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.queryJdlReception(map);
+	}
+	
+	@RequestMapping(value = "/queryJdlReceptionBatch",method = RequestMethod.GET)
+	public Map<String, Object> queryJdlReceptionBatch(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.queryJdlReceptionBatch(map);
+	}
+	
+	@RequestMapping(value = "/queryJdlReceptionBatchData",method = RequestMethod.GET)
+	public List<JdlReception> queryJdlReceptionBatchData(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.queryJdlReceptionBatchData(map);
+	}
+	
+	@RequestMapping(value = "/deleteJdlReceptionBatch",method = RequestMethod.POST)
+	public Map<String, Object> deleteJdlReceptionBatch(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.deleteJdlReceptionBatch(map);
+	}
+	
+	@RequestMapping(value = "/updateJdlReceptionBatch",method = RequestMethod.POST)
+	public Map<String, Object> updateJdlReceptionBatch(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.updateJdlReceptionBatch(map);
+	}
+	
+	@RequestMapping(value = "/downloadJdlReceptionImportFile",method = RequestMethod.GET)
+	public void downloadJdlReceptionImportFile(@RequestParam Map<String, Object> map, HttpServletResponse response) throws Exception{
+		jdlService.downloadJdlReceptionImportFile(map, response);
+	}
+	
+	@RequestMapping(value = "/queryJdlConnector",method = RequestMethod.GET)
+	public List<JdlConnector> queryJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.queryJdlConnector(map);
+	}
+	
+	@RequestMapping(value = "/queryJdlConnectorById",method = RequestMethod.GET)
+	public JdlConnector queryJdlConnectorById(@RequestParam int id) throws Exception{
+		return jdlService.queryJdlConnectorById(id);
+	}
+	
+	@RequestMapping(value = "/queryJdlStationName",method = RequestMethod.GET)
+	public List<String> queryJdlStationName() throws Exception{
+		return jdlService.queryJdlStationName();
+	}
+	
+	@RequestMapping(value = "/addJdlConnector",method = RequestMethod.POST)
+	public Map<String, Object> addJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.addJdlConnector(map);
+	}
+	
+	@RequestMapping(value = "/deleteJdlConnector",method = RequestMethod.POST)
+	public Map<String, Object> deleteJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.deleteJdlConnector(map);
+	}
+	
+	@RequestMapping(value = "/updateJdlConnector",method = RequestMethod.POST)
+	public Map<String, Object> updateJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.updateJdlConnector(map);
+	}
+	
 }
@@ -87,6 +87,7 @@ public class ServiceDataInterface {
             if (null == sch)
                 continue;
             map = new HashMap<>();
+            map.put("id", sch.getId());
             map.put("clZbh", sch.getClZbh());
             map.put("jGh", sch.getjGh());
             map.put("jName", sch.getjName());
@@ -54,4 +54,15 @@ public class LoggerZnddController  extends BaseController&lt;LoggerZndd, Integer&gt; {
     public  Map<String, Object>  schTZSF(String line,String date,String endDate,String changType,String type){
         return loggerZnddService.schTZSF(line,date,endDate,changType,type);
     }
+
+    /**
+     * 获取当前方向下的下一个班次
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "nextSch/{id}", method = RequestMethod.GET)
+    public ScheduleRealInfo  nextSch(@PathVariable("id") Long id){
+        return loggerZnddService.nextSch(id);
+
+    }
 }
@@ -7,6 +7,7 @@ import com.bsth.service.zndd.ZnddStatusService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
@@ -34,4 +35,21 @@ public class ZnddStatusController extends BaseController&lt;znddStatus, Integer&gt; {
         return result;
     }
+
+    /**
+     *新增类型
+     * */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public Map<String, Object> update(@RequestParam Integer id, @RequestParam Integer openStatus) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            znddStatusService.update(id,openStatus);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+        }
+        return result;
+    }
+
 }
@@ -117,8 +117,8 @@ public class CarOutInfoHandler {
                     //删除
                     jdbcTemplate.update("delete from bsth_t_clfcxxb");
                     //重新写入
-                    jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn)" +
-                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                    jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn, sch)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
                         @Override
                         public void setValues(PreparedStatement ps, int i) throws SQLException {
                             ScheduleRealInfo sch = pstList.get(i);
@@ -137,6 +137,7 @@ public class CarOutInfoHandler {
                             ps.setString(13, sch.getjName());
                             ps.setString(14, sch.getRemarks());
                             ps.setInt(15, sch.getFcpSn());
+                            ps.setLong(16, sch.getId());
                         }
                         @Override
@@ -6,9 +6,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import java.util.*;
+
+import java.util.HashMap;
+import java.util.Map;
 /**
  * @author ym
@@ -30,7 +31,7 @@ public class KlData {
     @Value("${passengerFlow.url}")
     private String url;
-    @Scheduled(cron = "0/10 * * * * ?")
+   /* @Scheduled(cron = "0/10 * * * * ?")
     public void loadKl() {
         Map<String,Kl> map= new HashMap<>();
         List<Kl> list = klService.loadKl();
@@ -40,7 +41,7 @@ public class KlData {
             map.put(kl.getDeviceId(),kl);
         }
         KlData =map;
-    }
+    }*/
     public static Kl getKl(String deviceId){
         //return KlData.get( KlData.keySet().toArray()[0]);
 package com.bsth.data.pilot80;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
@@ -23,7 +24,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 /**
@@ -102,21 +106,11 @@ public class PilotReport {
                     }
                     break;
                 //报警请求
-                case 0x10:
-                    try {
-                        String url = systemParamService.getValue("url.yjbj")+"dataDockingApi/accident/saveAccident?";
-                        url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm;
-                        logger.info("url===="+url);
-                        String res = HttpClientUtils.get(url).toString();
-                        JSONObject jsonObject = JSONObject.parseObject(res);
-                        if ((int) jsonObject.get("code") == 200) {
-                            logger.info("报警请求成功");
-                        }else {
-                            logger.info("报警请求失败");
-                        }
-                    }catch (Exception e){
-                        logger.info("报警请求异常");
-                    }
+                case 0x21:
+                case 0x22:
+                case 0x23:
+                case 0x24:
+                    yjbj(nbbm,d80);
                     break;
             }
@@ -132,6 +126,39 @@ public class PilotReport {
         }
     }
+    public void yjbj(String nbbm,D80 d80){
+        try {
+            ScheduleRealInfo sch = null;
+
+            if (d80.getData().getStopNo() != null && !d80.getData().getStopNo().equals("")){
+                d80.setStationName(BasicData.stationCode2NameMap.get(d80.getData().getStopNo()));
+            }
+            if (d80.getSchId() != null){
+                sch = dayOfSchedule.get(d80.getSchId());
+                Long nextschid = dayOfSchedule.nextByLp(sch).getId();
+                d80.setNextschId(nextschid);
+            }
+            String url = systemParamService.getValue("url.yjbj")+"dataDockingApi/accident/saveAccident?";
+            url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm +"&requestCode=" +d80.getData().getRequestCode()
+                    +"&lon=" +d80.getData().getLon()+"&lat="+d80.getData().getLat();
+            if (sch != null){
+                url = url + "&lineName=" +sch.getXlName()+"&jsy=" +sch.getjGh()+"&jsName=" +sch.getjName();
+            }
+            logger.info("url===="+url);
+            StringBuilder sb = HttpClientUtils.get(url);
+
+
+            JSONObject jsonObject = JSON.parseObject(sb.toString());
+            if ((int) jsonObject.get("code") == 200) {
+                logger.info("报警请求成功=" + jsonObject.get("msg"));
+            }else {
+                logger.info("报警请求失败="+ jsonObject.get("msg"));
+            }
+        }catch (Exception e){
+            logger.info("报警请求异常",e);
+        }
+    }
+
     public void report(DC0_A4 c0a4) {
         String deviceId = c0a4.getData().getDeviceId();
         if (StringUtils.isNotEmpty(deviceId))
 package com.bsth.data.zndd;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.bsth.data.BasicData;
@@ -8,18 +9,24 @@ import com.bsth.data.adjg.domain.LargeGap;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.rfid.RfidHttpLoader;
+import com.bsth.data.gpsdata_v2.rfid.entity.RfidInfo;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.data.schedule.edit_logs.service.SchEditInfoService;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.zndd.StationPeopleLogger;
 import com.bsth.entity.zndd.ZnddYuAn;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.zndd.ZnddLoggerService;
 import com.bsth.service.zndd.ZnddYuAnService;
+import com.bsth.util.DateUtils;
 import com.bsth.util.HttpClientUtils;
-import com.google.gson.Gson;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,8 +36,6 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -62,38 +67,77 @@ public class AutomaticSch {
     @Autowired
     ZnddYuAnService znddYuAnService;
-    Queue<Map>  queue = new LinkedList<>();
+    @Autowired
+    ZnddLoggerService znddLoggerService;
+    @Autowired
+    SchEditInfoService schEditInfoService;
+
     private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+    private static SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd");
     SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
     private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ2();
     private Map<String,Long> drivreMap =new HashMap<>(); //自动重发map
-    // 当日60指令缓存
-    private   ConcurrentMap<Integer, D60> d60Map = new ConcurrentHashMap<>();//d60map
-    String urldkl = "http://10.10.200.202:5580/monitor/api/getMonitorInfoByDay?key=1&solt=1111&t=1&dayStr=2024-10-23"; //大间隔接口
+    String urldkl = "http://10.10.200.202:5580/monitor/api/getMonitorInfoByDay?key=1&solt=1111&t=1&dayStr="; //大间隔接口
     //http://10.10.200.201:8083/wxk-prod-api/service-api/lggj/schedule/drByInfo  维修接口
-
-    private Map<String,Long> SFMAP = new HashMap<>();
+    String urldkls = "http://10.10.200.140:13089/bsth_passengerflow/klbus/currentInsideNum.do"; //满载接口
+    private Map<Long,Long> SFMAP = new HashMap<>();
     //满载
     public  void mz(){
         try {
+            StringBuilder sb = HttpClientUtils.get(urldkls);
+            List<Object> list = JSONArray.parseArray(String.valueOf(sb));
+            for (Object b :list){
+                Map m = (Map) b;
+                Integer num = Integer.parseInt(m.get("inside_num").toString());
+
+                int count= getPenum("MZ","0");
+                if(num < count){//大间隔阈值  检测到超过15个人的时候推送
+                    return;
+                }
+                ScheduleRealInfo sr = dayOfSchedule.executeCurr(m.get("nbbm").toString()); //查询当前车辆执行班次
+                GpsEntity gps = gpsRealData.get(m.get("sbbh").toString());
+                Map msp = new HashMap();
+                msp.put("lineCode",m.get("xlbm"));
+                msp.put("lineName",m.get("XLMC"));
+                msp.put("stationName",gps.getStationName());
+                msp.put("rqStr",sdfMonth.format(new Date()));
+                msp.put("rq",sdfHHmm.format(new Date()));
+                msp.put("type","MZ");
+                msp.put("xlDir",gps.getUpDown());
+                msp.put("fcsj","");
+                msp.put("clzbh",gps.getNbbm());
+                msp.put("numType",num);
+                if (sr != null )
+                    msp.put("xlDir",sr.getXlDir());
+
+                if (gps != null )
+                    msp.put("station",gps.getStation().getCode());
+
+                ts(msp);
+                LogerWait("满载",sr);
+            }
-            List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType("W9G-041","normal");
+            //测试使用
+           /* List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType("W9G-041","normal");
             ts(addStationPeople(sr.get(5), "MZ", 0L));//第二种 设备未离线 出站时间内未出站
+
+            String chartStr = JSON.toJSONString(sr.get(5));
+            logger.info("满载--"+chartStr);*/
         }
         catch (Exception e){
-            logger.error("满载------------------",e);
+            logger.error("满载检测接口出错------------------",e);
         }
     }
     //大间隔的情况
     public void dfTz(int k ){
         try{
-            StringBuilder sb = HttpClientUtils.get(urldkl /*+ sdfMonth.format(new Date())*/);
+            StringBuilder sb = HttpClientUtils.get(urldkl + sdfMonth.format(new Date()));
             if (sb == null)
                 return;
             JSONObject obj = JSON.parseObject(sb.toString());
@@ -106,44 +150,39 @@ public class AutomaticSch {
                  }else {
                      continue;
                  }
-                 if (k == 0 ){
-                     if(lg.getlGType() == 0){
-                         ts(ConvertDJK(lg,sch,"FCJG"));
+                 Long t0 = new Date().getTime()  - (1000 * 60 * 2);
+                 Long t1 = t0 - (1000 * 60 * 2);
+                 Long t2 = t0 + (1000 * 60 * 2);
+                 //判断当前间隔是否出现过并且在当前时间段内   大于2分钟  小于1分钟的时间之内
+                 if (SFMAP.get(lg.getId()) == null) {
+                     if (k == 0) {
+                         if (lg.getlGType() == 0) {
+                             ts(ConvertDJK(lg, sch, "FCJG"));
+                             SFMAP.put(lg.getId(), lg.getTsTime());
+                             LogerWait("发车大间隔",sch);
+                         }
+                     } else {
+                         if (lg.getlGType() != 0) {
+                             ts(ConvertDJK(lg, sch, "DJG"));
+                             SFMAP.put(lg.getId(), lg.getTsTime());
+                             LogerWait("行车大间隔",sch);
+                         }
                      }
-                 }else {
-                     if(lg.getlGType() != 0){
-                         ts(ConvertDJK(lg,sch,"DJG"));
+                 }
+                 //大于10000条的时候开始清理map
+                 if (SFMAP.size() > 10000){
+                     for (Map.Entry<Long, Long> m : SFMAP.entrySet()){
+                         if(m.getValue() < DateUtils.getTimestamp()){
+                             SFMAP.remove(m.getKey());
+                         }
                      }
                  }
-
             }
         }catch (Exception e){
             logger.error("大间隔推送失败------------------",e);
         }
     }
-    //发现大客流  -> 大客流情况 ->处置大客流
-    public void Dkl(){
-        //推送
-
-        try{
-            Map m = queue.poll();
-            if (m != null) {
-                if (Integer.valueOf(m.get("num").toString()) > 15) {
-                    //超过10的时候 判断为大客流
-                    ts(ConvertDKL(m));
-                }
-            }
-
-            ScheduleRealInfo sr = dayOfSchedule.findByNbbm("W8A-027").get(0);
-            ts(addStationPeople(sr, "DKL", 0L));//大客流
-
-
-        }catch (Exception e){
-            logger.error("大客流推送失败------------------",e);
-        }
-
-    }
     //实发未发检测 -- 车辆GPS掉线的情况下，车辆该出站了
     /**
@@ -175,18 +214,33 @@ public class AutomaticSch {
                             //1。一直没收到gps
                             //2.gps长时间离线的情况下
                             //3.人为调整过的都跳过
-                            if (gps == null || gps.getTimestamp() + (1000 * 60 * 3) < time || (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))) {
-                                ts(addStationPeople(sr, "SFTZ_1", 0L));
-                                Gson gson = new Gson();
-                                String chartStr = gson.toJsonTree(sr).toString();
-                                logger.info("实发调整--" + chartStr);
+                            if (gps == null || gps.getTimestamp() + (1000 * 60 * 5) < time || (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))) {
+                                String sfsj = null;
+                                //rfid 判断
+                                List<RfidInfo> list = RfidHttpLoader.load();
+                                for (RfidInfo ri : list) {
+                                    if (ri.getRecogTime() != null && ri.getRecogTime().getTime() > System.currentTimeMillis() - 300000) {
+                                        //最新的rfid是出站状态
+                                        if (ri.getNbbm().equals(sr.getClZbh())){
+                                            sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp());
+                                        }
+                                        if (ri.getNbbm().equals(sr.getClZbh()) && ri.getInoutStation().getInout() == 0) {
+                                            sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp());
+                                        }
+                                    }
+                                }
+                                if (sfsj != null){
+                                    sr.setFcsjActual(sfsj);
+                                    ts(addStationPeople(sr, "SFTZ_1", 0L));
+                                    LogerWait("实发调整",sr);
+                                }
                             }
                         }
                     }
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.error("自动调度，实发未发推送失败---",e);
         }
         logger.warn("实发未发扫描结束");
@@ -196,6 +250,7 @@ public class AutomaticSch {
     public void sfCX(){
         //查询所有班次
         //remark 人工干预过的的不检测
+        logger.warn("实发撤销检测扫描开始");
         try {
             Map<String, String> lineMap =  BasicData.lineCode2NameMap;
@@ -211,8 +266,7 @@ public class AutomaticSch {
                 for (ScheduleRealInfo t : oldSchDateList){
                     // 发车误点
                     if (t.getDfsj() != null && t.getFcsjActual() != null
-                            && (t.getBcType().equals("normal") || t.getBcType().equals("region"))
-                            && (StringUtils.isEmpty(t.getRemarks()) || t.getRemarks().equals("_智能调度-异常实发"))) {
+                            && (t.getBcType().equals("normal") || t.getBcType().equals("region"))) {
                         long sjc = t.getFcsjActualTime() - t.getDfsjT();
                         long time = System.currentTimeMillis();//当前时间
@@ -222,20 +276,35 @@ public class AutomaticSch {
                             if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
                                 continue;
                             } else {
+                                //备注不为null时，查询是否有调度操作记录
+                                List<SchEditInfo>  seiList = new ArrayList<>();
+                                if (!StringUtils.isEmpty(t.getRemarks())){
+                                    Map msp = new HashMap();
+                                    msp.put("schId_eq",t.getId());
+                                    seiList = (List<SchEditInfo>) schEditInfoService.list(msp);
+                                    //有操作记录的跳过
+                                    Boolean isCZ = false;
+                                    for(SchEditInfo e : seiList){
+                                        if (e.getType().equals("FCXXWT") || e.getType().equals("DFTZ") || e.getType().equals("SFTZ")){
+                                            isCZ = true;
+                                        }
+                                    }
+                                    if (isCZ)
+                                        continue;
+                                }
                                 //异常实发
                                 ts(addStationPeople(t, "YCSF", 0l));
-                                Gson gson = new Gson();
-                                String chartStr = gson.toJsonTree(t).toString();
-                                logger.info("实发撤销--" + chartStr);
+                                LogerWait("实发撤销",t);
                             }
                         }
                     }
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.error("实发撤销推送接口出错-----------",e);
         }
+        logger.warn("实发撤销检测扫描结束");
     }
     public Boolean isLines(String line) {
@@ -273,8 +342,7 @@ public class AutomaticSch {
             String lineCode;
             for (Map.Entry<String, String> ts : lineMap.entrySet()) {
                 lineCode = ts.getKey();
-                if(isLines(lineCode)) {
-
+               /* if(isLines(lineCode)) {*/
                     oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
                     for (ScheduleRealInfo t : oldSchDateList) {
                         //指令重发
@@ -297,10 +365,10 @@ public class AutomaticSch {
                                 //下发时间未超过5分钟返回
                             }
                         }
-                    }
+                    /*}*/
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.error("自动调度，指令重发---",e);
         }
         logger.warn("指令重发扫描结束");
@@ -319,8 +387,8 @@ public class AutomaticSch {
                 if(sch.getDfsjT() > t)
                     break;
-                /*if(sch.isLate()) //演示使用 不跳过
-                    continue;*/
+                if(sch.isLate()) //演示使用 不跳过
+                    continue;
                 if(sch.getStatus() == 0
                         && StringUtils.isEmpty(sch.getFcsjActual())){
@@ -336,10 +404,8 @@ public class AutomaticSch {
                             for (Map m : dzList){
                                 if (basicData.nbbmCompanyPlateMap.get(prev.getClZbh()) != null && m.get("terminal").equals(basicData.nbbmCompanyPlateMap.get(prev.getClZbh()).replaceAll("-",""))){
                                     sch.setRemark(m.get("sj").toString());
-                                    Gson gson = new Gson();
-                                    String chartStr = gson.toJsonTree(sch).toString();
-                                    logger.info("误点--"+chartStr);
                                     ts(addStationPeople(sch, "WD", 0L));
+                                    LogerWait("误点",sch);
                                 }
                             }
                         }
@@ -353,31 +419,85 @@ public class AutomaticSch {
     }
+    public void LogerWait(String type,ScheduleRealInfo sch){
+        String chartStr = "id-"+sch.getId() +",xlName-"+sch.getXlName() + ",fcsj-"+sch.getFcsj() + ",FcsjActual-"+ sch.getFcsjActual()+",clzbh-" + sch.getClZbh();
+        logger.info(type+"--" + chartStr);
+    }
-    public void ts(Map m) throws ParseException {
-        //记录存一下  --超过当前时间的是否推送？
-        String st = m.get("lineCode")+"_"+m.get("type")+"_"+m.get("rqStr");
-        Long sj = sdf.parse(m.get("rqStr").toString() +" "+ m.get("rq")).getTime();
-        Long dsj = new Date().getTime();
-        List<Long> list = new ArrayList();
-        //111_DJG_2024-06-24
-        if (ZnddThread.ZNDDTYPEMAP.get(st) != null ) {
-            list = ZnddThread.ZNDDTYPEMAP.get(st);
-            int i = 0;
-
-            for (Long s : list){ //推送过的同样情况1小时内  &&//超过当前时间的不推送&& sj < dsj
-                if (Math.abs(s - sj) > (60 * 60 * 1000)){
-                    i ++ ;
+    /**
+     *每辆车倒数第二个班次执行之前3分钟提示
+     */
+    public void TowdescSch(){
+        logger.warn("末二班车执行方法开始");
+        try {
+            //获取所有线路
+            Map<String, String> lineMap = BasicData.lineCode2NameMap;
+            //findByNbbm车辆索引获取的班次
+            Map<String, List<ScheduleRealInfo>> groupedByCity = new HashMap<>();
+            if(System.currentTimeMillis() < DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)){
+                logger.info("未到晚上8点----"+(DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)));
+                return;
+            }
+
+            for (Map.Entry<String, String> t : lineMap.entrySet()) {
+                List<ScheduleRealInfo> srList = dayOfSchedule.findByLineCode(t.getKey());
+                Map<String, List<ScheduleRealInfo>> mapType = new HashMap();
+                //所有车辆
+                for (ScheduleRealInfo s : srList) {
+                    if (mapType.get(s.getClZbh()) != null)
+                        continue;
+
+                    List<ScheduleRealInfo> schadd = new ArrayList<>();
+                    //每辆车下的班次
+                    for (ScheduleRealInfo sch : srList) {
+                        if (s.getClZbh().equals(sch.getClZbh())) {
+                            schadd.add(sch);
+                        }
+                    }
+                    mapType.put(s.getClZbh(), schadd);
+                }
+                //判断倒数第二个班次是否快要发车
+                for (String key : mapType.keySet()) {
+                    List<ScheduleRealInfo> carList = mapType.get(key);
+                    Collections.sort(carList, new ScheduleComparator.FCSJ());
+                    //倒数第二个班次保证数量超过两条
+                    ScheduleRealInfo scht = carList.size() >= 2 ? carList.get(carList.size() - 2) : null;
+                    if (scht == null)
+                        continue;
+
+                    if (scht.getDfsjT() > DateUtils.getTimestamp() + (1000 * 60 * 60 * 20) &&
+                            scht.getDfsjT() - System.currentTimeMillis() < (1000* 60 * 4) &&
+                            scht.getDfsjT() - System.currentTimeMillis() >= (1000* 60 *3)) {
+                        //推送一下
+                        ts(addStationPeople(scht,"DESCTWO",0l));
+
+                        LogerWait("末二班车推送",scht);
+                    }
                 }
             }
-            outEntrance.Znddjk(m);//测试推送
-        }else {
-            list.add(sj);
-            ZnddThread.ZNDDTYPEMAP.put(st,list);//存记录
-            outEntrance.Znddjk(m);//推送
+
+        }catch (Exception e){
+            logger.error("（倒数第二班车）末二班车执行方法出错"+ e);
         }
+    }
+
+
+    public void ts(Map m) throws ParseException {
+        //储存日志
+        StationPeopleLogger splogger = new StationPeopleLogger();
+        splogger.setType(m.get("type").toString());
+        splogger.setLineName(m.get("lineName").toString());
+        splogger.setLineCode(m.get("lineCode").toString());
+        splogger.setRq(sdf.format(new Date()));
+        splogger.setRqStr(m.get("rqStr").toString());
+        splogger.setXlDir(m.get("xlDir").toString());
+        splogger.setFcsj(m.get("fcsj").toString());
+        splogger.setClZbh(m.get("clzbh").toString());
+        znddLoggerService.save(splogger);
+
+        outEntrance.Znddjk(m);//推送
     }
@@ -404,16 +524,6 @@ public class AutomaticSch {
         return sp;
     }
-    //大间隔数据转换
-    public Map ConvertDKL(Map m){
-        Map sp = new HashMap();
-        sp.put("uuid",UUID());
-        sp.put("lineCode",m.get("lineCode"));
-        sp.put("lineName",m.get("lineName"));
-        sp.put("rqStr",sdf.format(new Date()));
-        sp.put("rq",sdfHHmm.format(new Date())); //检测到时间
-        return sp;
-    }
     //转换
@@ -6,9 +6,13 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
+import com.bsth.entity.DKLInfo;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.zndd.StationPeopleLogger;
 import com.bsth.entity.zndd.StationSignsLogger;
+import com.bsth.entity.zndd.znddStatus;
+import com.bsth.repository.zndd.ZnddStatusRepository;
+import com.bsth.service.DKLInfoService;
 import com.bsth.util.HttpClientUtils;
 import com.bsth.util.SignUtils;
 import com.bsth.websocket.handler.SendUtils;
@@ -17,20 +21,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
+
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -54,9 +57,8 @@ public class OutEntrance {
     @Value("${dc.imgurl}")
     private  String imgurl; //存储图片地址
-    
-    @Value("${dc.profile}")
-    private  String profile; //存储图片地址*/
+
+    private  String profile = "profile"; //存储图片地址*/
     @Value("${baidu.ak}")
     private  String ak; //百度api秘钥*/
@@ -69,6 +71,18 @@ public class OutEntrance {
     @Autowired
     AutomaticSch automaticSch;
+    @Autowired
+    private DKLInfoService dklInfoService;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    ZnddStatusRepository znddStatusRepository;
+
+    @Autowired
+    BasicData basicData;
+
      //调度屏小程序接口。
      @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
      public Map OutCarOutCar(@RequestParam Map m,@RequestBody StationSignsLogger ssLogger) {
@@ -93,7 +107,7 @@ public class OutEntrance {
              }
-             //查询班次情况自动回复
+             //查询班次情况自动回复 --拥堵
              //当前日期
              List<Map> dzList = carMonitor.carMonitor(ssLogger.getLineCode(), ssLogger.getDir(), ssLogger.getStation());  //信息发布接口
              if (dzList.size() > 0){
@@ -106,9 +120,36 @@ public class OutEntrance {
                  if(!"畅通".equals(trafficStatus)){
                      s=road+trafficStatus+",";
                  }
-                 rtn.put("message",s+"车辆预计还有"+dzList.get(0).get("sj")+"抵达，请耐心等待");
+                 rtn.put("message",s+"亲爱的乘客，我们的调度员已接收到通知，车辆预计还有"+dzList.get(0).get("sj")+"抵达，请稍等片刻");
              }else {
-                 //筛选方向
+                 //第一个班次
+                 //所有应发未到的班次--晚点的情况
+                 Collection<ScheduleRealInfo> all = LateAdjustHandle.allLateSch();
+                 for (ScheduleRealInfo schc : all) {
+                     if(schc.getXlBm().equals(m.get("lineCode"))) {
+                         Long schId = schc.getId();
+                         ScheduleRealInfo sch = null;
+                         if (schId != null)
+                             sch = dayOfSchedule.get(schId);
+
+                         ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+                         List<Map> dzLists = carMonitor.carMonitor(prev.getXlBm(), prev.getXlDir(), prev.getZdzCode());  //信息发布接口
+                         for (Map mst : dzLists) {
+                             //匹配到当前车辆
+                             if (basicData.nbbmCompanyPlateMap.get(prev.getClZbh()) != null && mst.get("terminal").equals(basicData.nbbmCompanyPlateMap.get(prev.getClZbh()).replaceAll("-", ""))) {
+                                 if (sch.getXlBm().equals(schc.getXlBm())) {
+                                     rtn.put("message", "非常抱歉，车辆因路上交通拥堵，预计还需要" + mst.get("sj").toString() + "抵达，请稍等片刻");
+                                     rtn.put("status", ResponseCode.SUCCESS);
+                                     return rtn;
+                                 }
+                             }
+                         }
+                     }
+                 }
+
+
+
+                 //筛选方向 -- 正常班次未到发车时间
                  List<ScheduleRealInfo> rs = dayOfSchedule.findByLineAndUpDown(ssLogger.getLineCode(),Integer.parseInt(ssLogger.getDir()));
                  if(rs.size()>0){
                      //排序
@@ -125,7 +166,7 @@ public class OutEntrance {
                          }
                      }
                      if(sjtext!=null){
-                         rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
+                         rtn.put("message","亲爱的乘客，我们的调度员已接收到通知，车辆将按照计划，在"+sjtext+"准时发车，请稍等片刻");
                      }else {
                          rtn.put("message","当日运营已结束");
                      }
@@ -153,6 +194,23 @@ public class OutEntrance {
                 rtn.put("status", "验证失败");
                 return rtn;
             }
+            //大客流开关
+            List<znddStatus> znddStatusList = (List<znddStatus>) znddStatusRepository.findAll();
+            Boolean isType = false;
+            String excuteStatus = null;
+            for (znddStatus zs : znddStatusList) {
+                if (zs.getType().equals("dkl")) {
+                    isType = true;
+                    excuteStatus = zs.getExcuteStatus();
+                }
+            }
+
+            if (!isType){
+                logger.info("大客流接口未开启--------------");
+                rtn.put("status",ResponseCode.SUCCESS);
+                return rtn;
+            }
+
             String num=jsonObject.getString("num");
             int count=automaticSch.getPenum("DKL","0");
             if(Integer.parseInt(num)<count){
@@ -169,15 +227,30 @@ public class OutEntrance {
                 String lineCode = line.get("lineCode").toString();
                 String stationCode = line.get("stationCode").toString();
                 String dir = line.get("dir").toString();
-                /*StationRoute stationRoute=BasicData.stationCode2StationMap.get(lineCode+"_"+stationCode);*/
+                imgMap.put(lineCode+"_"+dir,img);
+                DKLInfo dklInfo =new DKLInfo();
+                dklInfo.setLineCode(stationCode);
+                String lineName=BasicData.lineCode2NameMap.get(lineCode);
+                String stationName=BasicData.stationCode2NameMap.get(lineCode+"_"+dir+"_"+stationCode);
+                dklInfo.setLineName(lineName);
+                dklInfo.setStationCode(stationCode);
+                dklInfo.setStationName(stationName);
+                dklInfo.setNum(Integer.parseInt(num));
+                dklInfo.setUpDown(dir);
+                dklInfo.setImage(img);
+                dklInfoService.save(dklInfo);
+                if(Integer.parseInt(num)<count){
+                    continue;
+                }
                 Map m = new HashMap();
                 m.put("image", img);
                 m.put("stationCode", stationCode);
                 m.put("lineCode", lineCode);
-                m.put("stationName",BasicData.stationCode2NameMap.get(lineCode+"_"+dir+"_"+stationCode));
-                m.put("lineName",BasicData.lineCode2NameMap.get(lineCode));
+                m.put("stationName",stationName);
+                m.put("lineName",lineName);
                 m.put("num",num);
                 m.put("xlDir",dir);
+                m.put("excuteStatus",excuteStatus);
                 List<ScheduleRealInfo> srList=dayOfSchedule.findByLineAndUpDown(lineCode,Integer.parseInt(dir));
                 List<ScheduleRealInfo> sl=new ArrayList<>();
                 for (ScheduleRealInfo scheduleRealInfo : srList) {//筛选出运营班次
@@ -253,33 +326,6 @@ public class OutEntrance {
     }
-  //智能调度接口-大客流
-    @RequestMapping(value="/dkl",method = RequestMethod.POST)
-    public Map ddkl(@RequestParam Map m) {
-        Map rtn = new HashMap<>();
-
-        try {
-            ObjectMapper mapper = new ObjectMapper();
-            //map转换实体类
-            StationPeopleLogger ssLogger = mapper.convertValue(m, StationPeopleLogger.class);
-            
-            ssLogger.setType("大客流");
-       
-            //保存记录
-            //znddLoggerService.save(ssLogger);
-            //线调页面推送
-            //sendUtils.sendzndd(ssLogger);
-
-            rtn.put("status",ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            rtn.put("status", ResponseCode.ERROR);
-            logger.error("大客流推送异常----",e);
-        }
-        return rtn;
-    }
-
-
-
     /**
      * 保存base64图片
@@ -319,7 +365,7 @@ public class OutEntrance {
                     destfile.mkdirs();
                 }
                 //文件新名称
-                String fileNameNew = AutomaticSch.UUID()+ ".png";
+                String fileNameNew = System.currentTimeMillis()+"_"+AutomaticSch.UUID()+ ".png";
                 File f = new File(destfile.getAbsoluteFile() + File.separator + fileNameNew);
                 // 将字符串转换成二进制，用于显示图片
                 // 将上面生成的图片格式字符串 imgStr，还原成图片显示
@@ -397,7 +443,9 @@ public class OutEntrance {
     @Scheduled(cron = "0 0 0 * * ?")
     public void clearImg(){
         try {
-            File folder=new File(imgurl+"/avat");
+            LocalDateTime date =LocalDateTime.now().minusDays(7);
+            String[] d=date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).split("-");
+            File folder=new File(imgurl+"/avat/"+d[0]+"/"+d[1]+"/"+d[2]);
             delete(folder);
         } catch (Exception e) {
             e.printStackTrace();
@@ -416,4 +464,28 @@ public class OutEntrance {
         folder.delete(); // 删除空文件夹或者文件
     }
+    private static Map<String,String> imgMap =new HashMap<>();
+    //调度获取站台视频
+    @RequestMapping(value = "/getStationVideo", method = RequestMethod.GET)
+    public String getStationVideo(@RequestParam Map m) {
+        if (m.get("lineCode")==null || m.get("upDown")==null){
+            return null;
+        }
+        String sql="select url from station_video where line_code ='"+m.get("lineCode")+"' and up_down ='"+m.get("upDown")+"'";
+        String url= null;
+        try {
+            url = jdbcTemplate.queryForObject(sql,String.class);
+        } catch (DataAccessException e) {
+            return null;
+        }
+        return url;
+    }
+
+    //调度获取站台图片
+    @RequestMapping(value = "/getStationImg", method = RequestMethod.GET)
+    public String getStationImg(@RequestParam Map m) {
+        String url=imgMap.get(m.get("lineCode")+"_"+m.get("upDown"));
+        return url;
+    }
+
 }
@@ -45,11 +45,8 @@ public class ZnddThread extends Thread{
     static Map<String,List> ZNDDTYPEMAP = new HashMap<>(); //已经推送过的检测
-    String url = "https://lgapp.bsth.tech:13089/bsth_passengerflow/klbus/currentInsideNum.do"; //车内客流接口
-    String urldkl = "http://10.10.200.140:13089/bsth_passengerflow/klbus/currentInsideNum.do"; //大客流接口
-
     private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
     private static SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd");
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -64,13 +61,7 @@ public class ZnddThread extends Thread{
             //automaticSch.mz();
             //automaticSch.dfTz();//大间隔
             for (znddStatus zs : znddStatusList) {
-                if (zs.getOpenStatus().equals("0")) {
-                    //预案5个
-                    if (zs.getType().equals("fcjg")) {
-                        automaticSch.dfTz(0);
-                        logger.info("发车间隔执行完毕");
-                    }
-
+                 if (zs.getOpenStatus() != null && zs.getOpenStatus().equals("0")) {
                     if (zs.getType().equals("sftz")) {
                         automaticSch.sftz();//实发未发
                         logger.info("实发执行完毕");
@@ -79,31 +70,13 @@ public class ZnddThread extends Thread{
                         automaticSch.sfCX();// 异常实发 - 实发撤销
                         logger.info("异常实发执行完毕");
                     }
-                    if (zs.getType().equals("zlcf")){
-                        automaticSch.drivresponse();
-                        logger.info("设备重发执行完毕");
-                    }
-                    if (zs.getType().equals("wd")){
-                        automaticSch.wd();
-                        logger.info("误点执行完毕");
-                    }
-                    if (zs.getType().equals("djg")){
-                        automaticSch.dfTz(1);
-                        logger.info("行车大间隔执行完毕");
-                    }
-
-                    if (zs.getType().equals("dkl")){
-                        automaticSch.Dkl();
-                        logger.info("大客流执行完毕");
-                    }
-                    if (zs.getType().equals("mz")){
-                        automaticSch.mz();
-                        logger.info("满载执行完毕");
-                    }
-
+                     if (zs.getType().equals("zlcf")){
+                         automaticSch.drivresponse();
+                         logger.info("设备重发执行完毕");
+                     }
                 }
             }
-        }catch (Exception e){
+        }catch (Throwable e){
             logger.info("智能调度线程——————",e);
         }
+package com.bsth.data.zndd;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.zndd.znddStatus;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.repository.zndd.ZnddStatusRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 调度预案 发车间隔、误点、大间隔、满载、大客流
+ */
+@Component
+public class ZnddTwoThread extends Thread{
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    /*@Autowired
+    StationPeopleLoggerRepository stationPeopleLoggerRepository;*/
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    @Autowired
+    LineConfigData lineConfs;
+    @Autowired
+    GpsRealData gpsRealData;
+    @Autowired
+    StationRouteRepository stationRouteRepository;
+    @Autowired
+    OutEntrance outEntrance;
+    @Autowired
+    AutomaticSch automaticSch;
+
+    @Autowired
+    ZnddStatusRepository znddStatusRepository;
+
+    static Map<String,List> ZNDDTYPEMAP = new HashMap<>(); //已经推送过的检测
+
+
+
+
+    private static SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+    private static SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd");
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    @Override
+    public void run() {
+        try {
+            List<znddStatus> znddStatusList = (List<znddStatus>) znddStatusRepository.findAll();
+
+           for (znddStatus zs : znddStatusList) {
+                if (zs.getOpenStatus() != null && zs.getOpenStatus().equals("0")) {
+                    //预案5个
+                    if (zs.getType().equals("fcjg")) {
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                automaticSch.dfTz(0);
+                                logger.info("发车间隔执行完毕");
+                            }
+                        }.start();//启动线程
+                    }
+                    if (zs.getType().equals("wd")) {
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                automaticSch.wd();
+                                logger.info("误点执行完毕");
+                            }
+                        }.start();//启动线程
+                    }
+                    if (zs.getType().equals("djg")) {
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                automaticSch.dfTz(1);
+                                logger.info("行车大间隔执行完毕");
+                            }
+                        }.start();//启动线程
+
+                    }
+                    if (zs.getType().equals("mz")) {
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                automaticSch.mz();
+                                logger.info("满载执行完毕");
+                            }
+                        }.start();//启动线程
+
+                    }
+                    if (zs.getType().equals("desctwo")) {
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                automaticSch.TowdescSch();
+                                logger.info("末二班车");
+                            }
+                        }.start();//启动线程
+
+
+                    }
+                }
+            }
+
+
+        } catch (Exception e) {
+            logger.info("智能调度线程——————", e);
+        }
+    }
+
+
+    //满载
+   /* public void MZ(){
+        try {
+            StringBuilder sb = HttpClientUtils.get(url);
+            List<Object> list = JSONArray.parseArray(String.valueOf(sb));
+            for (Object b :list){
+                Map m = (Map) b;
+               Integer num = Integer.parseInt(m.get("inside_num").toString());
+               if (num >= 15){ //大间隔阈值  检测到超过15个人的时候推送
+                   ScheduleRealInfo sr = dayOfSchedule.executeCurr(m.get("nbbm").toString()); //查询当前车辆执行班次
+                   GpsEntity gps = gpsRealData.get(m.get("sbbh").toString());
+                   Map msp = new HashMap();
+                   msp.put("lineCode",m.get("xlbm"));
+                   msp.put("lineName",m.get("xlmc"));
+                   msp.put("stationName",gps.getStationName());
+                   msp.put("rqStr",sdfMonth.format(new Date()));
+                   msp.put("rq",sdfHHmm.format(new Date()));
+                   msp.put("type","MZ");
+                   msp.put("numType",num);
+                   if (sr != null )
+                       msp.put("xlDir",sr.getXlDir());
+                   
+                   if (gps != null )
+                       msp.put("station",gps.getStation().getCode());
+                   
+                   ts(msp);
+               }
+            }
+            
+        }catch (Exception e){
+            logger.error("满载检测接口出错-----------",e);
+        }
+    }*/
+    public void ts(Map m) throws ParseException {
+        outEntrance.Znddjk(m);//测试推送
+    }
+ /*   public void ts(Map m) throws ParseException {
+        //记录存一下  --超过当前时间的是否推送？
+        String st = m.get("lineCode")+"_"+m.get("type")+"_"+m.get("rqStr");
+        Long sj = sdf.parse(m.get("rqStr").toString() +" "+ m.get("rq")).getTime();
+        List<Long> list = new ArrayList();
+        //111_DJG_2024-06-24
+        if (ZNDDTYPEMAP.get(st) != null ) {
+            list = ZNDDTYPEMAP.get(st);
+            int i = 0;
+            for (Long s : list){
+                if (Math.abs(s - sj) > (60 * 60 * 1000)){
+                    i ++ ;
+                }
+            }
+            if (i == list.size()){
+                list.add(sj);
+                ZNDDTYPEMAP.put(st,list);//存记录
+                outEntrance.Znddjk(m);//推送
+            }
+            return;
+        }else {
+            list.add(sj);
+            ZNDDTYPEMAP.put(st,list);//存记录
+            outEntrance.Znddjk(m);//推送
+        }
+       
+    }
+
+*/
+
+   /* //发车间隔
+    public void FCJG(){
+        try {
+            //无数据情况下 查看发车间隔配置数据是否正常bsth_c_calc_interval
+            List<CalcIntervalDetail> fcjgList = userCarCountHandler.calcLast();
+            if (fcjgList!= null && !fcjgList.isEmpty()){
+                for (CalcIntervalDetail cd : fcjgList){
+                    Map sp = new HashMap();
+                    sp.put("lineCode",cd.getLineCode());
+                    sp.put("lineName",cd.getLineName());
+                    sp.put("rqStr",cd.getDate());
+                    sp.put("rq",cd.getSjfc2());
+                    sp.put("type","FCJG");
+                    sp.put("xlDir",cd.getXlDir());
+                    sp.put("numType",cd.getSubTime());
+                    sp.put("fcsj",cd.getSjfc2());
+                    sp.put("stationName",cd.getStation());
+                    ts(sp);
+                }
+            }
+        }catch (Exception e){
+            logger.error("发车间隔检测出现出错-----------",e);
+        }
+    }
+*/
+
+    //转换
+    public Map addStationPeople(ScheduleRealInfo info,String type,Long sst,String sj) throws ParseException{
+        Map sp = new HashMap();
+        sp.put("lineCode",info.getXlBm());
+        sp.put("lineName",info.getXlName() );
+        sp.put("rqStr",info.getScheduleDateStr());
+        sp.put("rq",new java.sql.Date(sdf.parse((info.getScheduleDateStr()+" " + sj)).getTime())); //检测到时间
+        sp.put("type",type);
+        sp.put("xlDir",info.getXlDir());
+        sp.put("numType",sst);
+        return sp;
+    }
+
+
+
+    //排序
+    public static class GpsComp implements Comparator<GpsEntity> {
+        @Override
+        public int compare(GpsEntity o1, GpsEntity o2) {
+            return Integer.parseInt(o1.getRemark()) - Integer.parseInt(o2.getRemark());
+        }
+    }
+
+}
+
@@ -81,6 +81,7 @@ public class carMonitor {
                     map.put("lat",responseEle.elementTextTrim("lat"));
                     map.put("nbbm",responseEle.elementTextTrim("insidecode"));
                     map.put("road",responseEle.elementTextTrim("road"));
+                    map.put("schId",responseEle.elementTextTrim("schId"));
                     list.add(map);
                 }
             }
@@ -16,9 +16,9 @@ public enum GJC {
     CC(7, "出场"),
     KQ(8, "开启"),
     GB(9, "关闭"),
-    ge(10, "个"),
+    ge(10, "一个"),
     dao(11, "到"),
-    de(12, "的");
+    de(12, "的班次");
     private  int code;
     private  String description;
 package com.bsth.data.zndd.voice;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.BasicData;
 import com.bsth.data.zndd.baidu.speech.restapi.asrdemo.AsrMain;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.sys.SysUser;
@@ -124,7 +123,7 @@ public class UploadVideoServlet extends HttpServlet {
                 String text = textList.get(0).toString();
                 //text="新增出厂班次";
                 //text="帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次";
-                if(isSimilarity(ZL.zdzdbc,text,null)){//帮我添加一个xx到xx站的班次(帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次)
+                /*if(isSimilarity(ZL.zdzdbc,text,null)){//帮我添加一个xx到xx站的班次(帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次)
                     String[]  ks = text.replace("，","").split("到");
                     if(ks[0].split("个").length==1){
                         writer.write(text+"_识别失败"+",999");
@@ -137,9 +136,9 @@ public class UploadVideoServlet extends HttpServlet {
                     String Station1= ks[0].split("个")[1];
                     String Station2= ks[1].split("的")[0];
-                   /* String fcsj = null;//线路名，上下行，发车时间
+                   *//* String fcsj = null;//线路名，上下行，发车时间
                     //发车时间
-                    fcsj = extractTimes(text);*/
+                    fcsj = extractTimes(text);*//*
                     //线路名称 - 线路编码和名称对照
                     Map<String, Object> param = new HashMap<>();
@@ -163,7 +162,7 @@ public class UploadVideoServlet extends HttpServlet {
                     }
                     writer.write(text +",1,"+m.get("stationcode1")+","+m.get("stationcode2")+","+0);
                     return;
-                }
+                }*/
                 if(isSimilarity(ZL.LJCCBC,text,null)){//添加出厂班次
                     writer.write(text+"_"+ZL.LJCCBC.getDescription()+",2");
                     return;
-package com.bsth.data.zndd.voice;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.sun.media.sound.WaveFileReader;
-import com.sun.media.sound.WaveFileWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.vosk.LibVosk;
-import org.vosk.LogLevel;
-import org.vosk.Model;
-import org.vosk.Recognizer;
-
-import javax.sound.sampled.*;
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-public class VoiceUtil {
-   /* @Value("${leenleda.vosk.model}")
-    private String VOSKMODELPATH;*/
-
-    Logger log = LoggerFactory.getLogger(this.getClass());
-    public String getWord(String filePath) throws IOException, UnsupportedAudioFileException {
-        Assert.isTrue(StringUtils.hasLength("D:\\pcm\\vosk-model-small-cn-0.22"), "无效的VOS模块！");
-        byte[] bytes = Files.readAllBytes(Paths.get(filePath));
-        // 转换为16KHZ
-        reSamplingAndSave(bytes, filePath);
-        File f = new File(filePath);
-        RandomAccessFile rdf = null;
-        rdf = new RandomAccessFile(f, "r");
-        log.info("声音尺寸:{}", toInt(read(rdf, 4, 4)));
-        log.info("音频格式:{}", toShort(read(rdf, 20, 2)));
-        short track = toShort(read(rdf, 22, 2));
-        log.info("1 单声道 2 双声道: {}", track);
-        log.info("采样率、音频采样级别 16000 = 16KHz: {}", toInt(read(rdf, 24, 4)));
-        log.info("每秒波形的数据量：{}", toShort(read(rdf, 22, 2)));
-        log.info("采样帧的大小：{}", toShort(read(rdf, 32, 2)));
-        log.info("采样位数：{}", toShort(read(rdf, 34, 2)));
-        rdf.close();
-        LibVosk.setLogLevel(LogLevel.WARNINGS);
-        try (
-             Model model = new Model("D:\\pcm\\vosk-model-small-cn-0.22");
-             InputStream ais = AudioSystem.getAudioInputStream(new BufferedInputStream(new FileInputStream(filePath)));
-             // 采样率为音频采样率的声道倍数
-             Recognizer recognizer = new Recognizer(model, 16000 * track)) {
-            
-            recognizer.setWords(true);
-            
-            String result = recognizer.getFinalResult();
-            log.info("识别结果：{}", result);
-            if (StringUtils.hasLength(result)) {
-                JSONObject jsonObject = JSON.parseObject(result);
-                return jsonObject.getString("text").replace(" ", "");
-            }
-            return "";
-        }
-        
-        
-        
-    }
-
-    public static int toInt(byte[] b) {
-        return (((b[3] & 0xff) << 24) + ((b[2] & 0xff) << 16) + ((b[1] & 0xff) << 8) + ((b[0] & 0xff) << 0));
-    }
-
-    public static short toShort(byte[] b) {
-        return (short) ((b[1] << 8) + (b[0] << 0));
-    }
-
-    public static byte[] read(RandomAccessFile rdf, int pos, int length) throws IOException {
-        rdf.seek(pos);
-        byte result[] = new byte[length];
-        for (int i = 0; i < length; i++) {
-            result[i] = rdf.readByte();
-        }
-        return result;
-    }
-
-    public static void reSamplingAndSave(byte[] data, String path) throws IOException, UnsupportedAudioFileException {
-        WaveFileReader reader = new WaveFileReader();
-        AudioInputStream audioIn = reader.getAudioInputStream(new ByteArrayInputStream(data));
-        AudioFormat srcFormat = audioIn.getFormat();
-        int targetSampleRate = 16000;
-        AudioFormat dstFormat = new AudioFormat(srcFormat.getEncoding(),
-                targetSampleRate,
-                srcFormat.getSampleSizeInBits(),
-                srcFormat.getChannels(),
-                srcFormat.getFrameSize(),
-                srcFormat.getFrameRate(),
-                srcFormat.isBigEndian());
-        AudioInputStream convertedIn = AudioSystem.getAudioInputStream(dstFormat, audioIn);
-        File file = new File(path);
-        WaveFileWriter writer = new WaveFileWriter();
-        writer.write(convertedIn, AudioFileFormat.Type.WAVE, file);
-    }
-}
 \ No newline at end of file
+//package com.bsth.data.zndd.voice;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.sun.media.sound.WaveFileReader;
+//import com.sun.media.sound.WaveFileWriter;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.util.Assert;
+//import org.springframework.util.StringUtils;
+//import org.vosk.LibVosk;
+//import org.vosk.LogLevel;
+//import org.vosk.Model;
+//import org.vosk.Recognizer;
+//
+//import javax.sound.sampled.*;
+//import java.io.*;
+//import java.nio.file.Files;
+//import java.nio.file.Paths;
+//
+//public class VoiceUtil {
+//   /* @Value("${leenleda.vosk.model}")
+//    private String VOSKMODELPATH;*/
+//
+//    Logger log = LoggerFactory.getLogger(this.getClass());
+//    public String getWord(String filePath) throws IOException, UnsupportedAudioFileException {
+//        Assert.isTrue(StringUtils.hasLength("D:\\pcm\\vosk-model-small-cn-0.22"), "无效的VOS模块！");
+//        byte[] bytes = Files.readAllBytes(Paths.get(filePath));
+//        // 转换为16KHZ
+//        reSamplingAndSave(bytes, filePath);
+//        File f = new File(filePath);
+//        RandomAccessFile rdf = null;
+//        rdf = new RandomAccessFile(f, "r");
+//        log.info("声音尺寸:{}", toInt(read(rdf, 4, 4)));
+//        log.info("音频格式:{}", toShort(read(rdf, 20, 2)));
+//        short track = toShort(read(rdf, 22, 2));
+//        log.info("1 单声道 2 双声道: {}", track);
+//        log.info("采样率、音频采样级别 16000 = 16KHz: {}", toInt(read(rdf, 24, 4)));
+//        log.info("每秒波形的数据量：{}", toShort(read(rdf, 22, 2)));
+//        log.info("采样帧的大小：{}", toShort(read(rdf, 32, 2)));
+//        log.info("采样位数：{}", toShort(read(rdf, 34, 2)));
+//        rdf.close();
+//        LibVosk.setLogLevel(LogLevel.WARNINGS);
+//        try (
+//             Model model = new Model("D:\\pcm\\vosk-model-small-cn-0.22");
+//             InputStream ais = AudioSystem.getAudioInputStream(new BufferedInputStream(new FileInputStream(filePath)));
+//             // 采样率为音频采样率的声道倍数
+//             Recognizer recognizer = new Recognizer(model, 16000 * track)) {
+//
+//            recognizer.setWords(true);
+//
+//            String result = recognizer.getFinalResult();
+//            log.info("识别结果：{}", result);
+//            if (StringUtils.hasLength(result)) {
+//                JSONObject jsonObject = JSON.parseObject(result);
+//                return jsonObject.getString("text").replace(" ", "");
+//            }
+//            return "";
+//        }
+//
+//
+//
+//    }
+//
+//    public static int toInt(byte[] b) {
+//        return (((b[3] & 0xff) << 24) + ((b[2] & 0xff) << 16) + ((b[1] & 0xff) << 8) + ((b[0] & 0xff) << 0));
+//    }
+//
+//    public static short toShort(byte[] b) {
+//        return (short) ((b[1] << 8) + (b[0] << 0));
+//    }
+//
+//    public static byte[] read(RandomAccessFile rdf, int pos, int length) throws IOException {
+//        rdf.seek(pos);
+//        byte result[] = new byte[length];
+//        for (int i = 0; i < length; i++) {
+//            result[i] = rdf.readByte();
+//        }
+//        return result;
+//    }
+//
+//    public static void reSamplingAndSave(byte[] data, String path) throws IOException, UnsupportedAudioFileException {
+//        WaveFileReader reader = new WaveFileReader();
+//        AudioInputStream audioIn = reader.getAudioInputStream(new ByteArrayInputStream(data));
+//        AudioFormat srcFormat = audioIn.getFormat();
+//        int targetSampleRate = 16000;
+//        AudioFormat dstFormat = new AudioFormat(srcFormat.getEncoding(),
+//                targetSampleRate,
+//                srcFormat.getSampleSizeInBits(),
+//                srcFormat.getChannels(),
+//                srcFormat.getFrameSize(),
+//                srcFormat.getFrameRate(),
+//                srcFormat.isBigEndian());
+//        AudioInputStream convertedIn = AudioSystem.getAudioInputStream(dstFormat, audioIn);
+//        File file = new File(path);
+//        WaveFileWriter writer = new WaveFileWriter();
+//        writer.write(convertedIn, AudioFileFormat.Type.WAVE, file);
+//    }*/
+//}
 \ No newline at end of file
 package com.bsth.entity;
 import com.bsth.entity.schedule.BEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.annotations.Formula;
@@ -145,6 +146,24 @@ public class Cars extends BEntity implements Serializable {
     /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
     private String xlmc;
+
+    //** 车辆颜色 *//*
+    @Transient
+    @JsonIgnore
+    private String color;
+    //** 车辆最大乘坐人数 *//*
+    @Transient
+    @JsonIgnore
+    private String maxPeople;
+    //** 票价类型 *//*
+    @Transient
+    @JsonIgnore
+    private String priceType;
+    //** 票价 *//*
+    @Transient
+    @JsonIgnore
+    private String price;
+
     public Cars() {}
     public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
@@ -164,7 +183,40 @@ public class Cars extends BEntity implements Serializable {
             this.equipmentCode = sbbh.toString();
         }
     }
-	
+
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getMaxPeople() {
+        return maxPeople;
+    }
+
+    public void setMaxPeople(String maxPeople) {
+        this.maxPeople = maxPeople;
+    }
+
+    public String getPriceType() {
+        return priceType;
+    }
+
+    public void setPriceType(String priceType) {
+        this.priceType = priceType;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
     public String getServiceNo() {
 		return serviceNo;
 	}
+package com.bsth.entity;
+
+import javax.persistence.*;
+import java.util.Date;
+
+
+
+@Entity
+@Table(name = "dkl_info")
+public class DKLInfo {
+
+	// ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	private String lineCode;
+
+	private String lineName;
+
+	private String stationCode;
+
+	private String stationName;
+
+	private int num;
+
+	private String upDown;
+
+	private String image;
+
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public String getStationCode() {
+		return stationCode;
+	}
+
+	public void setStationCode(String stationCode) {
+		this.stationCode = stationCode;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+	public int getNum() {
+		return num;
+	}
+
+	public void setNum(int num) {
+		this.num = num;
+	}
+
+	public String getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(String upDown) {
+		this.upDown = upDown;
+	}
+
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+}
@@ -78,6 +78,7 @@ public class D80 {
 	@JsonIgnore
 	private Short requestCode;
+
 	public Long getSchId() {
 		return schId;
 	}
@@ -110,6 +111,30 @@ public class D80 {
 		this.requestCode = requestCode;
 	}
+	@Transient
+	@JsonIgnore
+	private String  stationName;
+	@Transient
+	@JsonIgnore
+	private Long nextschId;
+
+	public Long getNextschId() {
+		return nextschId;
+	}
+
+	public void setNextschId(Long nextschId) {
+		this.nextschId = nextschId;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+
 	@Embeddable
 	public static class D80Data {
@@ -121,6 +146,9 @@ public class D80 {
 		/**
 		 * 请求代码 0xa1 恢复运营 0xa2 申请调档 0xa3 出场请求 0xa5 进场请求 0xa7 加油请求 0x50 车辆故障 0x70
 		 * 路阻报告 0x60 事故报告 0x11 扣证纠纷 0x12 报警 0x10 S0S
+		 * 0x21 单车有人伤  0x22 单车无人伤
+		 * 0x23 双车有人伤  0x24 双车无人伤
+		 *
 		 */
 		private Short requestCode;
@@ -134,7 +162,48 @@ public class D80 {
 		 */
 		@Transient
 		private String nbbm;
-		
+		/**
+		 * 经度
+		 */
+		@Transient
+		@JsonIgnore
+		private Float lon;
+
+		/**
+		 * 纬度
+		 */
+		@Transient
+		@JsonIgnore
+		private Float lat;
+		@Transient
+		@JsonIgnore
+		private String stopNo;
+
+
+		public String getStopNo() {
+			return stopNo;
+		}
+
+		public void setStopNo(String stopNo) {
+			this.stopNo = stopNo;
+		}
+
+		public Float getLon() {
+			return lon;
+		}
+
+		public void setLon(Float lon) {
+			this.lon = lon;
+		}
+
+		public Float getLat() {
+			return lat;
+		}
+
+		public void setLat(Float lat) {
+			this.lat = lat;
+		}
+
 		public Short getOperCode2() {
 			return operCode2;
 		}
+package com.bsth.entity.lg_travel;
+
+import com.bsth.entity.schedule.BEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 区域
+ */
+@Entity
+@Table(name = "bsth_c_region")
+public class Region extends BEntity implements Serializable {
+    @Id
+    private Long id;
+    //区域名称
+    private String name;
+    //是否删除
+    private String destroy;
+
+    
+
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() { 
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDestroy() {
+        return destroy;
+    }
+
+    public void setDestroy(String destroy) {
+        this.destroy = destroy;
+    }
+}
 \ No newline at end of file
+package com.bsth.entity.lg_travel;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.schedule.BEntity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 区域
+ */
+@Entity
+@Table(name = "bsth_c_region_line_car")
+public class RegionLineCar extends BEntity implements Serializable {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    //区域名称
+    @ManyToOne
+    private Region region;
+    //线路
+    @ManyToOne
+    private Line line;
+    //线路名称
+    private String lineName;
+    //车辆自编号
+    private String clZbh;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
+    public Region getRegion() {
+        return region;
+    }
+
+    public void setRegion(Region region) {
+        this.region = region;
+    }
+
+    public Line getLine() {
+        return line;
+    }
+
+    public void setLine(Line line) {
+        this.line = line;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+
+}
 \ No newline at end of file
-package com.bsth.entity.oil;
-
-import java.text.DecimalFormat;
-import java.util.Date;
-
-import javax.persistence.*;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.bsth.data.BasicData;
-
-@Entity
-@Table(name = "bsth_c_dlb")
-public class Dlb {
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	private Date rq;
-	private String xlbm;
-	private String linename;
-	private String ssgsdm;
-	private String fgsdm;
-	private String nbbm;
-	private String jsy;
-	private Double czlc=0.0;
-	private Double jzlc=0.0;
-	//出站存电
-	private Double czcd=0.0;
-	//进站存电
-	private Double jzcd=0.0;
-	//充电量
-	private Double cdl;
-	private int sfkt;
-	private String jhsj;
-	//耗电
-	private Double hd=0.0;
-	private Double sh=0.0;
-	private String shyy;
-	private Double zlc=0.0;
-	private int yhlx;
-	
-	private Double ns=0.0;
-	private Double fyylc=0.0;
-	private Double jhzlc=0.0;
-	private Double jhfyylc=0.0;
-	private int jhzbc;
-	private int jhbc;
-	private int sjzbc;
-	private int sjbc;
-	private String edituser;
-	private Date edittime;
-	private Date createtime;
-	private Date updatetime;
-	private int nylx;
-	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
-	private int jcsx;
-	
-	private String jname;
-	@Transient
-	private String name;
-	@Transient
-	private String bglyh;
-	
-	@Transient
-	private String xlname;
-	
-	@Transient
-	private String gsname;
-	
-	@Transient
-	private String fgsname;
-	
-	
-	
-	private String lp;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Date getRq() {
-		return rq;
-	}
-
-	public void setRq(Date rq) {
-		this.rq = rq;
-	}
-
-	public String getXlbm() {
-		return xlbm;
-	}
-
-	public void setXlbm(String xlbm) {
-		this.xlbm = xlbm;
-	}
-
-	public String getLinename() {
-		return linename;
-	}
-
-	public void setLinename(String linename) {
-		this.linename = linename;
-	}
-
-	public String getSsgsdm() {
-		return ssgsdm;
-	}
-
-	public void setSsgsdm(String ssgsdm) {
-		this.ssgsdm = ssgsdm;
-	}
-
-	public String getFgsdm() {
-		return fgsdm;
-	}
-
-	public void setFgsdm(String fgsdm) {
-		this.fgsdm = fgsdm;
-	}
-
-	public String getNbbm() {
-		return nbbm;
-	}
-
-	public void setNbbm(String nbbm) {
-		this.nbbm = nbbm;
-	}
-
-	public String getJsy() {
-		return jsy;
-	}
-
-	public void setJsy(String jsy) {
-		this.jsy = jsy;
-	}
-
-	public Double getCzlc() {
-		return czlc;
-	}
-
-	public void setCzlc(Double czlc) {
-		this.czlc = czlc;
-	}
-
-	public Double getJzlc() {
-		return jzlc;
-	}
-
-	public void setJzlc(Double jzlc) {
-		this.jzlc = jzlc;
-	}
-
-	public Double getCzcd() {
-		return czcd;
-	}
-
-	public void setCzcd(Double czcd) {
-		this.czcd = czcd;
-	}
-
-	public Double getJzcd() {
-		return jzcd;
-	}
-
-	public void setJzcd(Double jzcd) {
-		this.jzcd = jzcd;
-	}
-
-	public Double getCdl() {
-		return cdl;
-	}
-
-	public void setCdl(Double cdl) {
-		this.cdl = cdl;
-	}
-
-	public int getSfkt() {
-		return sfkt;
-	}
-
-	public void setSfkt(int sfkt) {
-		this.sfkt = sfkt;
-	}
-
-	public String getJhsj() {
-		return jhsj;
-	}
-
-	public void setJhsj(String jhsj) {
-		this.jhsj = jhsj;
-	}
-
-	public Double getHd() {
-		return hd;
-	}
-
-	public void setHd(Double hd) {
-		this.hd = hd;
-	}
-
-	public Double getSh() {
-		return sh;
-	}
-
-	public void setSh(Double sh) {
-		this.sh = sh;
-	}
-
-	public String getShyy() {
-		return shyy;
-	}
-
-	public void setShyy(String shyy) {
-		this.shyy = shyy;
-	}
-
-	public Double getZlc() {
-		return zlc;
-	}
-
-	public void setZlc(Double zlc) {
-		this.zlc = zlc;
-	}
-
-	public int getYhlx() {
-		return yhlx;
-	}
-
-	public void setYhlx(int yhlx) {
-		this.yhlx = yhlx;
-	}
-
-	public Double getNs() {
-		return ns;
-	}
-
-	public void setNs(Double ns) {
-		this.ns = ns;
-	}
-
-	public Double getFyylc() {
-		return fyylc;
-	}
-
-	public void setFyylc(Double fyylc) {
-		this.fyylc = fyylc;
-	}
-
-	public Double getJhzlc() {
-		return jhzlc;
-	}
-
-	public void setJhzlc(Double jhzlc) {
-		this.jhzlc = jhzlc;
-	}
-
-	public Double getJhfyylc() {
-		return jhfyylc;
-	}
-
-	public void setJhfyylc(Double jhfyylc) {
-		this.jhfyylc = jhfyylc;
-	}
-
-	public int getJhzbc() {
-		return jhzbc;
-	}
-
-	public void setJhzbc(int jhzbc) {
-		this.jhzbc = jhzbc;
-	}
-
-	public int getJhbc() {
-		return jhbc;
-	}
-
-	public void setJhbc(int jhbc) {
-		this.jhbc = jhbc;
-	}
-
-	public int getSjzbc() {
-		return sjzbc;
-	}
-
-	public void setSjzbc(int sjzbc) {
-		this.sjzbc = sjzbc;
-	}
-
-	public int getSjbc() {
-		return sjbc;
-	}
-
-	public void setSjbc(int sjbc) {
-		this.sjbc = sjbc;
-	}
-
-	public String getEdituser() {
-		return edituser;
-	}
-
-	public void setEdituser(String edituser) {
-		this.edituser = edituser;
-	}
-
-	public Date getEdittime() {
-		return edittime;
-	}
-
-	public void setEdittime(Date edittime) {
-		this.edittime = edittime;
-	}
-
-	public Date getCreatetime() {
-		return createtime;
-	}
-
-	public void setCreatetime(Date createtime) {
-		this.createtime = createtime;
-	}
-
-	public int getNylx() {
-		return nylx;
-	}
-
-	public void setNylx(int nylx) {
-		this.nylx = nylx;
-	}
-
-	public int getJcsx() {
-		return jcsx;
-	}
-
-	public void setJcsx(int jcsx) {
-		this.jcsx = jcsx;
-	}
-
-	public String getBglyh() {
-		if(this.getZlc()==0){
-			return "0";
-		}else{
-			DecimalFormat df = new DecimalFormat("0.00");
-			return df.format(this.getHd()/this.getZlc()*100);
-		}
-	}
-
-	public void setBglyh(String bglyh) {
-		this.bglyh = bglyh;
-	}
-
-	public String getXlname() {
-		return BasicData.lineCodeAllNameMap.get(this.xlbm);
-	}
-
-	public void setXlname(String xlname) {
-		this.xlname = xlname;
-	}
-
-	public String getGsname() {
-		return 	BasicData.businessCodeNameMap.get(this.ssgsdm);
-	}
-
-	public void setGsname(String gsname) {
-		this.gsname = gsname;
-	}
-
-	public String getName() {
-		return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public String getFgsname() {
-		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
-	}
-
-	public void setFgsname(String fgsname) {
-		this.fgsname = fgsname;
-	}
-
-	public Date getUpdatetime() {
-		return updatetime;
-	}
-
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
-	}
-
-	public String getLp() {
-		return lp;
-	}
-
-	public void setLp(String lp) {
-		this.lp = lp;
-	}
-
-	public String getJname() {
-		return jname;
-	}
-
-	public void setJname(String jname) {
-		this.jname = jname;
-	}
-	
-	
-	
-}
+package com.bsth.entity.oil;
+
+import java.text.DecimalFormat;
+import java.util.Date;
+
+import javax.persistence.*;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_dlb")
+public class Dlb {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String xlbm;
+	private String linename;
+	private String ssgsdm;
+	private String fgsdm;
+	private String nbbm;
+	private String jsy;
+	private Double czlc=0.0;
+	private Double jzlc=0.0;
+	//出站存电
+	private Double czcd=0.0;
+	//进站存电
+	private Double jzcd=0.0;
+	//充电量
+	private Double cdl;
+	private int sfkt;
+	private String jhsj;
+	//耗电
+	private Double hd=0.0;
+	private Double sh=0.0;
+	private String shyy;
+	private Double zlc=0.0;
+	private int yhlx;
+	
+	private Double ns=0.0;
+	private Double fyylc=0.0;
+	private Double jhzlc=0.0;
+	private Double jhfyylc=0.0;
+	private int jhzbc;
+	private int jhbc;
+	private int sjzbc;
+	private int sjbc;
+	private String edituser;
+	private Date edittime;
+	private Date createtime;
+	private Date updatetime;
+	private int nylx;
+	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
+	private int jcsx;
+	
+	private String jname;
+	@Transient
+	private String name;
+	@Transient
+	private String bglyh;
+	
+	@Transient
+	private String xlname;
+	
+	@Transient
+	private String gsname;
+	
+	@Transient
+	private String fgsname;
+	
+	
+	
+	private String lp;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Date getRq() {
+		return rq;
+	}
+
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+
+	public String getXlbm() {
+		return xlbm;
+	}
+
+	public void setXlbm(String xlbm) {
+		this.xlbm = xlbm;
+	}
+
+	public String getLinename() {
+		return linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+
+	public String getSsgsdm() {
+		return ssgsdm;
+	}
+
+	public void setSsgsdm(String ssgsdm) {
+		this.ssgsdm = ssgsdm;
+	}
+
+	public String getFgsdm() {
+		return fgsdm;
+	}
+
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public Double getCzlc() {
+		return czlc;
+	}
+
+	public void setCzlc(Double czlc) {
+		this.czlc = czlc;
+	}
+
+	public Double getJzlc() {
+		return jzlc;
+	}
+
+	public void setJzlc(Double jzlc) {
+		this.jzlc = jzlc;
+	}
+
+	public Double getCzcd() {
+		return czcd;
+	}
+
+	public void setCzcd(Double czcd) {
+		this.czcd = czcd;
+	}
+
+	public Double getJzcd() {
+		return jzcd;
+	}
+
+	public void setJzcd(Double jzcd) {
+		this.jzcd = jzcd;
+	}
+
+	public Double getCdl() {
+		return cdl;
+	}
+
+	public void setCdl(Double cdl) {
+		this.cdl = cdl;
+	}
+
+	public int getSfkt() {
+		return sfkt;
+	}
+
+	public void setSfkt(int sfkt) {
+		this.sfkt = sfkt;
+	}
+
+	public String getJhsj() {
+		return jhsj;
+	}
+
+	public void setJhsj(String jhsj) {
+		this.jhsj = jhsj;
+	}
+
+	public Double getHd() {
+		return hd;
+	}
+
+	public void setHd(Double hd) {
+		this.hd = hd;
+	}
+
+	public Double getSh() {
+		return sh;
+	}
+
+	public void setSh(Double sh) {
+		this.sh = sh;
+	}
+
+	public String getShyy() {
+		return shyy;
+	}
+
+	public void setShyy(String shyy) {
+		this.shyy = shyy;
+	}
+
+	public Double getZlc() {
+		return zlc;
+	}
+
+	public void setZlc(Double zlc) {
+		this.zlc = zlc;
+	}
+
+	public int getYhlx() {
+		return yhlx;
+	}
+
+	public void setYhlx(int yhlx) {
+		this.yhlx = yhlx;
+	}
+
+	public Double getNs() {
+		return ns;
+	}
+
+	public void setNs(Double ns) {
+		this.ns = ns;
+	}
+
+	public Double getFyylc() {
+		return fyylc;
+	}
+
+	public void setFyylc(Double fyylc) {
+		this.fyylc = fyylc;
+	}
+
+	public Double getJhzlc() {
+		return jhzlc;
+	}
+
+	public void setJhzlc(Double jhzlc) {
+		this.jhzlc = jhzlc;
+	}
+
+	public Double getJhfyylc() {
+		return jhfyylc;
+	}
+
+	public void setJhfyylc(Double jhfyylc) {
+		this.jhfyylc = jhfyylc;
+	}
+
+	public int getJhzbc() {
+		return jhzbc;
+	}
+
+	public void setJhzbc(int jhzbc) {
+		this.jhzbc = jhzbc;
+	}
+
+	public int getJhbc() {
+		return jhbc;
+	}
+
+	public void setJhbc(int jhbc) {
+		this.jhbc = jhbc;
+	}
+
+	public int getSjzbc() {
+		return sjzbc;
+	}
+
+	public void setSjzbc(int sjzbc) {
+		this.sjzbc = sjzbc;
+	}
+
+	public int getSjbc() {
+		return sjbc;
+	}
+
+	public void setSjbc(int sjbc) {
+		this.sjbc = sjbc;
+	}
+
+	public String getEdituser() {
+		return edituser;
+	}
+
+	public void setEdituser(String edituser) {
+		this.edituser = edituser;
+	}
+
+	public Date getEdittime() {
+		return edittime;
+	}
+
+	public void setEdittime(Date edittime) {
+		this.edittime = edittime;
+	}
+
+	public Date getCreatetime() {
+		return createtime;
+	}
+
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+
+	public int getNylx() {
+		return nylx;
+	}
+
+	public void setNylx(int nylx) {
+		this.nylx = nylx;
+	}
+
+	public int getJcsx() {
+		return jcsx;
+	}
+
+	public void setJcsx(int jcsx) {
+		this.jcsx = jcsx;
+	}
+
+	public String getBglyh() {
+		if(this.getZlc()==0){
+			return "0";
+		}else{
+			DecimalFormat df = new DecimalFormat("0.000");
+			return df.format(this.getHd()/this.getZlc()*100);
+		}
+	}
+
+	public void setBglyh(String bglyh) {
+		this.bglyh = bglyh;
+	}
+
+	public String getXlname() {
+		return BasicData.lineCodeAllNameMap.get(this.xlbm);
+	}
+
+	public void setXlname(String xlname) {
+		this.xlname = xlname;
+	}
+
+	public String getGsname() {
+		return 	BasicData.businessCodeNameMap.get(this.ssgsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+
+	public String getName() {
+		return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+
+	public String getJname() {
+		return jname;
+	}
+
+	public void setJname(String jname) {
+		this.jname = jname;
+	}
+	
+	
+	
+}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+--------------------------------------------------------
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `connector_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '充电枪名称',
+  `connector_id` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '充电枪自编号',
+  `station_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '充电站名称',
+  `remark` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+  `create_by` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
+  `update_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+*/
+@Entity
+@Table(name = "bsth_c_jdl_connector")
+public class JdlConnector {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private	Integer id;
+	private String connectorName;
+	private String connectorId;
+	private String stationName;
+	private String remark;
+	private String createBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createDate;
+	private String updateBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateDate;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getConnectorName() {
+		return connectorName;
+	}
+	public void setConnectorName(String connectorName) {
+		this.connectorName = connectorName;
+	}
+	public String getConnectorId() {
+		return connectorId;
+	}
+	public void setConnectorId(String connectorId) {
+		this.connectorId = connectorId;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getCreateBy() {
+		return createBy;
+	}
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public String getUpdateBy() {
+		return updateBy;
+	}
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	
+}
 \ No newline at end of file
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+--------------------------------------------------------
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `station_name` varchar(255) DEFAULT NULL COMMENT '站点名称',
+  `connector_id` varchar(255) DEFAULT NULL COMMENT '枪编号',
+  `connector_name` varchar(255) DEFAULT NULL COMMENT '充电枪名',
+  `order_no` varchar(255) DEFAULT NULL COMMENT '订单编号',
+  `start_time` varchar(255) DEFAULT NULL COMMENT '充电开始时间',
+  `end_time` varchar(255) DEFAULT NULL COMMENT '充电结束时间',
+  `start_soc` double(11,2) DEFAULT NULL COMMENT '开始 SOC(%)',
+  `end_soc` double(11,2) DEFAULT NULL COMMENT '结束 SOC(%)',
+  `stop_reason` varchar(255) DEFAULT NULL COMMENT '终止原因',
+  `charge_capacity` double(11,3) DEFAULT NULL COMMENT '充电量，单位：度',
+  `electric_charge` double(11,2) DEFAULT NULL COMMENT '电费，单位：元',
+  `service_charge` double(11,2) DEFAULT NULL COMMENT '服务费，单位：元',
+  `total_amount` double(11,2) DEFAULT NULL COMMENT '总费用，单位：元',
+  `vin_code` varchar(255) DEFAULT NULL COMMENT '卡号',
+  `card_no` varchar(255) DEFAULT NULL COMMENT 'VIN，车架号',
+  `car_code` varchar(255) DEFAULT NULL COMMENT '车牌号',
+  `date_str` varchar(255) DEFAULT NULL COMMENT '营运日期',
+  `origin` int(2) NOT NULL DEFAULT '0' COMMENT '数据源（0：接口获取；1：导入）',
+  `sum_time` bigint(11) DEFAULT NULL COMMENT '总计充电时间（分钟）',
+  `pile_id` varchar(255) DEFAULT NULL COMMENT '桩号',
+  `create_by` varchar(255) DEFAULT NULL COMMENT '创建人',
+  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(255) DEFAULT NULL COMMENT '修改人',
+  `update_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+*/
+@Entity
+@Table(name = "bsth_c_jdl_reception")
+public class JdlReception {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private	Long id;
+	private String stationName;
+	private String connectorId;
+	private String connectorName;
+	private String orderNo;
+	private String startTime;
+	private String endTime;
+	private Double startSoc;
+	private Double endSoc;
+	private String stopReason;
+	private Double chargeCapacity;
+	private Double electricCharge;
+	private Double serviceCharge;
+	private Double totalAmount;
+	private String vinCode;
+	private String cardNo;
+	private String carCode;
+	private String dateStr;
+	private Integer origin;
+	private Integer sumTime;
+	private String batchNo;
+	private String pileId;
+	private String remark;
+	private String createBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createDate;
+	private String updateBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateDate;
+	
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getConnectorId() {
+		return connectorId;
+	}
+	public void setConnectorId(String connectorId) {
+		this.connectorId = connectorId;
+	}
+	public String getConnectorName() {
+		return connectorName;
+	}
+	public void setConnectorName(String connectorName) {
+		this.connectorName = connectorName;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public Double getStartSoc() {
+		return startSoc;
+	}
+	public void setStartSoc(Double startSoc) {
+		this.startSoc = startSoc;
+	}
+	public Double getEndSoc() {
+		return endSoc;
+	}
+	public void setEndSoc(Double endSoc) {
+		this.endSoc = endSoc;
+	}
+	public String getStopReason() {
+		return stopReason;
+	}
+	public void setStopReason(String stopReason) {
+		this.stopReason = stopReason;
+	}
+	public Double getChargeCapacity() {
+		return chargeCapacity;
+	}
+	public void setChargeCapacity(Double chargeCapacity) {
+		this.chargeCapacity = chargeCapacity;
+	}
+	public Double getElectricCharge() {
+		return electricCharge;
+	}
+	public void setElectricCharge(Double electricCharge) {
+		this.electricCharge = electricCharge;
+	}
+	public Double getServiceCharge() {
+		return serviceCharge;
+	}
+	public void setServiceCharge(Double serviceCharge) {
+		this.serviceCharge = serviceCharge;
+	}
+	public Double getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(Double totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public String getVinCode() {
+		return vinCode;
+	}
+	public void setVinCode(String vinCode) {
+		this.vinCode = vinCode;
+	}
+	public String getCardNo() {
+		return cardNo;
+	}
+	public void setCardNo(String cardNo) {
+		this.cardNo = cardNo;
+	}
+	public String getCarCode() {
+		return carCode;
+	}
+	public void setCarCode(String carCode) {
+		this.carCode = carCode;
+	}
+	public String getDateStr() {
+		return dateStr;
+	}
+	public void setDateStr(String dateStr) {
+		this.dateStr = dateStr;
+	}
+	public Integer getOrigin() {
+		return origin;
+	}
+	public void setOrigin(Integer origin) {
+		this.origin = origin;
+	}
+	public Integer getSumTime() {
+		return sumTime;
+	}
+	public void setSumTime(Integer sumTime) {
+		this.sumTime = sumTime;
+	}
+	public String getBatchNo() {
+		return batchNo;
+	}
+	public void setBatchNo(String batchNo) {
+		this.batchNo = batchNo;
+	}
+	public String getPileId() {
+		return pileId;
+	}
+	public void setPileId(String pileId) {
+		this.pileId = pileId;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getCreateBy() {
+		return createBy;
+	}
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public String getUpdateBy() {
+		return updateBy;
+	}
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	
+}
 \ No newline at end of file
@@ -348,7 +348,7 @@ public class Qlb {
 		if(this.getZlc()==0){
 			return "0";
 		}else{
-			DecimalFormat df = new DecimalFormat("0.00");
+			DecimalFormat df = new DecimalFormat("0.000");
 			return df.format(this.getHn()/this.getZlc()*100);
 		}
 	}
-package com.bsth.entity.oil;
-
-import java.text.DecimalFormat;
-import java.util.Date;
-
-import javax.persistence.*;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.bsth.data.BasicData;
-
-@Entity
-@Table(name = "bsth_c_ylb")
-public class Ylb {
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	private Date rq;
-	private String xlbm;
-	private String linename;
-	private String ssgsdm;
-	private String fgsdm;
-	private String nbbm;
-	private String jsy;
-	private String jname;
-	private Double czlc=0.0;
-	private Double jzlc=0.0;
-	private Double czyl=0.0;
-	private Double jzyl=0.0;
-	private Double jzl=0.0;
-	private int sfkt;
-	private String jhsj;
-	private Double yh=0.0;
-	private Double sh=0.0;
-	private String shyy;
-	private Double zlc=0.0;
-	private int yhlx;
-	private String rylx="0";
-	private Double ns=0.0;
-	private Double fyylc=0.0;
-	private Double jhzlc=0.0;
-	private Double jhfyylc=0.0;
-	private int jhzbc;
-	private int jhbc;
-	private int sjzbc;
-	private int sjbc;
-	private String edituser;
-	private Date edittime;
-	private Date updatetime;
-	private Date createtime;
-
-	private int nylx;
-	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
-	private int jcsx;
-	
-	private String lp;
-	@Transient
-	private String bglyh;
-	
-	@Transient
-	private String xlname;
-	
-	@Transient
-	private String gsname;
-	
-	@Transient
-	private String fgsname;
-	
-	@Transient
-	private String name;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	public Date getRq() {
-		return rq;
-	}
-
-	public void setRq(Date rq) {
-		this.rq = rq;
-	}
-
-	public String getXlbm() {
-		return xlbm;
-	}
-
-	public void setXlbm(String xlbm) {
-		this.xlbm = xlbm;
-	}
-	
-	public String getLinename() {
-		return linename;
-	}
-
-	public void setLinename(String linename) {
-		this.linename = linename;
-	}
-
-	public String getSsgsdm() {
-		return ssgsdm;
-	}
-	public void setSsgsdm(String ssgsdm) {
-		this.ssgsdm = ssgsdm;
-	}
-	public String getFgsdm() {
-		return fgsdm;
-	}
-	public void setFgsdm(String fgsdm) {
-		this.fgsdm = fgsdm;
-	}
-	public String getNbbm() {
-		return nbbm;
-	}
-	public void setNbbm(String nbbm) {
-		this.nbbm = nbbm;
-	}
-	public String getJsy() {
-		return jsy;
-	}
-	public void setJsy(String jsy) {
-		this.jsy = jsy;
-	}
-	public Double getCzlc() {
-		return czlc;
-	}
-	public void setCzlc(Double czlc) {
-		this.czlc = czlc;
-	}
-	public Double getJzlc() {
-		return jzlc;
-	}
-	public void setJzlc(Double jzlc) {
-		this.jzlc = jzlc;
-	}
-	public Double getCzyl() {
-		return czyl;
-	}
-	public void setCzyl(Double czyl) {
-		this.czyl = czyl;
-	}
-	public Double getJzyl() {
-		return jzyl;
-	}
-	public void setJzyl(Double jzyl) {
-		this.jzyl = jzyl;
-	}
-	public Double getJzl() {
-		return jzl;
-	}
-	public void setJzl(Double jzl) {
-		this.jzl = jzl;
-	}
-	public int getSfkt() {
-		return sfkt;
-	}
-	public void setSfkt(int sfkt) {
-		this.sfkt = sfkt;
-	}
-	public String getJhsj() {
-		return jhsj;
-	}
-	public void setJhsj(String jhsj) {
-		this.jhsj = jhsj;
-	}
-	public Double getYh() {
-		return yh;
-	}
-	public void setYh(Double yh) {
-		this.yh = yh;
-	}
-	public Double getSh() {
-		return sh;
-	}
-	public void setSh(Double sh) {
-		this.sh = sh;
-	}
-	public String getShyy() {
-		return shyy;
-	}
-	public void setShyy(String shyy) {
-		this.shyy = shyy;
-	}
-	public Double getZlc() {
-		return zlc;
-	}
-	public void setZlc(Double zlc) {
-		this.zlc = zlc;
-	}
-	public int getYhlx() {
-		return yhlx;
-	}
-	public void setYhlx(int yhlx) {
-		this.yhlx = yhlx;
-	}
-	public String getRylx() {
-		return rylx;
-	}
-	public void setRylx(String rylx) {
-		this.rylx = rylx;
-	}
-	public Double getNs() {
-		return ns;
-	}
-	public void setNs(Double ns) {
-		this.ns = ns;
-	}
-	public Double getFyylc() {
-		return fyylc;
-	}
-	public void setFyylc(Double fyylc) {
-		this.fyylc = fyylc;
-	}
-	public Double getJhzlc() {
-		return jhzlc;
-	}
-	public void setJhzlc(Double jhzlc) {
-		this.jhzlc = jhzlc;
-	}
-	public Double getJhfyylc() {
-		return jhfyylc;
-	}
-	public void setJhfyylc(Double jhfyylc) {
-		this.jhfyylc = jhfyylc;
-	}
-	public int getJhzbc() {
-		return jhzbc;
-	}
-	public void setJhzbc(int jhzbc) {
-		this.jhzbc = jhzbc;
-	}
-	public int getJhbc() {
-		return jhbc;
-	}
-	public void setJhbc(int jhbc) {
-		this.jhbc = jhbc;
-	}
-	public int getSjzbc() {
-		return sjzbc;
-	}
-	public void setSjzbc(int sjzbc) {
-		this.sjzbc = sjzbc;
-	}
-	public int getSjbc() {
-		return sjbc;
-	}
-	public void setSjbc(int sjbc) {
-		this.sjbc = sjbc;
-	}
-	public String getEdituser() {
-		return edituser;
-	}
-	public void setEdituser(String edituser) {
-		this.edituser = edituser;
-	}
-	public Date getEdittime() {
-		return edittime;
-	}
-	public void setEdittime(Date edittime) {
-		this.edittime = edittime;
-	}
-	public Date getCreatetime() {
-		return createtime;
-	}
-	public void setCreatetime(Date createtime) {
-		this.createtime = createtime;
-	}
-	public int getNylx() {
-		return nylx;
-	}
-	public void setNylx(int nylx) {
-		this.nylx = nylx;
-	}
-	
-	public int getJcsx(){
-		return jcsx;
-	}
-	
-	public void setJcsx(int jcsx){
-		this.jcsx=jcsx;
-	}
-
-	public String getBglyh() {
-		if(this.getZlc()==0){
-			return "0";
-		}else{
-			DecimalFormat df = new DecimalFormat("0.00");
-			return df.format(this.getYh()/this.getZlc()*100);
-		}
-	}
-
-	public void setBglyh(String bglyh) {
-		this.bglyh = bglyh;
-	}
-
-	public String getXlname() {
-		return BasicData.lineCodeAllNameMap.get(this.xlbm);
-	}
-
-	public void setXlname(String xlname) {
-		this.xlname = xlname;
-	}
-
-	public String getGsname() {
-		return 	BasicData.businessCodeNameMap.get(this.ssgsdm);
-	}
-
-	public void setGsname(String gsname) {
-		this.gsname = gsname;
-	}
-	
-	
-	public String getFgsname() {
-		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
-	}
-
-	public void setFgsname(String fgsname) {
-		this.fgsname = fgsname;
-	}
-
-	public String getName() {
-		return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	
-	public Date getUpdatetime() {
-		return updatetime;
-	}
-
-	public void setUpdatetime(Date updatetime) {
-		this.updatetime = updatetime;
-	}
-
-	public String getLp() {
-		return lp;
-	}
-
-	public void setLp(String lp) {
-		this.lp = lp;
-	}
-
-	public String getJname() {
-		return jname;
-	}
-
-	public void setJname(String jname) {
-		this.jname = jname;
-	}
-	
-	
-}
+package com.bsth.entity.oil;
+
+import java.text.DecimalFormat;
+import java.util.Date;
+
+import javax.persistence.*;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_ylb")
+public class Ylb {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date rq;
+	private String xlbm;
+	private String linename;
+	private String ssgsdm;
+	private String fgsdm;
+	private String nbbm;
+	private String jsy;
+	private String jname;
+	private Double czlc=0.0;
+	private Double jzlc=0.0;
+	private Double czyl=0.0;
+	private Double jzyl=0.0;
+	private Double jzl=0.0;
+	private int sfkt;
+	private String jhsj;
+	private Double yh=0.0;
+	private Double sh=0.0;
+	private String shyy;
+	private Double zlc=0.0;
+	private int yhlx;
+	private String rylx="0";
+	private Double ns=0.0;
+	private Double fyylc=0.0;
+	private Double jhzlc=0.0;
+	private Double jhfyylc=0.0;
+	private int jhzbc;
+	private int jhbc;
+	private int sjzbc;
+	private int sjbc;
+	private String edituser;
+	private Date edittime;
+	private Date updatetime;
+	private Date createtime;
+
+	private int nylx;
+	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
+	private int jcsx;
+	
+	private String lp;
+	@Transient
+	private String bglyh;
+	
+	@Transient
+	private String xlname;
+	
+	@Transient
+	private String gsname;
+	
+	@Transient
+	private String fgsname;
+	
+	@Transient
+	private String name;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Date getRq() {
+		return rq;
+	}
+
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+
+	public String getXlbm() {
+		return xlbm;
+	}
+
+	public void setXlbm(String xlbm) {
+		this.xlbm = xlbm;
+	}
+	
+	public String getLinename() {
+		return linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+
+	public String getSsgsdm() {
+		return ssgsdm;
+	}
+	public void setSsgsdm(String ssgsdm) {
+		this.ssgsdm = ssgsdm;
+	}
+	public String getFgsdm() {
+		return fgsdm;
+	}
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+	public String getNbbm() {
+		return nbbm;
+	}
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+	public String getJsy() {
+		return jsy;
+	}
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+	public Double getCzlc() {
+		return czlc;
+	}
+	public void setCzlc(Double czlc) {
+		this.czlc = czlc;
+	}
+	public Double getJzlc() {
+		return jzlc;
+	}
+	public void setJzlc(Double jzlc) {
+		this.jzlc = jzlc;
+	}
+	public Double getCzyl() {
+		return czyl;
+	}
+	public void setCzyl(Double czyl) {
+		this.czyl = czyl;
+	}
+	public Double getJzyl() {
+		return jzyl;
+	}
+	public void setJzyl(Double jzyl) {
+		this.jzyl = jzyl;
+	}
+	public Double getJzl() {
+		return jzl;
+	}
+	public void setJzl(Double jzl) {
+		this.jzl = jzl;
+	}
+	public int getSfkt() {
+		return sfkt;
+	}
+	public void setSfkt(int sfkt) {
+		this.sfkt = sfkt;
+	}
+	public String getJhsj() {
+		return jhsj;
+	}
+	public void setJhsj(String jhsj) {
+		this.jhsj = jhsj;
+	}
+	public Double getYh() {
+		return yh;
+	}
+	public void setYh(Double yh) {
+		this.yh = yh;
+	}
+	public Double getSh() {
+		return sh;
+	}
+	public void setSh(Double sh) {
+		this.sh = sh;
+	}
+	public String getShyy() {
+		return shyy;
+	}
+	public void setShyy(String shyy) {
+		this.shyy = shyy;
+	}
+	public Double getZlc() {
+		return zlc;
+	}
+	public void setZlc(Double zlc) {
+		this.zlc = zlc;
+	}
+	public int getYhlx() {
+		return yhlx;
+	}
+	public void setYhlx(int yhlx) {
+		this.yhlx = yhlx;
+	}
+	public String getRylx() {
+		return rylx;
+	}
+	public void setRylx(String rylx) {
+		this.rylx = rylx;
+	}
+	public Double getNs() {
+		return ns;
+	}
+	public void setNs(Double ns) {
+		this.ns = ns;
+	}
+	public Double getFyylc() {
+		return fyylc;
+	}
+	public void setFyylc(Double fyylc) {
+		this.fyylc = fyylc;
+	}
+	public Double getJhzlc() {
+		return jhzlc;
+	}
+	public void setJhzlc(Double jhzlc) {
+		this.jhzlc = jhzlc;
+	}
+	public Double getJhfyylc() {
+		return jhfyylc;
+	}
+	public void setJhfyylc(Double jhfyylc) {
+		this.jhfyylc = jhfyylc;
+	}
+	public int getJhzbc() {
+		return jhzbc;
+	}
+	public void setJhzbc(int jhzbc) {
+		this.jhzbc = jhzbc;
+	}
+	public int getJhbc() {
+		return jhbc;
+	}
+	public void setJhbc(int jhbc) {
+		this.jhbc = jhbc;
+	}
+	public int getSjzbc() {
+		return sjzbc;
+	}
+	public void setSjzbc(int sjzbc) {
+		this.sjzbc = sjzbc;
+	}
+	public int getSjbc() {
+		return sjbc;
+	}
+	public void setSjbc(int sjbc) {
+		this.sjbc = sjbc;
+	}
+	public String getEdituser() {
+		return edituser;
+	}
+	public void setEdituser(String edituser) {
+		this.edituser = edituser;
+	}
+	public Date getEdittime() {
+		return edittime;
+	}
+	public void setEdittime(Date edittime) {
+		this.edittime = edittime;
+	}
+	public Date getCreatetime() {
+		return createtime;
+	}
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+	public int getNylx() {
+		return nylx;
+	}
+	public void setNylx(int nylx) {
+		this.nylx = nylx;
+	}
+	
+	public int getJcsx(){
+		return jcsx;
+	}
+	
+	public void setJcsx(int jcsx){
+		this.jcsx=jcsx;
+	}
+
+	public String getBglyh() {
+		if(this.getZlc()==0){
+			return "0";
+		}else{
+			DecimalFormat df = new DecimalFormat("0.000");
+			return df.format(this.getYh()/this.getZlc()*100);
+		}
+	}
+
+	public void setBglyh(String bglyh) {
+		this.bglyh = bglyh;
+	}
+
+	public String getXlname() {
+		return BasicData.lineCodeAllNameMap.get(this.xlbm);
+	}
+
+	public void setXlname(String xlname) {
+		this.xlname = xlname;
+	}
+
+	public String getGsname() {
+		return 	BasicData.businessCodeNameMap.get(this.ssgsdm);
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	
+	
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+
+	public String getName() {
+		return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+
+	public String getLp() {
+		return lp;
+	}
+
+	public void setLp(String lp) {
+		this.lp = lp;
+	}
+
+	public String getJname() {
+		return jname;
+	}
+
+	public void setJname(String jname) {
+		this.jname = jname;
+	}
+	
+	
+}
@@ -21,7 +21,7 @@ import java.util.Set;
             @NamedAttributeNode("cTasks")
     })
 })
-public class ScheduleRealInfo {
+public class ScheduleRealInfo implements Cloneable{
 	/** 主键Id */
 	@Id
 	private Long id;
@@ -1054,4 +1054,10 @@ public class ScheduleRealInfo {
 	public void setOperationType(String operationType) {
 		this.operationType = operationType;
 	}
+
+	@Override
+	public ScheduleRealInfo clone() throws CloneNotSupportedException {
+		ScheduleRealInfo cloned = (ScheduleRealInfo) super.clone();
+		return cloned;
+	}
 }
@@ -7,7 +7,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 @Entity
-@Table(name = "bsth_c_t_station_people_logger")  //智能调度记录查询表
+@Table(name = "bsth_c_t_station_people_logger")  //智能调度记录检测表
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
 public class StationPeopleLogger implements Serializable {
     // ID
@@ -19,8 +19,10 @@ public class StationPeopleLogger implements Serializable {
     //线路名称
     private String lineName;
     //站点code
+    @Transient
     private String station;
     //站点名称
+    @Transient
     private String stationName;
     //日期
     private String rqStr;
@@ -31,8 +33,19 @@ public class StationPeopleLogger implements Serializable {
     //上下行
     private String xlDir;
     //人数 or 差距时间 or 站点差数  根据类型判断
-    private Long numType;
-    
+    private String  fcsj;
+
+    private String clZbh;
+
+
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
     public void setId(Long id) {
         this.id = id;
@@ -90,8 +103,12 @@ public class StationPeopleLogger implements Serializable {
         this.rq = rq;
     }
-    public Long getNumType() {
-        return numType;
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
     }
     public String getStation() {
@@ -110,8 +127,5 @@ public class StationPeopleLogger implements Serializable {
         this.stationName = stationName;
     }
-    public void setNumType(Long numType) {
-        this.numType = numType;
-    }
 }
@@ -23,6 +23,25 @@ public class znddStatus {
     private String name;
+    //大客流是否自动执行班次 0开  1关  null关
+    private String excuteStatus;
+
+    public String getExcuteStatus() {
+        return excuteStatus;
+    }
+
+    public void setExcuteStatus(String excuteStatus) {
+        this.excuteStatus = excuteStatus;
+    }
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
     public String getType() {
         return type;
+package com.bsth.repository;
+
+import com.bsth.entity.DKLInfo;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface DKLInfoRepository extends BaseRepository<DKLInfo, Integer> {
+}
+package com.bsth.repository.lg_travel;
+
+
+import com.bsth.entity.lg_travel.RegionLineCar;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface RegionLineCarRepository extends BaseRepository<RegionLineCar, Long> {
+}
+package com.bsth.repository.lg_travel;
+
+
+import com.bsth.entity.lg_travel.Region;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface RegionRepository extends BaseRepository<Region, Long> {
+}
+package com.bsth.repository.oil;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.JdlConnector;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface JdlConnectorRepository extends BaseRepository<JdlConnector, Integer>{
+	
+	@Query(value="SELECT j FROM JdlConnector j WHERE connectorName like %?1% and connectorId like %?2% and stationName like %?3% order by stationName, connectorId ")
+	List<JdlConnector> query(String connectorName, String connectorId, String stationName);
+	
+	@Query(value="SELECT j FROM JdlConnector j WHERE connectorName = ?1 ")
+	List<JdlConnector> queryByGunName(String connectorName);
+	
+	@Query(value="SELECT j FROM JdlConnector j WHERE id = ?1 ")
+	JdlConnector queryById(Integer id);
+	
+	@Query(value="SELECT j.stationName FROM JdlConnector j group by stationName ")
+	List<String> queryStationName();
+	
+	@Modifying
+	@Transactional
+	@Query(value = "delete JdlConnector j where id = ?1 ")
+	void delete(Integer id);
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_jdl_connector SET " +
+				" connector_name = ?2," +
+				" connector_id = ?3," +
+				" station_name = ?4" +
+				" WHERE id = ?1 ", nativeQuery=true)
+	public void update(Integer id, String connectorName, String connectorId, String stationName);
+	
+}
+package com.bsth.repository.oil;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.JdlReception;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface JdlReceptionRepository extends BaseRepository<JdlReception, Integer>{
+	
+	@Query(value="SELECT date_str, car_code, sum(CAST(charge_capacity AS DECIMAL(10, 3))) charge_capacity FROM bsth_c_jdl_reception where date_str = ?1 and car_code like %?2% group by date_str, car_code order by date_str" ,nativeQuery=true)
+	List<Object[]> querySum(String rq, String nbbm);
+	
+	@Query(value="SELECT * FROM bsth_c_jdl_reception where date_str = ?1 and car_code like %?2% " ,nativeQuery=true)
+	List<JdlReception> query(String rq, String nbbm);
+	
+	@Query(value="SELECT batch_no, create_by, DATE_FORMAT(create_date, '%Y-%m-%d %H:%i:%s') create_date FROM bsth_c_jdl_reception where DATE_FORMAT(create_date, '%Y-%m-%d') = ?1 and origin = 1 group by batch_no, create_by, create_date order by batch_no" ,nativeQuery=true)
+	List<Object[]> queryBatch(String rq);
+	
+	@Query(value="SELECT batch_no, create_by, DATE_FORMAT(create_date, '%Y-%m-%d %H:%i:%s') create_date FROM bsth_c_jdl_reception where DATE_FORMAT(create_date, '%Y-%m-%d') >= ?1 and DATE_FORMAT(create_date, '%Y-%m-%d') <= ?2 and create_by like %?3% and origin = 1 group by batch_no, create_by, create_date order by create_date, create_by, batch_no" ,nativeQuery=true)
+	List<Object[]> queryBatchByDates(String rq1, String rq2, String createBy);
+	
+	@Query(value="SELECT * FROM bsth_c_jdl_reception where create_by = ?1 and DATE_FORMAT(create_date, '%Y-%m-%d %H:%i:%s') = ?2 and origin = 1 " ,nativeQuery=true)
+	List<JdlReception> queryBatchData(String createBy, String createDate);
+	
+	@Query(value="SELECT j FROM JdlReception j WHERE id = ?1 ")
+	List<JdlReception> queryById(Long id);
+	
+	@Query(value="SELECT j FROM JdlReception j WHERE endTime >= ?1 and startTime <= ?2 and carCode = ?3 ")
+	List<JdlReception> queryRepeatCar(String startTime, String endTime, String nbbm);
+	
+	@Query(value="SELECT j FROM JdlReception j WHERE endTime >= ?1 and startTime <= ?2 and connectorId = ?3 and carCode != ?4 ")
+	List<JdlReception> queryRepeatConnector(String startTime, String endTime, String connectorId, String nbbm);
+	
+	@Modifying
+	@Transactional
+	@Query(value = "delete JdlReception j where createBy = ?1 and DATE_FORMAT(createDate, '%Y-%m-%d %H:%i:%s') = ?2 and origin = 1")
+	void deleteBatch(String createBy, String createDate);
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_jdl_reception SET " +
+				" date_str = ?2," +
+				" pile_id = ?3," +
+				" car_code = ?4," +
+				" start_time = ?5," +
+				" end_time = ?6," +
+				" sum_time = ?7," +
+				" start_soc = ?8," +
+				" end_soc = ?9," +
+				" charge_capacity = ?10," +
+				" stop_reason = ?11" +
+				" WHERE id = ?1", nativeQuery=true)
+	public void update(Long id, String dateStr, String pileId, String carCode, String startTime, String endTime, Integer sumTime, Double startSoc, Double endSoc, Double chargeCapacity, String stopReason);
+	
+}
 package com.bsth.repository.oil;
+import java.util.List;
-
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+
 import com.bsth.entity.oil.Nylog;
 import com.bsth.repository.BaseRepository;
 @Repository
 public interface NylogRepository extends BaseRepository<Nylog, Integer>{
+	
+	@Query(value="select n from Nylog n where nylx = ?1 and czmc = ?2 and cxtj = ?3 order by createdate desc ")
+	List<Nylog> selectByCxtj(String nylx, String czmc, String cxtj);
+	
 }
+package com.bsth.repository.zndd;
+
+import com.bsth.entity.zndd.StationPeopleLogger;
+import com.bsth.repository.BaseRepository;
+
+public interface ZnddLoggerRepository extends BaseRepository<StationPeopleLogger, Integer> {
+}
@@ -2,10 +2,20 @@ package com.bsth.repository.zndd;
 import com.bsth.entity.zndd.znddStatus;
 import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 @Repository
 public interface ZnddStatusRepository extends BaseRepository<znddStatus, Integer> {
+
+
+    @Transactional
+    @Modifying
+    @Query(value="UPDATE zndd_status SET " +
+            "open_status = ?2 WHERE id = ?1", nativeQuery=true)
+    void update(Integer id, Integer openStatus);
 }
+package com.bsth.service;
+
+import com.bsth.entity.DKLInfo;
+
+
+public interface DKLInfoService extends BaseService<DKLInfo, Integer> {
+}
@@ -2395,7 +2395,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		}
 		int i=1;
-        DecimalFormat df = new DecimalFormat("0.00");//格式化小数
+        DecimalFormat df = new DecimalFormat("0.000");//格式化小数
 		double allNum = 0.0;
 		while (iter.hasNext()) {
 			Map.Entry entry = (Map.Entry) iter.next();
@@ -2433,7 +2433,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			listStr.add(c.getTs()+"");
 			// 把列合计的数添加到最后一个
 			cList.add(c);
-			// DecimalFormat df = new DecimalFormat("0.00");//格式化小数
             for (CalcWaybillDetail c1:cList) {
                 if(StringUtils.isEmpty(c1.getXl())) {
                     listStr.add("");
+package com.bsth.service.impl;
+
+import com.bsth.entity.DKLInfo;
+import com.bsth.service.DKLInfoService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class DKLInfoServiceImpl extends BaseServiceImpl<DKLInfo, Integer> implements DKLInfoService {
+}
@@ -710,6 +710,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				String sleepStr = "";
 				// 方向
 				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
+				if (directions == 1) {
+					stationName = stationName.replaceAll("\\(起点站\\)", "").replaceAll("\\(终点站\\)", "").replaceAll("（起点站）", "").replaceAll("（终点站）", "");
+				}
 				/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 				List<Object[]> sobje = sectionRouteRepository.sectionRouteVector(lineId,directions);
 				if(sobje.size()==1) {
@@ -799,6 +802,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					String sleepStr = "";
 					// 方向
 					int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
+					if (directions == 1) {
+						stationName = stationName.replaceAll("\\(起点站\\)", "").replaceAll("\\(终点站\\)", "").replaceAll("（起点站）", "").replaceAll("（终点站）", "");
+					}
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = sectionRouteRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
+package com.bsth.service.lg_travel;
+
+import com.bsth.entity.lg_travel.RegionLineCar;
+import com.bsth.service.BaseService;
+
+public interface RegionLineCarService extends BaseService<RegionLineCar, Long> {
+}
+package com.bsth.service.lg_travel;
+
+import com.bsth.entity.lg_travel.Region;
+import com.bsth.service.BaseService;
+
+public interface RegionService extends BaseService<Region, Long> {
+}
+package com.bsth.service.lg_travel.impl;
+
+
+import com.bsth.entity.lg_travel.RegionLineCar;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.lg_travel.RegionLineCarService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RegionLineCarServiceImpl extends BaseServiceImpl<RegionLineCar, Long> implements RegionLineCarService {
+    
+    
+    
+}
+package com.bsth.service.lg_travel.impl;
+
+
+import com.bsth.entity.lg_travel.Region;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.lg_travel.RegionService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RegionServiceImpl extends BaseServiceImpl<Region, Long> implements RegionService {
+    
+    
+    
+}
 package com.bsth.service.oil;
 import java.io.File;
+import java.io.IOException;
+import java.util.List;
 import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
 import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.JdlConnector;
+import com.bsth.entity.oil.JdlReception;
 import com.bsth.service.BaseService;
 public interface JdlService extends BaseService<Jdl, Integer> {
 	public String importExcel(File file, String gsbm_, String gsName, String fgsbm, String fgsName);
+	
+	/** 24年12月工单更新电量导入 */
+	public String importExcel_2412(File file, String gsbm_, String gsName, String fgsbm, String fgsName, String stationName);
 	public Map<String, Object> query(Map<String, Object> map);
+
+	public Map<String, Object> query_2412(Map<String, Object> map);
+	
+	public List<JdlReception> queryJdlReception(Map<String, Object> map);
+
+	public Map<String, Object> queryJdlReceptionBatch(Map<String, Object> map);
+	
+	public List<JdlReception> queryJdlReceptionBatchData(Map<String, Object> map);
+	
+	public Map<String, Object> deleteJdlReceptionBatch(Map<String, Object> map);
+	
+	public Map<String, Object> updateJdlReceptionBatch(Map<String, Object> map);
+	
+	public void downloadJdlReceptionImportFile(Map<String, Object> map, HttpServletResponse response) throws IOException;
+	
+	/**
+	 * 查询车辆充电量，以jdl表格式返回
+	 * @param rq	营运日期
+	 * @param nbbm	车辆自编号（为‘’时查询全部车辆）
+	 * @return
+	 */
+	public List<Jdl> queryJdlByJdlReception(String rq, String nbbm);
+	
+	public List<JdlConnector> queryJdlConnector(Map<String, Object> map);
+	
+	public JdlConnector queryJdlConnectorById(Integer id);
+	
+	public List<String> queryJdlStationName();
+	
+	public Map<String, Object> addJdlConnector(Map<String, Object> map);
+	
+	public Map<String, Object> deleteJdlConnector(Map<String, Object> map);
+	
+	public Map<String, Object> updateJdlConnector(Map<String, Object> map);
 }
@@ -48,6 +48,7 @@ import com.bsth.repository.CarsRepository;
 import com.bsth.repository.oil.CdlRepository;
 import com.bsth.repository.oil.CylRepository;
 import com.bsth.repository.oil.DlbRepository;
+import com.bsth.repository.oil.JdlReceptionRepository;
 import com.bsth.repository.oil.JdlRepository;
 import com.bsth.repository.oil.NylogRepository;
 import com.bsth.repository.oil.YlbRepository;
@@ -55,6 +56,7 @@ import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.DlbService;
+import com.bsth.service.oil.JdlService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.Arith;
 import com.bsth.util.BatchSaveUtils;
@@ -77,6 +79,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
+	@Autowired
+	JdlService jdlService;
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -91,7 +95,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
 		 for (int i = 0; i < carsList.size(); i++) {
 			 Cars c=carsList.get(i);
-			 carsMap.put(c.getInsideCode(), c.getSfdc());
+			 carsMap.put(c.getInsideCode(), (c.getSfdc()!=null?c.getSfdc():false)
+						|| (c.getSfmix()!=null?c.getSfmix():false));//电车或油电混合，都可以充电
 		}
 		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 			Date dNow = new Date();   //当前时间
@@ -103,8 +108,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			String rq=sdf.format(dBefore);
 //		 String rq="2017-11-02";
 		String line="";
-		//保留两位小数
-		DecimalFormat df = new DecimalFormat("#.00");
+		//公里保留三位小数
+		DecimalFormat df = new DecimalFormat("#.000");
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		//当天DLB信息
@@ -112,7 +117,9 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		//当天YLXXB信息
 		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
 		//当天加电信息表
-		List<Jdl> jdlList=jdlRepository.JdlList(rq);
+		List<Jdl> jdlList = jdlRepository.JdlList(rq);
+//		List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
+//		jdlList.addAll(jdlRepository.JdlList(rq));
 		//前一天所有车辆最后进场班次信息
 //		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
@@ -123,7 +130,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			boolean sfdc=false;
 			Map<String, Object> map=listpb.get(x);
 			if (carsMap.get(map.get("clZbh").toString())!=null) {
-				 sfdc= carsMap.get(map.get("clZbh").toString());
+				 sfdc = carsMap.get(map.get("clZbh").toString());
 			}else{
 				sfdc=false;
 			}
@@ -237,7 +244,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
 			for (int i = 0; i < carsList.size(); i++) {
 				Cars c = carsList.get(i);
-				carsMap.put(c.getInsideCode(), c.getSfdc());
+				carsMap.put(c.getInsideCode(), (c.getSfdc()!=null?c.getSfdc():false)
+						|| (c.getSfmix()!=null?c.getSfmix():false));//电车或油电混合，都可以充电
 			}
 			String rq = map2.get("rq").toString();
 			String line = "";
@@ -257,8 +265,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				nbbm=map2.get("nbbm_eq").toString();
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.00");
+			// 加注量与能耗保留两位小数
+			DecimalFormat df = new DecimalFormat("0.##");
 			// TODO Auto-generated method stub
 			// 当天DLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
@@ -281,8 +289,9 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				}
 			}
-			List<Jdl> jdlList=jdlRepository.JdlList(rq);
-			List<Jdl> jdlList_1=jdlRepository.JdlList_1(rq, gsbm, "-1");
+			List<Jdl> jdlList = jdlRepository.JdlList(rq);
+//			List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
+//			jdlList.addAll(jdlRepository.JdlList(rq));
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
 				listpb=listpbs;
@@ -360,41 +369,15 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 						//车辆总里程
 						double zlc =lcMap.get(map_.get("clZbh").toString());
 						//车辆总加电量
-						double zjzl = 0.0, zjzl_1 = 0.0;
-						for (int j = 0; j < ylxxList.size(); j++) {
-							Ylxxb ylxxb = ylxxList.get(j);
-							if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
-									&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
-								zjzl = Arith.add(zjzl, ylxxb.getJzl());
-							}
-						}
+						double zjzl = 0.0;
+						// 2022年12月20号要求不按车队导入，这之后导入的加注量将覆盖原加注量
 						for (int i = 0; i < jdlList.size(); i++) {
 							Jdl jdl=jdlList.get(i);
-							if(map_.get("clZbh").toString().equals(jdl.getNbbm()) 
-									&&clFgs.get(map_.get("clZbh").toString()).contains(jdl.getGsBm()+"_"+jdl.getFgsBm())){
-								zjzl = Arith.add(zjzl,jdl.getJdl());
+							if(map_.get("clZbh").toString().equals(jdl.getNbbm())){
+								zjzl = Arith.add(zjzl, jdl.getJdl());
 							}
 						}
-						int num = 0; // 2022年12月20号要求不按车队导入，这之后导入的加注量将覆盖原加注量
-						for (int i = 0; i < jdlList_1.size(); i++) {
-							Jdl jdl=jdlList_1.get(i);
-							if(map_.get("clZbh").toString().equals(jdl.getNbbm()) 
-									&&map_.get("company").toString().equals(jdl.getGsBm())){
-								zjzl_1 = Arith.add(zjzl_1,jdl.getJdl());
-								num++;
-							}
-						}
-						if(num > 0){
-							zjzl = zjzl_1;
-						}
-//						double clsh=0.0;
-//						if(shMap.get(map_.get("clZbh").toString())==null){
-//							clsh=0.0;
-//						}else{
-//							clsh=shMap.get(map_.get("clZbh").toString());
-//						}
-//						zjzl =Arith.sub(zjzl, clsh);
 						Double nextJzyl = 0.0;
 						for (int i = 0; i < listpb.size(); i++) {
 							Map<String, Object> map = listpb.get(i);
@@ -934,18 +917,26 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			String fgsdm,String xlbm,String nbbm,
 			String px) {
 		// TODO Auto-generated method stub
-		String sql="SELECT * FROM bsth_c_dlb  "
-				+ " where rq='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
-				+ " and fgsdm like '%"+fgsdm+"%'";
+		List<String> objList = new ArrayList<String>();
+		String sql="SELECT * FROM bsth_c_dlb "
+				+ " where rq = ? "
+				+ " and ssgsdm like ? "
+				+ " and fgsdm like ? ";
+		objList.add(rq);
+		objList.add('%' + gsdm + '%');
+		objList.add('%' + fgsdm + '%');
 		if(xlbm.equals("")){
-			sql+= " and xlbm like '%"+xlbm+"%' ";
+			sql+= " and xlbm like ? ";
+			objList.add('%' + xlbm + '%');
 		}else{
-			sql+= " and xlbm = '"+xlbm+"' ";
+			sql+= " and xlbm = ? ";
+			objList.add(xlbm);
 		}
-				
-		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
-		List<Dlb> list = jdbcTemplate.query(sql, new RowMapper<Dlb>() {
+		sql += "and nbbm like ? order by "+px+" asc ";
+		objList.add('%' + nbbm + '%');
+		
+		List<Dlb> list = jdbcTemplate.query(sql, objList.toArray(), new RowMapper<Dlb>() {
 			@Override
 			public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Dlb y = new Dlb();
@@ -1075,8 +1066,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		// TODO Auto-generated method stub
 		Map<String, List<Dlb>> mapList=new HashMap<String,List<Dlb>>();
 		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		// 保留两位小数
-		DecimalFormat df = new DecimalFormat("#.00");
+		// 加注量与能耗保留两位小数
+		DecimalFormat df = new DecimalFormat("0.##");
 		List<Dlb> dlbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
 		List<Dlb> dlbList_upd=new ArrayList<Dlb>(); 
 		List<Dlb> dlbList_del=new ArrayList<Dlb>(); 
@@ -1132,8 +1123,11 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				shMap.put(cl, Arith.add(sh, dlb.getSh()));
 			}
 		}
-		List<Jdl> jdlList=jdlRepository.JdlList(date);
-		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
+		List<Jdl> jdlList = jdlRepository.JdlList(date);
+//		List<Jdl> jdlList = jdlService.queryJdlByJdlReception(date, "");
+//		jdlList.addAll(jdlRepository.JdlList(date));
+		
+//		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
 		Map<String, Object> newMap_=new HashMap<String,Object>();
 		Map<String, Object> cMap=new HashMap<String, Object>();
 		List<Map<String, Object>> listpb_=listpbDc;
@@ -1148,19 +1142,10 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					double zlc =lcMap.get(map_.get("clZbh").toString());
 					//车辆总加电量
 					double zjzl = 0.0;
-					for (int j = 0; j < ylxxList.size(); j++) {
-						Ylxxb ylxxb = ylxxList.get(j);
-						if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
-								&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
-							zjzl = Arith.add(zjzl, ylxxb.getJzl());
-						}
-					}
 					for (int i = 0; i < jdlList.size(); i++) {
 						Jdl jdl=jdlList.get(i);
-						if(map_.get("clZbh").toString().equals(jdl.getNbbm()) 
-								&&map_.get("company").toString().equals(jdl.getGsBm())
-								&&map_.get("bCompany").toString().equals(jdl.getFgsBm())){
-							zjzl = Arith.add(zjzl,jdl.getJdl());
+						if(map_.get("clZbh").toString().equals(jdl.getNbbm())){
+							zjzl = Arith.add(zjzl, jdl.getJdl());
 						}
 					}
 					double clsh=0.0;