加油量加电量保留三位小数；充电量导入格式变更，不再覆盖，提供详细查询、批量删除功能；

# Conflicts: # src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/resources/static/pages/electricity/jdl/list.html

加油量加电量保留三位小数；充电量导入格式变更，不再覆盖，提供详细查询、批量删除功能；
# Conflicts: # src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/resources/static/pages/electricity/jdl/list.html
娄高锋
1 parent a2699ffb
Showing 14 changed files with 1761 additions and 1227 deletions
src/main/java/com/bsth/controller/oil/JdlController.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
src/main/java/com/bsth/data/maintenance_plan/MtPlanDataLoadThread.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/JdlReception.java
src/main/java/com/bsth/entity/oil/Qlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/oil/JdlReceptionRepository.java
src/main/java/com/bsth/service/oil/JdlService.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
src/main/java/com/bsth/service/oil/impl/QlbServiceImpl.java
@@ -2,6 +2,7 @@ package com.bsth.controller.oil;
  
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
  
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@ 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.JdlReception;
 import com.bsth.service.oil.JdlService;
 import com.google.common.io.Files;
  
@@ -46,9 +48,46 @@ 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) 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);
+		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);
+	}
+	
 }
-package com.bsth.data.directive;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.SystemParamCache;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.stereotype.Component;
-
-/**
- * @author PanZhao
- * @ClassName: GatewayHttpUtils
- * @Description: TODO(和网关HTTP通讯工具类)
- * @date 2016年8月14日 下午9:50:46
- */
-@Component
-public class GatewayHttpUtils implements InitializingBean {
-    static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
-
-    static String url;
-    static CloseableHttpClient httpClient = null;
-    static HttpPost post;
-    static RequestConfig requestConfig;
-    static CloseableHttpResponse response;
-
-    public static int postJson(String jsonStr) {
-        logger.info("send : " + jsonStr);
-
-        int code = -1;
-        try {
-            post.setEntity(new StringEntity(jsonStr, "utf-8"));
-
-            response = httpClient.execute(post);
-
-            int statusCode = response.getStatusLine().getStatusCode();
-            if(statusCode != 200){
-                logger.error("http client status code: " + statusCode);
-            }
-
-            JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
-            if (null != json && json.getInteger("errCode") == 0)
-                code = 0;
-            else
-                logger.error("和网关http通讯失败，rs: " + json);
-
-            if (null != response)
-                response.close();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        return code;
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        url = SystemParamCache.getUrlHttpDirective();
-        httpClient = HttpClients.createDefault();
-        post = new HttpPost(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(3000).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(3000).build();
-        post.setConfig(requestConfig);
-    }
-}
+package com.bsth.data.directive;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.SystemParamCache;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author PanZhao
+ * @ClassName: GatewayHttpUtils
+ * @Description: TODO(和网关HTTP通讯工具类)
+ * @date 2016年8月14日 下午9:50:46
+ */
+@Component
+public class GatewayHttpUtils implements InitializingBean {
+    static Logger logger = LoggerFactory.getLogger(GatewayHttpUtils.class);
+
+    static String url;
+    static CloseableHttpClient httpClient = null;
+    static HttpPost post;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+
+    public static int postJson(String jsonStr) {
+        logger.info("send : " + jsonStr);
+
+        int code = -1;
+        try {
+            post.setEntity(new StringEntity(jsonStr, "utf-8"));
+
+            response = httpClient.execute(post);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                logger.error("http client status code: " + statusCode);
+            }
+
+            JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
+            if (null != json && json.getInteger("errCode") == 0)
+                code = 0;
+            else
+                logger.error("和网关http通讯失败，rs: " + json);
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return code;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = SystemParamCache.getUrlHttpDirective();
+        httpClient = HttpClients.createDefault();
+        post = new HttpPost(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(3000).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(3000).build();
+        post.setConfig(requestConfig);
+    }
+}
-package com.bsth.data.gpsdata_v2.load;
-
-import com.alibaba.fastjson.JSON;
-import com.bsth.data.BasicData;
-import com.bsth.data.SystemParamCache;
-import com.bsth.data.gpsdata_v2.GpsRealData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 从网关http 接口加载数据
- * Created by panzhao on 2017/11/15.
- */
-@Component
-public class GatewayHttpLoader implements ApplicationContextAware, InitializingBean {
-
-    static Logger logger = LoggerFactory.getLogger(GatewayHttpLoader.class);
-
-    static String url;
-    static List<GpsEntity> list;
-    static CloseableHttpClient httpClient = null;
-    static HttpGet get;
-    static RequestConfig requestConfig;
-    static CloseableHttpResponse response;
-    static HttpEntity entity;
-    static BufferedReader br;
-
-    static GpsRealData gpsRealData;
-
-    public static List<GpsEntity> load(){
-        try{
-            if(list.size() > 0)
-                list.clear();
-
-            response = httpClient.execute(get);
-            entity = response.getEntity();
-
-            logger.info("entity:" + entity + "get:" + get);
-            if(null == entity)
-                return list;
-
-            br = new BufferedReader(new InputStreamReader(entity.getContent()));
-
-            StringBuilder sb = new StringBuilder();
-            String str;
-            while ((str = br.readLine()) != null)
-                sb.append(str);
-
-            logger.debug("gps:" + sb.toString());
-            list = JSON.parseArray(JSON.parseObject(sb.toString()).getString("data"), GpsEntity.class);
-            //过滤掉无效的点位
-            list = GpsDataUtils.clearInvalid(list);
-
-            List<GpsEntity> ups = new ArrayList<>();
-            String nbbm;
-            for (GpsEntity gps : list) {
-                if (StringUtils.isBlank(gps.getDeviceId()))
-                    continue;
-
-                if (gps_equals(gpsRealData.get(gps.getDeviceId()), gps))
-                    continue;
-
-                nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
-                gps.setNbbm(nbbm);
-                ups.add(gps);
-            }
-            list = ups;
-
-            if (null != response)
-                response.close();
-        }catch (Exception e){
-            logger.error("", e);
-        }
-        return list;
-    }
-
-
-    private static boolean gps_equals(GpsEntity old, GpsEntity gps){
-        if(old != null &&
-                old.getTimestamp().equals(gps.getTimestamp()) &&
-                old.getLat().equals(gps.getLat()) &&
-                old.getLon().equals(gps.getLon()))
-            return true;
-        return false;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        gpsRealData = applicationContext.getBean(GpsRealData.class);
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        url = SystemParamCache.getUrlHttpGpsReal();
-        list = new ArrayList<>();
-        httpClient = HttpClients.createDefault();
-        get = new HttpGet(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(2500).build();
-        get.setConfig(requestConfig);
-    }
-}
+package com.bsth.data.gpsdata_v2.load;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.BasicData;
+import com.bsth.data.SystemParamCache;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 从网关http 接口加载数据
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class GatewayHttpLoader implements ApplicationContextAware, InitializingBean {
+
+    static Logger logger = LoggerFactory.getLogger(GatewayHttpLoader.class);
+
+    static String url;
+    static List<GpsEntity> list;
+    static CloseableHttpClient httpClient = null;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    static GpsRealData gpsRealData;
+
+    public static List<GpsEntity> load(){
+        try{
+            if(list.size() > 0)
+                list.clear();
+
+            response = httpClient.execute(get);
+            entity = response.getEntity();
+
+            logger.info("entity:" + entity + "get:" + get);
+            if(null == entity)
+                return list;
+
+            br = new BufferedReader(new InputStreamReader(entity.getContent()));
+
+            StringBuilder sb = new StringBuilder();
+            String str;
+            while ((str = br.readLine()) != null)
+                sb.append(str);
+
+            logger.debug("gps:" + sb.toString());
+            list = JSON.parseArray(JSON.parseObject(sb.toString()).getString("data"), GpsEntity.class);
+            //过滤掉无效的点位
+            list = GpsDataUtils.clearInvalid(list);
+
+            List<GpsEntity> ups = new ArrayList<>();
+            String nbbm;
+            for (GpsEntity gps : list) {
+                if (StringUtils.isBlank(gps.getDeviceId()))
+                    continue;
+
+                if (gps_equals(gpsRealData.get(gps.getDeviceId()), gps))
+                    continue;
+
+                nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                gps.setNbbm(nbbm);
+                ups.add(gps);
+            }
+            list = ups;
+
+            if (null != response)
+                response.close();
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return list;
+    }
+
+
+    private static boolean gps_equals(GpsEntity old, GpsEntity gps){
+        if(old != null &&
+                old.getTimestamp().equals(gps.getTimestamp()) &&
+                old.getLat().equals(gps.getLat()) &&
+                old.getLon().equals(gps.getLon()))
+            return true;
+        return false;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        gpsRealData = applicationContext.getBean(GpsRealData.class);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = SystemParamCache.getUrlHttpGpsReal();
+        list = new ArrayList<>();
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
+        get.setConfig(requestConfig);
+    }
+}
-package com.bsth.data.gpsdata_v2.load;
-
-import com.alibaba.fastjson.JSON;
-import com.bsth.data.BasicData;
-import com.bsth.data.SystemParamCache;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 从专用的socket client 加载数据
- * Created by panzhao on 2017/11/15.
- */
-@Component
-public class SocketClientLoader implements InitializingBean {
-
-    static Logger logger = LoggerFactory.getLogger(SocketClientLoader.class);
-
-    static String url;
-    static List<GpsEntity> list;
-    static CloseableHttpClient httpClient = null;
-    static HttpGet get;
-    static RequestConfig requestConfig;
-    static CloseableHttpResponse response;
-    static HttpEntity entity;
-    static BufferedReader br;
-
-    public static List<GpsEntity> load(){
-        try {
-            if(list.size() > 0)
-                list.clear();
-            logger.info("load start...");
-            response = httpClient.execute(get);
-            entity = response.getEntity();
-            if(null == entity)
-                return list;
-
-            br = new BufferedReader(new InputStreamReader(entity.getContent()));
-            StringBuilder sb = new StringBuilder();
-            String str;
-            while ((str = br.readLine()) != null)
-                sb.append(str);
-
-            list = JSON.parseArray(sb.toString(), GpsEntity.class);
-
-            logger.info("load end ! size: " + list.size());
-            //过滤掉无效的点位
-            list = GpsDataUtils.clearInvalid(list);
-
-            for (GpsEntity gps : list) {
-                gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
-            }
-
-            if (null != response)
-                response.close();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-
-        return list;
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        url = SystemParamCache.getUrlHttpGpsRealCache();
-        list = new ArrayList<>();
-        httpClient = HttpClients.createDefault();
-        get = new HttpGet(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                .setSocketTimeout(2500).build();
-        get.setConfig(requestConfig);
-    }
-}
+package com.bsth.data.gpsdata_v2.load;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.BasicData;
+import com.bsth.data.SystemParamCache;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.utils.GpsDataUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 从专用的socket client 加载数据
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class SocketClientLoader implements InitializingBean {
+
+    static Logger logger = LoggerFactory.getLogger(SocketClientLoader.class);
+
+    static String url;
+    static List<GpsEntity> list;
+    static CloseableHttpClient httpClient = null;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    public static List<GpsEntity> load(){
+        try {
+            if(list.size() > 0)
+                list.clear();
+            logger.info("load start...");
+            response = httpClient.execute(get);
+            entity = response.getEntity();
+            if(null == entity)
+                return list;
+
+            br = new BufferedReader(new InputStreamReader(entity.getContent()));
+            StringBuilder sb = new StringBuilder();
+            String str;
+            while ((str = br.readLine()) != null)
+                sb.append(str);
+
+            list = JSON.parseArray(sb.toString(), GpsEntity.class);
+
+            logger.info("load end ! size: " + list.size());
+            //过滤掉无效的点位
+            list = GpsDataUtils.clearInvalid(list);
+
+            for (GpsEntity gps : list) {
+                gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+            }
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return list;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = SystemParamCache.getUrlHttpGpsRealCache();
+        list = new ArrayList<>();
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
+        get.setConfig(requestConfig);
+    }
+}
-package com.bsth.data.maintenance_plan;
-
-import com.bsth.data.SystemParamCache;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import javax.net.ssl.*;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 维修保养计划
- * @author Hill
- */
-@Component
-public class MtPlanDataLoadThread extends Thread implements InitializingBean {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private String url = SystemParamCache.getUrlHttpMaintenance();
-    private CloseableHttpClient httpClient;
-    private RequestConfig requestConfig;
-    private CloseableHttpResponse response;
-    private HttpEntity entity;
-    private BufferedReader br;
-
-    private final static String HTTPS = "https://";
-
-    private SSLConnectionSocketFactory sslConnectionSocketFactory;
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    public CloseableHttpClient defaultHttpClient(String url) {
-        if (url.startsWith(HTTPS)) {
-            return HttpClients.custom().setSSLSocketFactory(sslConnectionSocketFactory).build();
-        }
-        return HttpClients.createDefault();
-    }
-
-    @Override
-    public void run() {
-        logger.warn("维修保养计划获取数据开始");
-        List<MaintenancePlan> list;
-        StringBuilder sb = new StringBuilder(url);
-        try {
-            HttpGet get = new HttpGet(sb.append("?date=").append(new DateTime().toString("yyyy-MM-dd")).toString());
-            get.setConfig(requestConfig);
-            response = httpClient.execute(get);
-
-            int statusCode = response.getStatusLine().getStatusCode();
-            if(statusCode != 200){
-                logger.error("http client status code: " + statusCode);
-            }
-
-            entity = response.getEntity();
-            if (null != entity) {
-                br = new BufferedReader(new InputStreamReader(entity.getContent()));
-                StringBuffer stringBuffer = new StringBuffer();
-                String str = "";
-                while ((str = br.readLine()) != null) {
-                    stringBuffer.append(str);
-                }
-
-                //stringBuffer = new StringBuffer("{\"result\": [{\"gsmc\": \"杨高公司\", \"zbh\": \"S01-002\", \"bysj\": 1663171200000, \"bydj\": \"一级保养\", \"bydd\": \"成山路\"}], \"msg\": \"成功\", \"code\": \"200\", \"success\": true}");
-                Map map = objectMapper.readValue(stringBuffer.toString(), Map.class);
-                list = objectMapper.readValue(objectMapper.writeValueAsString(map.get("result")), objectMapper.getTypeFactory().constructParametricType(List.class, MaintenancePlan.class));
-
-                for (MaintenancePlan sd : list) {
-                    MtPlanCenter.put(sd);
-                }
-            }
-
-            if (null != response)
-                response.close();
-        } catch (Exception e) {
-            logger.error("维修保养计划接口报错了", e);
-        }
-        logger.warn("维修保养计划获取数据结束");
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        try {
-            SSLContext sslCtx = SSLContext.getInstance("TLSv1.2");
-            sslCtx.init(null, new TrustManager[] {
-                    new X509TrustManager() {
-                        @Override
-                        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
-                        }
-
-                        @Override
-                        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
-                        }
-
-                        @Override
-                        public X509Certificate[] getAcceptedIssuers() {
-                            return null;
-                        }
-                    }
-            }, null);
-            sslConnectionSocketFactory = new SSLConnectionSocketFactory(sslCtx, new HostnameVerifier() {
-
-                @Override
-                public boolean verify(String hostname, SSLSession session) {
-                    // TODO Auto-generated method stub
-                    return true;
-                }
-            });
-        } catch (Exception e) {
-            logger.error("SSL context set fail: {}", e);
-        }
-
-        httpClient = defaultHttpClient(url);
-
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(5500).setConnectionRequestTimeout(5000)
-                .setSocketTimeout(5500).build();
-    }
-}
+package com.bsth.data.maintenance_plan;
+
+import com.bsth.data.SystemParamCache;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.net.ssl.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 维修保养计划
+ * @author Hill
+ */
+@Component
+public class MtPlanDataLoadThread extends Thread implements InitializingBean {
+
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private String url = SystemParamCache.getUrlHttpMaintenance();
+    private CloseableHttpClient httpClient;
+    private RequestConfig requestConfig;
+    private CloseableHttpResponse response;
+    private HttpEntity entity;
+    private BufferedReader br;
+
+    private final static String HTTPS = "https://";
+
+    private SSLConnectionSocketFactory sslConnectionSocketFactory;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    public CloseableHttpClient defaultHttpClient(String url) {
+        if (url.startsWith(HTTPS)) {
+            return HttpClients.custom().setSSLSocketFactory(sslConnectionSocketFactory).build();
+        }
+        return HttpClients.createDefault();
+    }
+
+    @Override
+    public void run() {
+        logger.warn("维修保养计划获取数据开始");
+        List<MaintenancePlan> list;
+        StringBuilder sb = new StringBuilder(url);
+        try {
+            HttpGet get = new HttpGet(sb.append("?date=").append(new DateTime().toString("yyyy-MM-dd")).toString());
+            get.setConfig(requestConfig);
+            response = httpClient.execute(get);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                logger.error("http client status code: " + statusCode);
+            }
+
+            entity = response.getEntity();
+            if (null != entity) {
+                br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null) {
+                    stringBuffer.append(str);
+                }
+
+                //stringBuffer = new StringBuffer("{\"result\": [{\"gsmc\": \"杨高公司\", \"zbh\": \"S01-002\", \"bysj\": 1663171200000, \"bydj\": \"一级保养\", \"bydd\": \"成山路\"}], \"msg\": \"成功\", \"code\": \"200\", \"success\": true}");
+                Map map = objectMapper.readValue(stringBuffer.toString(), Map.class);
+                list = objectMapper.readValue(objectMapper.writeValueAsString(map.get("result")), objectMapper.getTypeFactory().constructParametricType(List.class, MaintenancePlan.class));
+
+                for (MaintenancePlan sd : list) {
+                    MtPlanCenter.put(sd);
+                }
+            }
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("维修保养计划接口报错了", e);
+        }
+        logger.warn("维修保养计划获取数据结束");
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        try {
+            SSLContext sslCtx = SSLContext.getInstance("TLSv1.2");
+            sslCtx.init(null, new TrustManager[] {
+                    new X509TrustManager() {
+                        @Override
+                        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+                        }
+
+                        @Override
+                        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+                        }
+
+                        @Override
+                        public X509Certificate[] getAcceptedIssuers() {
+                            return null;
+                        }
+                    }
+            }, null);
+            sslConnectionSocketFactory = new SSLConnectionSocketFactory(sslCtx, new HostnameVerifier() {
+
+                @Override
+                public boolean verify(String hostname, SSLSession session) {
+                    // TODO Auto-generated method stub
+                    return true;
+                }
+            });
+        } catch (Exception e) {
+            logger.error("SSL context set fail: {}", e);
+        }
+
+        httpClient = defaultHttpClient(url);
+
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(5500).setConnectionRequestTimeout(5000)
+                .setSocketTimeout(5500).build();
+    }
+}
-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(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `station_name` varchar(255) DEFAULT NULL COMMENT '站点名称',
+  `connector_id` 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 '总计充电时间（分钟）',
+  `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 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 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 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 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;
+	}
+	
+	
+}
+package com.bsth.repository.oil;
+
+import java.util.Date;
+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 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 create_by, create_date order by create_date" ,nativeQuery=true)
+	List<Object[]> queryBatch(String rq);
+	
+	@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);
+	
+	@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);
+	
+}
 package com.bsth.service.oil;
  
 import java.io.File;
+import java.util.List;
 import java.util.Map;
  
 import com.bsth.entity.oil.Jdl;
+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);
  
 	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);
+	
+	/**
+	 * 查询车辆充电量，以jdl表格式返回
+	 * @param rq	营运日期
+	 * @param nbbm	车辆自编号（为‘’时查询全部车辆）
+	 * @return
+	 */
+	public List<Jdl> queryJdlByJdlReception(String rq, String nbbm);
  
 }
@@ -39,12 +39,14 @@ import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.oil.CdlRepository;
 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.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;
@@ -67,6 +69,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
  
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
+	@Autowired
+	JdlService jdlService;
  
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -95,13 +99,13 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 //		 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信息
 		List<Dlb> dlList=repository.obtainDl(rq, "", "", line, "", "nbbm");
 		//当天加电信息表
-		List<Jdl> jdlList=jdlRepository.JdlList(rq);
+		List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
 		//前一天所有车辆最后进场班次信息
 //		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
@@ -240,7 +244,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.00");
+			DecimalFormat df = new DecimalFormat("#.000");
 			// TODO Auto-generated method stub
 			// 当天DLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
@@ -261,19 +265,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				}
 			}
  
-//			Map<String, Double> shMap=new HashMap<String,Double>();
-//			for (int i = 0; i < dlList.size(); i++) {
-//				Dlb dlb=dlList.get(i);
-//				String cl=dlb.getNbbm();
-//				if(shMap.get(cl)==null){
-//					shMap.put(cl, dlb.getSh());
-//				}else{
-//					double sh=shMap.get(cl);
-//					shMap.remove(cl);
-//					shMap.put(cl, Arith.add(sh, dlb.getSh()));
-//				}
-//			}
-			List<Jdl> jdlList=jdlRepository.JdlList(rq);
+			List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
 				listpb=listpbs;
@@ -330,21 +322,15 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 						double zlc =lcMap.get(map_.get("clZbh").toString());
 						//车辆总加电量
 						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()) 
-									&&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;
-//						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);
@@ -1026,7 +1012,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		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("#.000");
 		List<Dlb> dlbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
 		List<Dlb> dlbList_upd=new ArrayList<Dlb>(); 
 		List<Dlb> dlbList_del=new ArrayList<Dlb>(); 
@@ -1082,7 +1068,7 @@ 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<Jdl> jdlList = jdlService.queryJdlByJdlReception(date, "");
 		Map<String, Object> newMap_=new HashMap<String,Object>();
 		Map<String, Object> cMap=new HashMap<String, Object>();
 		List<Map<String, Object>> listpb_=listpbDc;
@@ -1099,10 +1085,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					double zjzl = 0.0;
 					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;
@@ -3,6 +3,7 @@ package com.bsth.service.oil.impl;
 import java.io.File;
 import java.io.FileInputStream;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -19,8 +20,13 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.JdlReception;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.oil.JdlReceptionRepository;
 import com.bsth.repository.oil.JdlRepository;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.JdlService;
 import com.bsth.util.ReportUtils;
@@ -30,6 +36,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
  
 	@Autowired
 	JdlRepository repository;
+	
+	@Autowired
+	JdlReceptionRepository jdlReceptionRepository;
  
 	@Override
 	public String importExcel(File file, String gsbm, String gsName, String fgsbm, String fgsName) {
@@ -152,5 +161,240 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 		}
 		return modelMap;
 	}
+
+	@Override
+	public String importExcel_2412(File file, String gsbm, String gsName, String fgsbm, String fgsName) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat ddFormat = new SimpleDateFormat("dd");
+		DecimalFormat df = new DecimalFormat("######0.00");
+		SysUser user = SecurityUtils.getCurrentUser();
+		Date currDate = new Date();
+		List<String> textList = new ArrayList<String>();
+		try {
+			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
+			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			HSSFSheet sheet = wb.getSheetAt(0);
+			// 取得总行数
+			int rowNum = sheet.getLastRowNum() + 1;
+			// 取得总列数
+			int cellNum = sheet.getRow(0).getLastCellNum();
+			HSSFRow row = null;
+			HSSFCell cell = null;
+			for(int i = 3; i < rowNum; i++){
+				row = sheet.getRow(i);
+				if (row == null){
+					continue;
+				}
+				String text = "";
+				for(int j = 0; j < cellNum; j++){
+					cell = row.getCell(j);
+					if(cell == null){
+						text += ",";
+						continue;
+					}
+						text += String.valueOf(cell) + ",";
+				}
+				String[] split = (text+";").split(",");
+				String str = "";
+				for(int j = 0; j < split.length && j < 12; j++){
+					str += split[j];
+				}
+				if(str.trim().length() == 0)
+					continue;
+				textList.add(text + ";");
+			}
+			List<JdlReception> list = new ArrayList<JdlReception>();
+			for(int i = 0; i < textList.size(); i++){
+				String text = textList.get(i);
+				String[] split = text.split(",");
+				if(split[1] != null && split[1].trim().length() > 0){
+					Integer dd = Integer.valueOf(split[1].trim().split("\\.")[0]);	// 日期
+					String zh = split[2].trim();	// 桩号
+					String nbbm = split[3].trim();	// 车号
+					String startTime = split[4].trim();	// 开始时间
+					String endTime = split[5].trim();	// 结束时间
+					String sumTime = split[6].trim();	// 总计（分钟）
+					String startSoc = split[7].trim();	// 起始电量SOC%
+					String endSoc = split[8].trim();	// 结束电量SOC%
+					String jdl = split[9].trim();	// 充电度数
+					String lc = split[10].trim();	// 里程度数
+					String stopReason = split[11].trim();	// 一次不能正常充电记录
+					JdlReception jdlRe = new JdlReception();
+					Date date = sd.parse(startTime);
+					if(!(dd == Integer.valueOf(ddFormat.format(date)))){
+						date.setTime(date.getTime() - 1l*1000*60*60*24);
+					}
+					jdlRe.setDateStr(sdf.format(date));
+					jdlRe.setConnectorId(zh);
+					jdlRe.setCarCode(nbbm);
+					jdlRe.setStartTime(startTime);
+					jdlRe.setEndTime(endTime);
+					jdlRe.setSumTime(Integer.valueOf(sumTime.split("\\.")[0]));
+					jdlRe.setStartSoc(Double.valueOf(startSoc));
+					jdlRe.setEndSoc(Double.valueOf(endSoc));
+					jdlRe.setChargeCapacity(Double.valueOf(jdl));
+					jdlRe.setStopReason(stopReason);
+					jdlRe.setCreateBy(user.getUserName());
+					jdlRe.setCreateDate(currDate);
+					jdlRe.setOrigin(1);
+					list.add(jdlRe);
+				}
+			}
+			jdlReceptionRepository.saveAll(list);
+			wb.close();
+			fs.close();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return "文件导入失败";
+		} finally {
+			file.delete();
+		}
+		return "文件导入成功";
+	}
+
+	@Override
+	public Map<String, Object> query_2412(Map<String, Object> map) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		String rq = map.get("rq").toString();
+		String nbbm = map.get("nbbm").toString();
+		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
+		List<Jdl> query = new ArrayList<Jdl>();
+		
+		List<Object[]> querySum = jdlReceptionRepository.querySum(rq, nbbm);
+		
+		try {
+			for(Object[] j : querySum){
+				Jdl jdl = new Jdl();
+				jdl.setRq(sdfMonth.parse(j[0].toString()));
+				jdl.setNbbm(j[1].toString());
+				jdl.setJdl(Double.valueOf(j[2].toString()));
+				jdl.setJdz("");
+				jdl.setRemarks("");
+				query.add(jdl);
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		if(!map.containsKey("type")){
+			
+			int end = (page+1)*10>query.size()?query.size():(page+1)*10;
+			modelMap.put("dataList", query.subList(page*10, end));
+			modelMap.put("totalPages", query.size()%10>0?query.size()/10+1:query.size()/10);
+			
+		} else if(map.get("type").toString().equals("export")){
+			
+			List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+			for(Jdl jdl : query){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("rq", sdfMonth.format(jdl.getRq()));
+				m.put("nbbm", jdl.getNbbm());
+				m.put("jdl", jdl.getJdl());
+				m.put("jdz", jdl.getJdz());
+				m.put("remarks", jdl.getRemarks());
+				list.add(m);
+			}
+			
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/export_Jdl.xls",
+						path+"export/车辆充电量" + sdfSimple.format(sdfMonth.parse(rq)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return modelMap;
+	}
+
+	@Override
+	public List<JdlReception> queryJdlReception(Map<String, Object> map) {
+		String rq = map.get("rq").toString();
+		String nbbm = map.get("nbbm").toString();
+		List<JdlReception> query = jdlReceptionRepository.query(rq, nbbm);
+		return query;
+	}
+
+	@Override
+	public Map<String, Object> queryJdlReceptionBatch(Map<String, Object> map) {
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd");
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		String rq = map.get("rq").toString();
+		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
+		List<Map<String, Object>> query = new ArrayList<Map<String, Object>>();
+		
+		List<Object[]> queryBatch = jdlReceptionRepository.queryBatch(rq);
+		
+		try {
+			for(Object[] j : queryBatch){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("createBy", j[0]);
+				m.put("createDate", j[1]);
+				query.add(m);
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		int end = (page+1)*10>query.size()?query.size():(page+1)*10;
+		modelMap.put("dataList", query.subList(page*10, end));
+		modelMap.put("totalPages", query.size()%10>0?query.size()/10+1:query.size()/10);
+			
+		return modelMap;
+	}
+
+	@Override
+	public List<JdlReception> queryJdlReceptionBatchData(Map<String, Object> map) {
+		String createBy = map.get("createBy").toString();
+		String createDate = map.get("createDate").toString();
+		List<JdlReception> query = jdlReceptionRepository.queryBatchData(createBy, createDate);
+		return query;
+	}
+
+	@Override
+	public Map<String, Object> deleteJdlReceptionBatch(Map<String, Object> map) {
+		Map<String, Object> resMap = new HashMap<>();
+		try{
+			String createBy = map.get("createBy").toString();
+			String createDate = map.get("createDate").toString();
+			jdlReceptionRepository.deleteBatch(createBy, createDate);
+			resMap.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			resMap.put("status", ResponseCode.ERROR);
+			resMap.put("msg", e.getMessage());
+		}
+		return resMap;
+	}
+
+	@Override
+	public List<Jdl> queryJdlByJdlReception(String rq, String nbbm) {
+		List<Jdl> list = new ArrayList<Jdl>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		List<JdlReception> query = jdlReceptionRepository.query(rq, nbbm);
+		for(JdlReception jr : query){
+			try {
+				Jdl jdl = new Jdl();
+				jdl.setFgsBm("-1");
+				jdl.setRq(sdf.parse(jr.getDateStr()));
+				jdl.setJdl(jr.getChargeCapacity());
+				jdl.setNbbm(jr.getCarCode());
+				list.add(jdl);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return list;
+	}
  
 }
@@ -91,7 +91,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
 //		 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>();
 		//当天QLB信息
@@ -227,7 +227,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.00");
+			DecimalFormat df = new DecimalFormat("#.000");
 			// TODO Auto-generated method stub
 			// 当天QLB信息
 			List<Qlb> qlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
@@ -980,7 +980,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
 		Map<String, List<Qlb>> mapList=new HashMap<String,List<Qlb>>();
 		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 		// 保留两位小数
-		DecimalFormat df = new DecimalFormat("#.00");
+		DecimalFormat df = new DecimalFormat("#.000");
 		List<Qlb> qlbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
 		List<Qlb> qlbList_upd=new ArrayList<Qlb>(); 
 		List<Qlb> qlbList_del=new ArrayList<Qlb>();