车辆充电量：excel导入异常报错提示；枪和桩分开字段；添加批次号；去掉一次不能正常充电记录；添加修改；保存导入文件并提供下载；导入的分钟数做2分钟内误差校验。

娄高锋
1 parent 21ed093b
Showing 11 changed files with 439 additions and 106 deletions
src/main/java/com/bsth/controller/oil/JdlController.java
src/main/java/com/bsth/entity/oil/JdlReception.java
src/main/java/com/bsth/repository/oil/JdlReceptionRepository.java
src/main/java/com/bsth/repository/oil/NylogRepository.java
src/main/java/com/bsth/service/oil/JdlService.java
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/static/pages/electricity/jdl/jdlReception.html
src/main/resources/static/pages/electricity/jdl/jdlReceptionBatch.html
src/main/resources/static/pages/electricity/jdl/jdlReceptionBatchData.html
src/main/resources/static/pages/electricity/jdl/upload_2412.html
@@ -5,17 +5,15 @@ 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.JdlReception;
@@ -90,4 +88,14 @@ public class JdlController extends BaseController&lt;Jdl, Integer&gt; {
 		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);
+	}
+	
 }
@@ -31,6 +31,7 @@ import org.springframework.format.annotation.DateTimeFormat;
   `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 '修改人',
@@ -60,6 +61,8 @@ public class JdlReception {
 	private String dateStr;
 	private Integer origin;
 	private Integer sumTime;
+	private String batchNo;
+	private String pileId;
 	private String createBy;
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createDate;
@@ -182,6 +185,18 @@ public class JdlReception {
 	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 getCreateBy() {
 		return createBy;
 	}
 package com.bsth.repository.oil;
-import java.util.Date;
 import java.util.List;
 import org.springframework.data.jpa.repository.Modifying;
@@ -20,7 +19,7 @@ public interface JdlReceptionRepository extends BaseRepository&lt;JdlReception, Int
 	@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)
+	@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 * 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)
@@ -31,4 +30,20 @@ public interface JdlReceptionRepository extends BaseRepository&lt;JdlReception, Int
 	@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.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.JdlReception;
 import com.bsth.service.BaseService;
@@ -27,6 +30,10 @@ public interface JdlService extends BaseService&lt;Jdl, Integer&gt; {
 	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	营运日期
 package com.bsth.service.oil.impl;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.text.DecimalFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -12,24 +16,31 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 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.oil.Nylog;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.oil.JdlReceptionRepository;
 import com.bsth.repository.oil.JdlRepository;
+import com.bsth.repository.oil.NylogRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.JdlService;
 import com.bsth.util.ReportUtils;
+import com.google.common.io.Files;
 @Service
 public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements JdlService {
@@ -39,6 +50,12 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	@Autowired
 	JdlReceptionRepository jdlReceptionRepository;
+	
+	@Autowired
+	NylogRepository nylogRepository;
+
+    @Value("${electricity.importFile.path}")
+    private String elecImportFilePath;
 	@Override
 	public String importExcel(File file, String gsbm, String gsName, String fgsbm, String fgsName) {
@@ -168,13 +185,17 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	@Override
 	public String importExcel_2412(File file, String gsbm, String gsName, String fgsbm, String fgsName) {
+		SimpleDateFormat yearMonthFormat = new SimpleDateFormat("yyyy-MM");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat SSSformat = new SimpleDateFormat("yyMMddHHmmssSS");
 		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>();
+		String batchNo = user.getUserName() + SSSformat.format(currDate);
+		String msg = "";
 		try {
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(file));
 			HSSFWorkbook wb = new HSSFWorkbook(fs);
@@ -197,7 +218,12 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 						text += ",";
 						continue;
 					}
+					if(cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC && HSSFDateUtil.isCellDateFormatted(cell)){
+						Date dateCellValue = cell.getDateCellValue();
+						text += sd.format(dateCellValue) + ",";
+					} else {
 						text += String.valueOf(cell) + ",";
+					}
 				}
 				String[] split = (text+";").split(",");
 				String str = "";
@@ -208,54 +234,102 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 					continue;
 				textList.add(text + ";");
 			}
+			String str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 			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);
+				if(split.length > 4 && split[1] != null && split[1].trim().length() > 0 && 
+						split[3] != null && split[3].trim().length() > 0){
+					int lie = 1;
+					try {
+						Integer dd = Integer.valueOf(split[lie++].trim().split("\\.")[0]);	// 日期
+						String zh = split[lie++].trim();	// 桩号
+						String nbbm = split[lie++].trim();	// 车号
+						String startTime = split[lie++].trim();	// 开始时间
+						String endTime = split[lie++].trim();	// 结束时间
+						String sumTime = split[lie++].trim();	// 总计（分钟）
+						String startSoc = split[lie++].trim();	// 起始电量SOC%
+						String endSoc = split[lie++].trim();	// 结束电量SOC%
+						String jdl = split[lie++].trim();	// 充电度数
+						String lc = split[lie++].trim();	// 里程度数
+						String stopReason = split[lie++].trim();	// 一次不能正常充电记录
+						
+						sumTime = sumTime.split("\\.")[0];
+						
+						Date parseStartTime = sd.parse(startTime);
+						Date parseEndTime = sd.parse(endTime);
+						long sub = ((parseEndTime.getTime() - parseStartTime.getTime()) / (1l*1000*60)) - Long.valueOf(sumTime);
+						if(sub > 2 || sub < -2){
+							msg += System.lineSeparator() + "文档第"+(i + 4)+"行，充电时间总计分钟数（"+sumTime+"）误差超过2分钟；";
+						}
+						
+						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.setBatchNo(batchNo);
+						jdlRe.setDateStr(sdf.format(date));
+						jdlRe.setPileId(zh);
+						jdlRe.setCarCode(nbbm);
+						jdlRe.setStartTime(startTime);
+						jdlRe.setEndTime(endTime);
+						jdlRe.setSumTime(Integer.valueOf(sumTime));
+						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);
+					} catch (Exception e) {
+						// TODO: handle exception
+						e.printStackTrace();
+						msg += System.lineSeparator() + "文档第"+(i + 4)+"行第"+str.charAt(lie)+"列，格式错误或无法识别；";
 					}
-					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();
+			if(msg.length() > 0){
+				return "文件导入失败" + msg;
+			} else {
+				jdlReceptionRepository.saveAll(list);
+				return "文件导入成功，" + "导入了" + list.size() + "条充电量。";
+			}
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			return "文件导入失败";
 		} finally {
-			file.delete();
+//			file.delete();
+			try {
+				String yearMonthPath = yearMonthFormat.format(currDate);
+				File elecImportFile = new File(elecImportFilePath + File.separator + yearMonthPath);
+				if(!elecImportFile.exists()){
+					elecImportFile.mkdirs();
+				}
+				String path = file.getPath();
+				System.out.println(path);
+				String[] split = file.getName().split("\\.");
+				String suffix = split[split.length - 1];
+				Files.move(file, new File(elecImportFilePath + File.separator + yearMonthPath + File.separator + batchNo + "." + suffix));
+				Nylog nylog=new Nylog();
+				nylog.setCreatedate(currDate);
+				nylog.setNylx("电");
+				nylog.setCzmc("导入");
+				nylog.setUserid(user.getUserName());
+				nylog.setUsername(user.getName());
+				nylog.setCxtj(batchNo);
+				nylog.setFwdz(yearMonthPath + File.separator + batchNo + "." + suffix);
+				nylogRepository.save(nylog);
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
-		return "文件导入成功";
 	}
 	@Override
@@ -341,8 +415,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 		try {
 			for(Object[] j : queryBatch){
 				Map<String, Object> m = new HashMap<String, Object>();
-				m.put("createBy", j[0]);
-				m.put("createDate", j[1]);
+				m.put("batchNo", j[0]);
+				m.put("createBy", j[1]);
+				m.put("createDate", j[2]);
 				query.add(m);
 			}
 		} catch (Exception e) {
@@ -381,6 +456,88 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	}
 	@Override
+	public Map<String, Object> updateJdlReceptionBatch(Map<String, Object> map) {
+		Map<String, Object> resMap = new HashMap<>();
+		try{
+			String[] ids = map.get("ids").toString().length()>0?map.get("ids").toString().split(","):new String[]{};
+			String[] dateStr = map.get("dateStr").toString().length()>0?map.get("dateStr").toString().split(","):new String[]{};
+			String[] pileId = map.get("pileId").toString().length()>0?map.get("pileId").toString().split(","):new String[]{};
+			String[] carCode = map.get("carCode").toString().length()>0?map.get("carCode").toString().split(","):new String[]{};
+			String[] startTime = map.get("startTime").toString().length()>0?map.get("startTime").toString().split(","):new String[]{};
+			String[] endTime = map.get("endTime").toString().length()>0?map.get("endTime").toString().split(","):new String[]{};
+			String[] sumTime = map.get("sumTime").toString().length()>0?map.get("sumTime").toString().split(","):new String[]{};
+			String[] startSoc = map.get("startSoc").toString().length()>0?map.get("startSoc").toString().split(","):new String[]{};
+			String[] endSoc = map.get("endSoc").toString().length()>0?map.get("endSoc").toString().split(","):new String[]{};
+			String[] chargeCapacity = map.get("chargeCapacity").toString().length()>0?map.get("chargeCapacity").toString().split(","):new String[]{};
+			String[] stopReason = map.get("stopReason").toString().length()>0?map.get("stopReason").toString().split(","):new String[]{};
+			List<JdlReception> list = new ArrayList<JdlReception>();
+			for(int i = 0; i < ids.length; i++){
+				if(ids[i].length() != 0){
+					JdlReception jdlRe = new JdlReception();
+					jdlRe.setId(Long.valueOf(ids[i]));
+					if(dateStr.length > i)
+						jdlRe.setDateStr(dateStr[i]);
+					if(pileId.length > i)
+						jdlRe.setPileId(pileId[i]);
+					if(carCode.length > i)
+						jdlRe.setCarCode(carCode[i]);
+					if(startTime.length > i)
+						jdlRe.setStartTime(startTime[i]);
+					if(endTime.length > i)
+						jdlRe.setEndTime(endTime[i]);
+					if(sumTime.length > i)
+						jdlRe.setSumTime(Integer.valueOf(sumTime[i]));
+					if(startSoc.length > i)
+						jdlRe.setStartSoc(Double.valueOf(startSoc[i]));
+					if(endSoc.length > i)
+						jdlRe.setEndSoc(Double.valueOf(endSoc[i]));
+					if(chargeCapacity.length > i)
+						jdlRe.setChargeCapacity(Double.valueOf(chargeCapacity[i]));
+					if(stopReason.length > i)
+						jdlRe.setStopReason(stopReason[i]);
+					
+					list.add(jdlRe);
+				}
+			}
+			for(JdlReception jdlRe : list){
+				jdlReceptionRepository.update(jdlRe.getId(), jdlRe.getDateStr(), jdlRe.getPileId(), jdlRe.getCarCode(),
+						jdlRe.getStartTime(), jdlRe.getEndTime(), jdlRe.getSumTime(), jdlRe.getStartSoc(), jdlRe.getEndSoc(),
+						jdlRe.getChargeCapacity(), jdlRe.getStopReason());
+			}
+			resMap.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			resMap.put("status", ResponseCode.ERROR);
+			resMap.put("msg", e.getMessage());
+		}
+		return resMap;
+	}
+
+	@Override
+	public void downloadJdlReceptionImportFile(Map<String, Object> map, HttpServletResponse response) throws IOException {
+		String batchNo = map.get("batchNo").toString();
+		List<Nylog> list = nylogRepository.selectByCxtj("电", "导入", batchNo);
+		if(list.size() > 0){
+			Nylog nylog = list.get(0);
+			String path = elecImportFilePath + File.separator + nylog.getFwdz();
+			String[] split = nylog.getFwdz().split("\\.");
+			String fileName = batchNo + "." + split[split.length - 1];
+			File file = new File(path);
+			InputStream fis = new BufferedInputStream(new FileInputStream(path));
+			byte[] buffer = new byte[fis.available()];
+			fis.read(buffer);
+			fis.close();
+			response.reset();
+			response.addHeader("Content-Disposition", "attachment;filename=" + new String(fileName.replaceAll(" ", "").getBytes("utf-8"),"iso8859-1"));
+			response.addHeader("Content-Length", "" + file.length());
+			OutputStream os = new BufferedOutputStream(response.getOutputStream());
+			response.setContentType("application/octet-stream");
+			os.write(buffer);// 输出文件
+			os.flush();
+			os.close();
+		}
+	}
+
+	@Override
 	public List<Jdl> queryJdlByJdlReception(String rq, String nbbm) {
 		List<Jdl> list = new ArrayList<Jdl>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-server.port=9088
-
-# dubbo\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\u00FF\uFFFD\uFFFD\uFFFDflag
-dubbo.use=false
-
-#JPA
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-spring.jpa.database= MYSQL
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= false
-spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
-
-#DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.103:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-spring.datasource.username= root
-spring.datasource.password= fsodlgjiuigAQF2$9fs9
-spring.datasource.type= com.zaxxer.hikari.HikariDataSource
-
-#DATASOURCE SETTING
-spring.datasource.hikari.minimum-idle= 8
-spring.datasource.hikari.maximum-pool-size= 100
-#spring.datasource.hikari.auto-commit= true
-spring.datasource.hikari.idle-timeout= 60000
-#spring.datasource.hikari.pool-name= HikariPool
-spring.datasource.hikari.max-lifetime= 1800000
-spring.datasource.hikari.connection-timeout= 3000
-spring.datasource.hikari.connection-test-query= SELECT 1
-spring.datasource.hikari.validation-timeout= 3000
-spring.datasource.hikari.register-mbeans=true
-
-sso.enabled= true
-sso.systemcode = SYSUS023
-sso.http.url.login= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.logout= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/checkToken
-
-dc.imgurl= /home/control/klimg
-dc.profile= profile
+server.port=9088
+
+# dubbo\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\u00FF\uFFFD\uFFFD\uFFFDflag
+dubbo.use=false
+
+#JPA
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
+spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+spring.jpa.database= MYSQL
+spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
+spring.jpa.show-sql= false
+spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
+
+#DATABASE
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://10.10.150.103:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= fsodlgjiuigAQF2$9fs9
+spring.datasource.type= com.zaxxer.hikari.HikariDataSource
+
+#DATASOURCE SETTING
+spring.datasource.hikari.minimum-idle= 8
+spring.datasource.hikari.maximum-pool-size= 100
+#spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 60000
+#spring.datasource.hikari.pool-name= HikariPool
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 3000
+spring.datasource.hikari.connection-test-query= SELECT 1
+spring.datasource.hikari.validation-timeout= 3000
+spring.datasource.hikari.register-mbeans=true
+
+sso.enabled= true
+sso.systemcode = SYSUS023
+sso.http.url.login= http://10.10.200.142:9112/login?redirect=%2Findex
+sso.http.url.logout= http://10.10.200.142:9112/login?redirect=%2Findex
+sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/checkToken
+
+dc.imgurl= /home/control/klimg
+dc.profile= profile
+
+electricity.importFile.path= /home/control/elecImportFile
@@ -30,7 +30,9 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms_2">
 						<thead>
 							<tr>
-								<td style="min-width: 170px">桩号、枪号</td>
+								<td style="min-width: 170px">批次号</td>
+								<td style="min-width: 80px">桩号</td>
+								<td style="min-width: 170px">枪号</td>
 								<td>车号</td>
 								<td>开始时间</td>
 								<td>结束时间</td>
@@ -38,7 +40,6 @@
 								<td>起始电量SOC（%）</td>
 								<td>结束电量SOC（%）</td>
 								<td>充电度数</td>
-								<td>一次不能正常充电记录</td>
 								<td>来源</td>
 							</tr>
 						</thead>
@@ -98,6 +99,8 @@
 <script type="text/html" id="jdlReception_tbody">
 	{{each list as obj i}}
 		<tr>
+		<td>{{obj.batchNo}}</td>
+		<td>{{obj.pileId}}</td>
 		<td>{{obj.connectorId}}</td>
 		<td>{{obj.carCode}}</td>
 		<td>{{obj.startTime}}</td>
@@ -106,7 +109,6 @@
 		<td>{{obj.startSoc}}</td>
 		<td>{{obj.endSoc}}</td>
 		<td>{{obj.chargeCapacity}}</td>
-		<td>{{obj.stopReason}}</td>
 		<td>{{obj.originName}}</td>
 		</tr>
 	{{/each}}
@@ -55,7 +55,8 @@
                         <tr role="row" class="heading">
                             <th>#</th>
                             <th>导入时间</th>
-                            <th colspan="2">处理人</th>
+                            <th colspan="">处理人</th>
+                            <th colspan="">批次号</th>
 							<td colspan="2">操作</td>
                         </tr>
                         </thead>
@@ -185,17 +186,20 @@
                 startOptJzylLink($('#jdlReceptionBatch_list .in_carpark_jzyl'));
                 $('.btn-ReceptionBatch').on('click', openReceptionBatchData);
-                $('.btn-ReceptionBatch-del').on('click', openReceptionBatchDataDel);
+                $('.btn-ReceptionBatch-upd').on('click', openReceptionBatchDataUpd);
+                $('.btn-ReceptionBatch-del').on('click', openReceptionBatchDataDel);
+                $('.btn-ReceptionBatch-export').on('click', openReceptionBatchDataExport);
             });
         }
 		function openReceptionBatchData(){
 			var id = $(this).data('date');
 			id += ","+$(this).data('by');
+			id += ",view";
 			$.get('/pages/electricity/jdl/jdlReceptionBatchData.html', function (content) {
 				layer.open({
 					type: 1,
-					area: ['1200px', '600px'],
+					area: ['1200px', '630px'],
 					content: content,
 					title: '充电量详细',
 					shift: 5,
@@ -207,6 +211,71 @@
 			});
 		}
+		function openReceptionBatchDataUpd(){
+			var id = $(this).data('date');
+			id += ","+$(this).data('by');
+			id += ",upd";
+			$.get('/pages/electricity/jdl/jdlReceptionBatchData.html', function (content) {
+				layer.open({
+					type: 1,
+					area: ['1200px', '660px'],
+					content: content,
+					title: '充电量详细修改',
+					shift: 5,
+					scrollbar: false,
+					success: function () {
+						$('#jdlReceptionBatchData').trigger('init', id);
+					},
+					btn:["保存", "取消"],
+					btn1: function(index, layero){
+						layer.msg('操作中...', {icon: 16, shade: 0.31});
+// 						console.log("jdlReceptionBatchData_tbody", $('#jdlReceptionBatchData_tbody').html());
+// 						var data = $('#jdlReceptionBatchData_tbody').serializeArray();
+// 						console.log(data);
+						var ids = "", dateStr = "", pileId = "", carCode = "", startTime = "", endTime = "", sumTime = "",
+								startSoc = "", endSoc = "", chargeCapacity = "", stopReason = "";
+						$('#jdlReceptionBatchData_tbody input').each(function(i, e){
+							var obj = $(e);
+							if("id" == obj.attr("name")){
+								ids += obj.val() + ",";
+							} else if("dateStr" == obj.attr("name")){
+								dateStr += obj.val() + ",";
+							} else if("pileId" == obj.attr("name")){
+								pileId += obj.val() + ",";
+							} else if("carCode" == obj.attr("name")){
+								carCode += obj.val() + ",";
+							} else if("startTime" == obj.attr("name")){
+								startTime += obj.val() + ",";
+							} else if("endTime" == obj.attr("name")){
+								endTime += obj.val() + ",";
+							} else if("sumTime" == obj.attr("name")){
+								sumTime += obj.val() + ",";
+							} else if("startSoc" == obj.attr("name")){
+								startSoc += obj.val() + ",";
+							} else if("endSoc" == obj.attr("name")){
+								endSoc += obj.val() + ",";
+							} else if("chargeCapacity" == obj.attr("name")){
+								chargeCapacity += obj.val() + ",";
+							} else if("stopReason" == obj.attr("name")){
+								stopReason += obj.val() + ",";
+							}
+						});
+						$post('/jdl/updateJdlReceptionBatch', {ids:ids,dateStr:dateStr,pileId:pileId,carCode:carCode,
+									startTime:startTime,endTime:endTime,sumTime:sumTime,
+									startSoc:startSoc,endSoc:endSoc,chargeCapacity:chargeCapacity,stopReason:stopReason}, function (rs) {
+							console.log(rs);
+							if(rs.status && rs.status == "SUCCESS"){
+								layer.msg('修改成功。');
+								layer.close(index);
+							} else {
+								layer.msg('操作失败，请检查内容是否有误。');
+							}
+						});
+					}
+				});
+			});
+		}
+		
 		function openReceptionBatchDataDel(){
 			var createDate = $(this).data('date');
 			var createBy = $(this).data('by');
@@ -219,6 +288,11 @@
 					$('.filter-submit.margin-bottom').trigger('click');
 				});
 			});
+		}
+		
+		function openReceptionBatchDataExport(){
+			var batchNo = $(this).data('batch');
+			window.open("/jdl/downloadJdlReceptionImportFile?batchNo=" + batchNo);
 		}
         //改变状态
@@ -356,13 +430,21 @@
 			{{i + 1}}
         </td>
         <td>{{obj.createDate}}</td>
-        <td colspan="2">{{obj.createBy}}</td>
+        <td colspan="">{{obj.createBy}}</td>
+        <td colspan="">{{obj.batchNo}}</td>
 		<td colspan="2">
 			<button class="btn btn-info btn-sm btn-ReceptionBatch" data-date="{{obj.createDate}}" data-by="{{obj.createBy}}">
 				<i class="fa fa-search"></i> 查看
 			</button>
+			<button class="btn blue-madison btn-sm btn-ReceptionBatch-upd" data-date="{{obj.createDate}}" data-by="{{obj.createBy}}">
+				<i class="fa fa-pencil"></i> 修改
+			</button>
 			<button class="btn btn-danger btn-sm red btn-ReceptionBatch-del" data-date="{{obj.createDate}}" data-by="{{obj.createBy}}">
 				<i class="fa fa-times"></i> 删除
+			</button>
+			&nbsp;
+			<button class="btn btn-circle btn-sm blue btn-ReceptionBatch-export" data-batch="{{obj.batchNo}}">
+				<i class="fa fa-file-excel-o"></i> 下载导入文件
 			</button>
 		</td>
     </tr>
@@ -16,16 +16,17 @@
 	   border-top: 1px solid; }
 </style>
-<div class="row" id="jdlReceptionBatchData">
+<div id="jdlReceptionBatchData">
 	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
+<!-- 		<div class="portlet light porttlet-fit bordered"> -->
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 600px">
+				<div class="table-container" style="margin-top: 10px;width: 1180px;height: 550px;overflow:auto;">
 					<table class="table table-bordered table-hover table-checkable" id="forms_2">
 						<thead>
 							<tr>
+								<td style="min-width: 170px">批次号</td>
 								<td style="min-width: 90px">营运日期</td>
-								<td style="min-width: 60px">桩号、枪号</td>
+								<td style="min-width: 80px">桩号</td>
 								<td>车号</td>
 								<td>开始时间</td>
 								<td>结束时间</td>
@@ -33,18 +34,17 @@
 								<td>起始电量SOC（%）</td>
 								<td>结束电量SOC（%）</td>
 								<td>充电度数</td>
-								<td>一次不能正常充电记录</td>
-								<td>来源</td>
+<!-- 								<td>一次不能正常充电记录</td> -->
 							</tr>
 						</thead>
-						
-						<tbody>
+							
+						<tbody id="jdlReceptionBatchData_tbody">
 						</tbody>
 					</table>
 				</div>
 			</div>
-		</div>
+<!-- 		</div> -->
 	</div>
 </div>
 <script src="/pages/mforms/singledatas/jquery.table2excel.min.js"></script>
@@ -58,6 +58,7 @@
 		$("#jdlReceptionBatchData").on('init', function (e, id) {
 			date = id.split(",")[0];
 			by = id.split(",")[1];
+			type = id.split(",")[2];
 			var i = layer.load(2);
 			$get('/jdl/queryJdlReceptionBatchData',{createDate:date,createBy:by,type:'query'},function(result){
 				layer.close(i);
@@ -69,8 +70,17 @@
 						e.originName = "接口";
 					}
 				});
-				var jdlReceptionBatchData = template('jdlReceptionBatchData_tbody',{list:result});
-				$('#forms_2 tbody').html(jdlReceptionBatchData);
+				if(type == "upd"){
+					var jdlReceptionBatchDataUpd = template('jdlReceptionBatchData_tbody_upd',{list:result});
+					$('#forms_2 tbody').html(jdlReceptionBatchDataUpd);
+					$("input[name=dateStr]").datetimepicker({
+			            format: 'YYYY-MM-DD',
+			            locale: 'zh-cn'
+			        });
+				} else {
+					var jdlReceptionBatchData = template('jdlReceptionBatchData_tbody',{list:result});
+					$('#forms_2 tbody').html(jdlReceptionBatchData);
+				}
 			});
 		})
@@ -79,8 +89,9 @@
 <script type="text/html" id="jdlReceptionBatchData_tbody">
 	{{each list as obj i}}
 		<tr>
+		<td>{{obj.batchNo}}</td>
 		<td>{{obj.dateStr}}</td>
-		<td>{{obj.connectorId}}</td>
+		<td>{{obj.pileId}}</td>
 		<td>{{obj.carCode}}</td>
 		<td>{{obj.startTime}}</td>
 		<td>{{obj.endTime}}</td>
@@ -88,8 +99,29 @@
 		<td>{{obj.startSoc}}</td>
 		<td>{{obj.endSoc}}</td>
 		<td>{{obj.chargeCapacity}}</td>
-		<td>{{obj.stopReason}}</td>
-		<td>{{obj.originName}}</td>
+		<!-- <td>{{obj.stopReason}}</td> -->
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="jdlReceptionBatchData_tbody_upd">
+	{{each list as obj i}}
+		<tr>
+		<td>{{obj.batchNo}}<input type="hidden" name="id" value="{{obj.id}}"/></td>
+		<td><input type="text" name="dateStr" value="{{obj.dateStr}}"/></td>
+		<td><input type="text" name="pileId" value="{{obj.pileId}}"/></td>
+		<td><input type="text" name="carCode" value="{{obj.carCode}}"/></td>
+		<td><input type="text" name="startTime" value="{{obj.startTime}}"/></td>
+		<td><input type="text" name="endTime" value="{{obj.endTime}}"/></td>
+		<td><input type="text" name="sumTime" value="{{obj.sumTime}}"/></td>
+		<td><input type="text" name="startSoc" value="{{obj.startSoc}}"/></td>
+		<td><input type="text" name="endSoc" value="{{obj.endSoc}}"/></td>
+		<td><input type="text" name="chargeCapacity" value="{{obj.chargeCapacity}}"/></td>
+		<!-- <td><input type="text" name="stopReason" value="{{obj.stopReason}}"/></td> -->
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -81,7 +81,14 @@
 				},
 				error : function(data, status, e) {
 	                layer.close(j);
-					alert("文件导入失败");
+// 					alert("文件导入失败");
+					var resText = data.responseText;
+					if(data.responseText && data.responseText != ""){
+						resText = resText.slice(resText.indexOf('"result":"') + 10, resText.indexOf('"}'));
+						alert(resText);
+					} else {
+						alert("文件导入失败");
+					}
 				}
 			})
 		});