增加充电枪管理；充电量修改只能改充电度数；同车充电时间重叠提醒；同枪同时间两车重叠提醒；导入枪名关联出枪号、桩号；导入时选择场站；

娄高锋
1 parent ec705dfa
Showing 14 changed files with 1034 additions and 82 deletions
src/main/java/com/bsth/controller/oil/JdlController.java
src/main/java/com/bsth/entity/oil/JdlConnector.java
src/main/java/com/bsth/entity/oil/JdlReception.java
src/main/java/com/bsth/repository/oil/JdlConnectorRepository.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/resources/static/pages/electricity/connector/edit.html
src/main/resources/static/pages/electricity/connector/list.html
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
@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.JdlConnector;
 import com.bsth.entity.oil.JdlReception;
 import com.bsth.service.oil.JdlService;
 import com.google.common.io.Files;
@@ -49,12 +50,13 @@ public class JdlController extends BaseController&lt;Jdl, Integer&gt; {
 	/** 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{
+											String fgsbm_, String fgsName, String stationName) throws Exception{
         File newFile = new File(
         		getDataImportClasspath() + File.separator +
                         file.getOriginalFilename());
         Files.write(file.getBytes(), newFile);
-		String result = jdlService.importExcel_2412(newFile, gsbm_, gsName, fgsbm_, fgsName);
+        
+		String result = jdlService.importExcel_2412(newFile, gsbm_, gsName, fgsbm_, fgsName, stationName);
 		return "{\"result\":" + "\""+result+"\"}";
 	}
@@ -98,4 +100,34 @@ public class JdlController extends BaseController&lt;Jdl, Integer&gt; {
 		jdlService.downloadJdlReceptionImportFile(map, response);
 	}
+	@RequestMapping(value = "/queryJdlConnector",method = RequestMethod.GET)
+	public List<JdlConnector> queryJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.queryJdlConnector(map);
+	}
+	
+	@RequestMapping(value = "/queryJdlConnectorById",method = RequestMethod.GET)
+	public JdlConnector queryJdlConnectorById(@RequestParam int id) throws Exception{
+		return jdlService.queryJdlConnectorById(id);
+	}
+	
+	@RequestMapping(value = "/queryJdlStationName",method = RequestMethod.GET)
+	public List<String> queryJdlStationName() throws Exception{
+		return jdlService.queryJdlStationName();
+	}
+	
+	@RequestMapping(value = "/addJdlConnector",method = RequestMethod.POST)
+	public Map<String, Object> addJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.addJdlConnector(map);
+	}
+	
+	@RequestMapping(value = "/deleteJdlConnector",method = RequestMethod.POST)
+	public Map<String, Object> deleteJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.deleteJdlConnector(map);
+	}
+	
+	@RequestMapping(value = "/updateJdlConnector",method = RequestMethod.POST)
+	public Map<String, Object> updateJdlConnector(@RequestParam Map<String, Object> map) throws Exception{
+		return jdlService.updateJdlConnector(map);
+	}
+	
 }
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+--------------------------------------------------------
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `connector_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '充电枪名称',
+  `connector_id` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '充电枪自编号',
+  `station_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '充电站名称',
+  `remark` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+  `create_by` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
+  `update_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+*/
+@Entity
+@Table(name = "bsth_c_jdl_connector")
+public class JdlConnector {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private	Integer id;
+	private String connectorName;
+	private String connectorId;
+	private String stationName;
+	private String remark;
+	private String createBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createDate;
+	private String updateBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateDate;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getConnectorName() {
+		return connectorName;
+	}
+	public void setConnectorName(String connectorName) {
+		this.connectorName = connectorName;
+	}
+	public String getConnectorId() {
+		return connectorId;
+	}
+	public void setConnectorId(String connectorId) {
+		this.connectorId = connectorId;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getCreateBy() {
+		return createBy;
+	}
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public String getUpdateBy() {
+		return updateBy;
+	}
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	
+}
 \ No newline at end of file
@@ -15,6 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
   `station_name` varchar(255) DEFAULT NULL COMMENT '站点名称',
   `connector_id` varchar(255) DEFAULT NULL COMMENT '枪编号',
+  `connector_name` varchar(255) DEFAULT NULL COMMENT '充电枪名',
   `order_no` varchar(255) DEFAULT NULL COMMENT '订单编号',
   `start_time` varchar(255) DEFAULT NULL COMMENT '充电开始时间',
   `end_time` varchar(255) DEFAULT NULL COMMENT '充电结束时间',
@@ -45,6 +46,7 @@ public class JdlReception {
 	private	Long id;
 	private String stationName;
 	private String connectorId;
+	private String connectorName;
 	private String orderNo;
 	private String startTime;
 	private String endTime;
@@ -63,6 +65,7 @@ public class JdlReception {
 	private Integer sumTime;
 	private String batchNo;
 	private String pileId;
+	private String remark;
 	private String createBy;
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createDate;
@@ -89,6 +92,12 @@ public class JdlReception {
 	public void setConnectorId(String connectorId) {
 		this.connectorId = connectorId;
 	}
+	public String getConnectorName() {
+		return connectorName;
+	}
+	public void setConnectorName(String connectorName) {
+		this.connectorName = connectorName;
+	}
 	public String getOrderNo() {
 		return orderNo;
 	}
@@ -197,6 +206,12 @@ public class JdlReception {
 	public void setPileId(String pileId) {
 		this.pileId = pileId;
 	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 	public String getCreateBy() {
 		return createBy;
 	}
+package com.bsth.repository.oil;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.JdlConnector;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface JdlConnectorRepository extends BaseRepository<JdlConnector, Integer>{
+	
+	@Query(value="SELECT j FROM JdlConnector j WHERE connectorName like %?1% and connectorId like %?2% and stationName like %?3% order by stationName, connectorId ")
+	List<JdlConnector> query(String connectorName, String connectorId, String stationName);
+	
+	@Query(value="SELECT j FROM JdlConnector j WHERE connectorName = ?1 ")
+	List<JdlConnector> queryByGunName(String connectorName);
+	
+	@Query(value="SELECT j FROM JdlConnector j WHERE id = ?1 ")
+	JdlConnector queryById(Integer id);
+	
+	@Query(value="SELECT j.stationName FROM JdlConnector j group by stationName ")
+	List<String> queryStationName();
+	
+	@Modifying
+	@Transactional
+	@Query(value = "delete JdlConnector j where id = ?1 ")
+	void delete(Integer id);
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_jdl_connector SET " +
+				" connector_name = ?2," +
+				" connector_id = ?3," +
+				" station_name = ?4" +
+				" WHERE id = ?1 ", nativeQuery=true)
+	public void update(Integer id, String connectorName, String connectorId, String stationName);
+	
+}
@@ -22,9 +22,21 @@ public interface JdlReceptionRepository extends BaseRepository&lt;JdlReception, Int
 	@Query(value="SELECT batch_no, create_by, DATE_FORMAT(create_date, '%Y-%m-%d %H:%i:%s') create_date FROM bsth_c_jdl_reception where DATE_FORMAT(create_date, '%Y-%m-%d') = ?1 and origin = 1 group by batch_no, create_by, create_date order by batch_no" ,nativeQuery=true)
 	List<Object[]> queryBatch(String rq);
+	@Query(value="SELECT batch_no, create_by, DATE_FORMAT(create_date, '%Y-%m-%d %H:%i:%s') create_date FROM bsth_c_jdl_reception where DATE_FORMAT(create_date, '%Y-%m-%d') >= ?1 and DATE_FORMAT(create_date, '%Y-%m-%d') <= ?2 and create_by like %?3% and origin = 1 group by batch_no, create_by, create_date order by create_date, create_by, batch_no" ,nativeQuery=true)
+	List<Object[]> queryBatchByDates(String rq1, String rq2, String createBy);
+	
 	@Query(value="SELECT * FROM bsth_c_jdl_reception where create_by = ?1 and DATE_FORMAT(create_date, '%Y-%m-%d %H:%i:%s') = ?2 and origin = 1 " ,nativeQuery=true)
 	List<JdlReception> queryBatchData(String createBy, String createDate);
+	@Query(value="SELECT j FROM JdlReception j WHERE id = ?1 ")
+	List<JdlReception> queryById(Long id);
+	
+	@Query(value="SELECT j FROM JdlReception j WHERE endTime >= ?1 and startTime <= ?2 and carCode = ?3 ")
+	List<JdlReception> queryRepeatCar(String startTime, String endTime, String nbbm);
+	
+	@Query(value="SELECT j FROM JdlReception j WHERE endTime >= ?1 and startTime <= ?2 and connectorId = ?3 and carCode != ?4 ")
+	List<JdlReception> queryRepeatConnector(String startTime, String endTime, String connectorId, String nbbm);
+	
 	@Modifying
 	@Transactional
 	@Query(value = "delete JdlReception j where createBy = ?1 and DATE_FORMAT(createDate, '%Y-%m-%d %H:%i:%s') = ?2 and origin = 1")
@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.JdlConnector;
 import com.bsth.entity.oil.JdlReception;
 import com.bsth.service.BaseService;
@@ -16,7 +17,7 @@ public interface JdlService extends BaseService&lt;Jdl, Integer&gt; {
 	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 String importExcel_2412(File file, String gsbm_, String gsName, String fgsbm, String fgsName, String stationName);
 	public Map<String, Object> query(Map<String, Object> map);
@@ -42,4 +43,16 @@ public interface JdlService extends BaseService&lt;Jdl, Integer&gt; {
 	 */
 	public List<Jdl> queryJdlByJdlReception(String rq, String nbbm);
+	public List<JdlConnector> queryJdlConnector(Map<String, Object> map);
+	
+	public JdlConnector queryJdlConnectorById(Integer id);
+	
+	public List<String> queryJdlStationName();
+	
+	public Map<String, Object> addJdlConnector(Map<String, Object> map);
+	
+	public Map<String, Object> deleteJdlConnector(Map<String, Object> map);
+	
+	public Map<String, Object> updateJdlConnector(Map<String, Object> map);
+	
 }
@@ -117,8 +117,9 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		//当天YLXXB信息
 		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
 		//当天加电信息表
-		List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
-		jdlList.addAll(jdlRepository.JdlList(rq));
+		List<Jdl> jdlList = jdlRepository.JdlList(rq);
+//		List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
+//		jdlList.addAll(jdlRepository.JdlList(rq));
 		//前一天所有车辆最后进场班次信息
 //		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
@@ -288,8 +289,9 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				}
 			}
-			List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
-			jdlList.addAll(jdlRepository.JdlList(rq));
+			List<Jdl> jdlList = jdlRepository.JdlList(rq);
+//			List<Jdl> jdlList = jdlService.queryJdlByJdlReception(rq, "");
+//			jdlList.addAll(jdlRepository.JdlList(rq));
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
 				listpb=listpbs;
@@ -915,18 +917,26 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			String fgsdm,String xlbm,String nbbm,
 			String px) {
 		// TODO Auto-generated method stub
-		String sql="SELECT * FROM bsth_c_dlb  "
-				+ " where rq='"+rq+"' and ssgsdm like '%"+gsdm+"%' "
-				+ " and fgsdm like '%"+fgsdm+"%'";
+		List<String> objList = new ArrayList<String>();
+		String sql="SELECT * FROM bsth_c_dlb "
+				+ " where rq = ? "
+				+ " and ssgsdm like ? "
+				+ " and fgsdm like ? ";
+		objList.add(rq);
+		objList.add('%' + gsdm + '%');
+		objList.add('%' + fgsdm + '%');
 		if(xlbm.equals("")){
-			sql+= " and xlbm like '%"+xlbm+"%' ";
+			sql+= " and xlbm like ? ";
+			objList.add('%' + xlbm + '%');
 		}else{
-			sql+= " and xlbm = '"+xlbm+"' ";
+			sql+= " and xlbm = ? ";
+			objList.add(xlbm);
 		}
-				
-		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
-		List<Dlb> list = jdbcTemplate.query(sql, new RowMapper<Dlb>() {
+		sql += "and nbbm like ? order by "+px+" asc ";
+		objList.add('%' + nbbm + '%');
+		
+		List<Dlb> list = jdbcTemplate.query(sql, objList.toArray(), new RowMapper<Dlb>() {
 			@Override
 			public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Dlb y = new Dlb();
@@ -1113,8 +1123,10 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				shMap.put(cl, Arith.add(sh, dlb.getSh()));
 			}
 		}
-		List<Jdl> jdlList = jdlService.queryJdlByJdlReception(date, "");
-		jdlList.addAll(jdlRepository.JdlList(date));
+		List<Jdl> jdlList = jdlRepository.JdlList(date);
+//		List<Jdl> jdlList = jdlService.queryJdlByJdlReception(date, "");
+//		jdlList.addAll(jdlRepository.JdlList(date));
+		
 //		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 0,gsdm);
 		Map<String, Object> newMap_=new HashMap<String,Object>();
 		Map<String, Object> cMap=new HashMap<String, Object>();
@@ -7,6 +7,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -30,9 +32,11 @@ import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.JdlConnector;
 import com.bsth.entity.oil.JdlReception;
 import com.bsth.entity.oil.Nylog;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.oil.JdlConnectorRepository;
 import com.bsth.repository.oil.JdlReceptionRepository;
 import com.bsth.repository.oil.JdlRepository;
 import com.bsth.repository.oil.NylogRepository;
@@ -52,6 +56,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	JdlReceptionRepository jdlReceptionRepository;
 	@Autowired
+	JdlConnectorRepository jdlConnectorRepository;
+	
+	@Autowired
 	NylogRepository nylogRepository;
     @Value("${electricity.importFile.path}")
@@ -184,13 +191,14 @@ 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) {
+	public String importExcel_2412(File file, String gsbm, String gsName, String fgsbm, String fgsName, String stationName) {
 		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");
+		DecimalFormat df = new DecimalFormat("0.00");
+		df.setRoundingMode(RoundingMode.HALF_UP); // 设置为四舍五入的进位方式
 		SysUser user = SecurityUtils.getCurrentUser();
 		Date currDate = new Date();
 		List<String> textList = new ArrayList<String>();
@@ -232,8 +240,21 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				}
 				if(str.trim().length() == 0)
 					continue;
-				textList.add(text + ";");
+				textList.add(text);
 			}
+			
+			List<JdlConnector> connectorList = jdlConnectorRepository.query("", "", stationName);
+			Map<String, JdlConnector> connectorNameMap = new HashMap<String, JdlConnector>();
+			Map<String, JdlConnector> connectorIdMap = new HashMap<String, JdlConnector>();
+			for(JdlConnector c : connectorList){
+				connectorNameMap.put(c.getConnectorName(), c);
+				connectorIdMap.put(c.getConnectorId(), c);
+			}
+			
+			// 校验车辆充电时间冲突的临时对象。
+			Map<String, List<JdlReception>> repeatCarMap = new HashMap<String, List<JdlReception>>();
+			Map<String, List<JdlReception>> repeatConnectorMap = new HashMap<String, List<JdlReception>>();
+			
 			String str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 			List<JdlReception> list = new ArrayList<JdlReception>();
 			for(int i = 0; i < textList.size(); i++){
@@ -243,35 +264,56 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 						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();	// 一次不能正常充电记录
+						Integer dd = Integer.valueOf(split[lie].trim().split("\\.")[0]);	// 日期
+						lie++;String gun = split[lie].trim().split("\\.")[0];	// 充电枪
+						lie++;String nbbm = split[lie].trim();	// 车号
+						lie++;String startTime = split[lie].trim();	// 开始时间
+						lie++;String endTime = split[lie].trim();	// 结束时间
+						lie++;String sumTime = split[lie].trim();	// 总计（分钟）
+						lie++;String startSoc = split[lie].trim();	// 起始电量SOC%
+						lie++;String endSoc = split[lie].trim();	// 结束电量SOC%
+						lie++;String jdl = split[lie].trim();	// 充电度数
+						String lc = "", stopReason = "";
+						lie++;
+						if(split.length > lie)
+							lc = split[lie].trim();	// 里程读数
+						lie++;
+						if(split.length > lie)
+						stopReason = split[lie].trim();	// 一次不能正常充电记录
 						sumTime = sumTime.split("\\.")[0];
 						Date parseStartTime = sd.parse(startTime);
 						Date parseEndTime = sd.parse(endTime);
+						if(parseStartTime.getTime() > parseEndTime.getTime()){
+							msg += System.lineSeparator() + "文档第"+(i + 4)+"行，充电结束时间小于开始时间；";
+							continue;
+						}
 						long sub = ((parseEndTime.getTime() - parseStartTime.getTime()) / (1l*1000*60)) - Long.valueOf(sumTime);
 						if(sub > 2 || sub < -2){
 							msg += System.lineSeparator() + "文档第"+(i + 4)+"行，充电时间总计分钟数（"+sumTime+"）误差超过2分钟；";
 						}
+						if(!connectorNameMap.containsKey(gun) && !connectorIdMap.containsKey(gun)){
+							msg += System.lineSeparator() + "文档第"+(i + 4)+"行，充电枪无法识别或不在库中；";
+							
+						}
+						JdlConnector jdlConnector = connectorNameMap.containsKey(gun) ? connectorNameMap.get(gun)
+								: (connectorIdMap.containsKey(gun) ? connectorIdMap.get(gun) : new JdlConnector());
+						
 						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);
 						}
+						
+						jdl = df.format(new BigDecimal(jdl)); // 用Double或float总有各种格样的问题，这里直接用BigDecimal；也可以直接用BigDecimal做四舍五入
+						
 						jdlRe.setBatchNo(batchNo);
 						jdlRe.setDateStr(sdf.format(date));
-						jdlRe.setPileId(zh);
+						jdlRe.setConnectorName(jdlConnector.getConnectorName());
+						jdlRe.setConnectorId(jdlConnector.getConnectorId());
+						jdlRe.setStationName(jdlConnector.getStationName());
 						jdlRe.setCarCode(nbbm);
 						jdlRe.setStartTime(startTime);
 						jdlRe.setEndTime(endTime);
@@ -279,10 +321,74 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 						jdlRe.setStartSoc(Double.valueOf(startSoc));
 						jdlRe.setEndSoc(Double.valueOf(endSoc));
 						jdlRe.setChargeCapacity(Double.valueOf(jdl));
+						jdlRe.setRemark(lc); // 里程读数目前用不到，暂时放到备注字段里。
 						jdlRe.setStopReason(stopReason);
 						jdlRe.setCreateBy(user.getUserName());
 						jdlRe.setCreateDate(currDate);
 						jdlRe.setOrigin(1);
+						
+						List<JdlReception> queryRepeatCar = jdlReceptionRepository.queryRepeatCar(startTime, endTime, nbbm);
+						if(queryRepeatCar.size() > 0){
+							msg += System.lineSeparator() + "文档第"+(i + 4)+"行，车号("+nbbm+")充电时间与库中同车号存在重叠；";
+							
+						} else if(repeatCarMap.containsKey(nbbm)){
+							Long startTimeLong = parseStartTime.getTime();
+							Long endTimeLong = parseEndTime.getTime();
+							List<JdlReception> JdlReceptionList = repeatCarMap.get(nbbm);
+							boolean flag = false;
+							for(JdlReception temp : JdlReceptionList){
+								Long tempStartTime = sd.parse(temp.getStartTime()).getTime();
+								Long tempEndTime = sd.parse(temp.getEndTime()).getTime();
+								if(startTimeLong <= tempEndTime && endTimeLong >= tempStartTime){
+									msg += System.lineSeparator() + "文档第"+(i + 4)+"行，车号("+nbbm+")充电时间与文档中同车号存在重叠；";
+									flag = true;
+									break; // 判断重叠直接跳过，不需要再查询一次sql
+								}
+							}
+							if(flag){
+								repeatCarMap.get(nbbm).add(jdlRe);
+								list.add(jdlRe);
+							}
+						}
+						if(!repeatCarMap.containsKey(nbbm)){
+							repeatCarMap.put(nbbm, new ArrayList<JdlReception>());
+						}
+						repeatCarMap.get(nbbm).add(jdlRe);
+						
+						
+						String connectorId = jdlConnector.getConnectorId();
+						if(connectorId != null){
+							List<JdlReception> queryRepeatConnector = jdlReceptionRepository.queryRepeatConnector(startTime, endTime, connectorId, nbbm);
+							if(queryRepeatConnector.size() > 0){
+								msg += System.lineSeparator() + "文档第"+(i + 4)+"行，充电枪("+jdlConnector.getConnectorName()+")充电时间与库中其他车辆存在重叠；";
+								
+							} else if(repeatConnectorMap.containsKey(connectorId)){
+								Long startTimeLong = parseStartTime.getTime();
+								Long endTimeLong = parseEndTime.getTime();
+								List<JdlReception> JdlReceptionList = repeatConnectorMap.get(connectorId);
+								boolean flag = false;
+								for(JdlReception temp : JdlReceptionList){
+									if(temp.getConnectorId() != null && !connectorId.equals(temp.getConnectorId())){
+										Long tempStartTime = sd.parse(temp.getStartTime()).getTime();
+										Long tempEndTime = sd.parse(temp.getEndTime()).getTime();
+										if(startTimeLong <= tempEndTime && endTimeLong >= tempStartTime){
+											msg += System.lineSeparator() + "文档第"+(i + 4)+"行，充电枪("+jdlConnector.getConnectorName()+")充电时间与文档中其他车辆存在重叠；";
+											flag = true;
+											break; // 判断重叠直接跳过，不需要再查询一次sql
+										}
+									}
+								}
+								if(flag){
+									repeatCarMap.get(nbbm).add(jdlRe);
+									list.add(jdlRe);
+								}
+							}
+							if(!repeatConnectorMap.containsKey(nbbm)){
+								repeatConnectorMap.put(connectorId, new ArrayList<JdlReception>());
+							}
+							repeatConnectorMap.get(connectorId).add(jdlRe);
+						}
+						
 						list.add(jdlRe);
 					} catch (Exception e) {
 						// TODO: handle exception
@@ -406,11 +512,13 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	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();
+		String rq1 = map.get("rq1").toString();
+		String rq2 = map.get("rq2").toString();
+		String createBy = map.containsKey("createBy")?map.get("createBy").toString().trim():"";
 		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);
+		List<Object[]> queryBatch = jdlReceptionRepository.queryBatchByDates(rq1, rq2, createBy);
 		try {
 			for(Object[] j : queryBatch){
@@ -459,22 +567,23 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 	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[]{};
+			String[] ids = map.get("ids").toString().length()>0?map.get("ids").toString().split(","):new String[0];
+			String[] dateStr = map.get("dateStr").toString().length()>0?map.get("dateStr").toString().split(","):new String[0];
+			String[] pileId = map.get("pileId").toString().length()>0?map.get("pileId").toString().split(","):new String[0];
+			String[] carCode = map.get("carCode").toString().length()>0?map.get("carCode").toString().split(","):new String[0];
+			String[] startTime = map.get("startTime").toString().length()>0?map.get("startTime").toString().split(","):new String[0];
+			String[] endTime = map.get("endTime").toString().length()>0?map.get("endTime").toString().split(","):new String[0];
+			String[] sumTime = map.get("sumTime").toString().length()>0?map.get("sumTime").toString().split(","):new String[0];
+			String[] startSoc = map.get("startSoc").toString().length()>0?map.get("startSoc").toString().split(","):new String[0];
+			String[] endSoc = map.get("endSoc").toString().length()>0?map.get("endSoc").toString().split(","):new String[0];
+			String[] chargeCapacity = map.get("chargeCapacity").toString().length()>0?map.get("chargeCapacity").toString().split(","):new String[0];
+			String[] stopReason = map.get("stopReason").toString().length()>0?map.get("stopReason").toString().split(","):new String[0];
 			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]));
+//					JdlReception jdlRe = new JdlReception();
+//					jdlRe.setId(Long.valueOf(ids[i]));
+					JdlReception jdlRe = jdlReceptionRepository.queryById(Long.valueOf(ids[i])).get(0);
 					if(dateStr.length > i)
 						jdlRe.setDateStr(dateStr[i]);
 					if(pileId.length > i)
@@ -558,4 +667,98 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 		return list;
 	}
+
+	@Override
+	public List<JdlConnector> queryJdlConnector(Map<String, Object> map) {
+		String connectorName = "", connectorId = "", stationName = "";
+		if(map.containsKey("connectorName")){
+			connectorName = map.get("connectorName").toString();
+		}
+		if(map.containsKey("connectorId")){
+			connectorId = map.get("connectorId").toString();
+		}
+		if(map.containsKey("stationName")){
+			stationName = map.get("stationName").toString();
+		}
+		return jdlConnectorRepository.query(connectorName, connectorId, stationName);
+	}
+	
+	@Override
+	public JdlConnector queryJdlConnectorById(Integer id) {
+		return jdlConnectorRepository.queryById(id);
+	}
+	
+	@Override
+	public List<String> queryJdlStationName() {
+		List<String> queryStationName = jdlConnectorRepository.queryStationName();
+		return queryStationName;
+	}
+	
+	@Override
+	public Map<String, Object> addJdlConnector(Map<String, Object> map) {
+		Map<String, Object> resMap = new HashMap<>();
+		try {
+			JdlConnector jdlConnector = new JdlConnector();
+			if(map.containsKey("connectorName")){
+				jdlConnector.setConnectorName(map.get("connectorName").toString());
+			}
+			if(map.containsKey("connectorId")){
+				jdlConnector.setConnectorId(map.get("connectorId").toString());
+			}
+			if(map.containsKey("stationName")){
+				jdlConnector.setStationName(map.get("stationName").toString());
+			}
+			jdlConnectorRepository.save(jdlConnector);
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+			resMap.put("msg", "新建失败，可能缺少关键字段");
+		}
+		return resMap;
+	}
+	
+	@Override
+	public Map<String, Object> deleteJdlConnector(Map<String, Object> map) {
+		Map<String, Object> resMap = new HashMap<>();
+		try {
+			Integer id = Integer.valueOf(map.get("id").toString());
+			jdlConnectorRepository.delete(id);
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+			resMap.put("msg", "删除失败，可能缺少关键字段");
+		}
+		return resMap;
+	}
+	
+	@Override
+	public Map<String, Object> updateJdlConnector(Map<String, Object> map) {
+		Map<String, Object> resMap = new HashMap<>();
+		try {
+			Integer id = Integer.valueOf(map.get("id").toString());
+			JdlConnector jdlConnector = jdlConnectorRepository.queryById(id);
+			if(map.containsKey("connectorName")){
+				jdlConnector.setConnectorName(map.get("connectorName").toString());
+			}
+			if(map.containsKey("connectorId")){
+				jdlConnector.setConnectorId(map.get("connectorId").toString());
+			}
+			if(map.containsKey("stationName")){
+				jdlConnector.setStationName(map.get("stationName").toString());
+			}
+			jdlConnectorRepository.update(id, jdlConnector.getConnectorName(), jdlConnector.getConnectorId(), jdlConnector.getStationName());
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+			resMap.put("msg", "修改失败，可能缺少关键字段");
+		}
+		return resMap;
+	}
+	
 }
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	
+	.jdlConnectorValueTd {
+		width: 450px;
+	}
+	.jdlConnectorValueInput {
+		width: 320px;
+	}
+</style>
+
+<div id="jdlConnectorEdit">
+	<div class="col-md-12">
+<!-- 		<div class="portlet light porttlet-fit bordered"> -->
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px;width: 620px;height: 280px;overflow:auto;">
+					<table class="table table-bordered table-hover table-checkable" id="forms_2">
+						<thead>
+						</thead>
+							
+						<tbody id="jdlConnector_tbody">
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+<!-- 		</div> -->
+	</div>
+</div>
+<script src="/pages/mforms/singledatas/jquery.table2excel.min.js"></script>
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		var date = "";
+		var nbbm = "";
+		$("#jdlConnectorEdit").on('init', function (e, id) {
+			type = id.split(",")[1]; // 先取type，防止报错
+			id = id.split(",")[0];
+			var i = layer.load(2);
+			if(type == "add"){
+				var jdlConnectorEditAdd = template('jdlConnector_tbody_add',{obj:{}});
+				$('#forms_2 tbody').html(jdlConnectorEditAdd);
+				layer.close(i);
+			} else if(type == "upd"){
+				$get('/jdl/queryJdlConnectorById',{id:id,type:'query'},function(result){
+					layer.close(i);
+					$.each(result, function(i, e){
+//	 					console.log(e);
+						if(e.origin == 1){
+							e.originName = "导入";
+						} else {
+							e.originName = "接口";
+						}
+					});
+					
+					var jdlConnectorEditUpd = template('jdlConnector_tbody_upd',{obj:result});
+					$('#forms_2 tbody').html(jdlConnectorEditUpd);
+				});
+			}
+		})
+		
+	});
+	
+	function formatInputNumber(e){
+		// 获取输入值
+		var value = e.target.value;
+		var v = value.replace(/[^0-9.]/g, '');
+		if('\.' == v.charAt(0)){
+			v = '0' + v;
+		}
+		if(v.indexOf('\.') > 0){
+			var split = v.split('\.');
+			if(split[1].length > 0){
+				v = split[0] + '\.' + (split[1].substring(0, 2));
+			} else {
+				v = split[0] + '\.0';
+			}
+		}
+		// 更新输入框的值
+		e.target.value = v;
+	}
+</script>
+<script type="text/html" id="jdlConnector_tbody_add">
+	<tr>
+		<td>充电枪名称：</td>
+		<td><input type="text" class="jdlConnectorValueInput" name="connectorName"/></td>
+	</tr>
+	<tr>
+		<td>充电枪编号：</td>
+		<td><input type="text" class="jdlConnectorValueInput" name="connectorId"/></td>
+	</tr>
+	<tr>
+		<td>站名：</td>
+		<td><input type="text" class="jdlConnectorValueInput" name="stationName"/></td>
+	</tr>
+</script>
+<script type="text/html" id="jdlConnector_tbody_upd">
+	<tr>
+		<td>充电枪名称：<input type="hidden" name="id" value="{{obj.id}}"/></td>
+		<td class="jdlConnectorValueTd">
+			<input type="text" class="jdlConnectorValueInput" name="connectorName" value="{{obj.connectorName}}"/>
+		</td>
+	</tr>
+	<tr>
+		<td>充电枪编号：</td>
+		<td class="jdlConnectorValueTd">
+			<input type="text" class="jdlConnectorValueInput" name="connectorId" value="{{obj.connectorId}}"/>
+		</td>
+	</tr>
+	<tr>
+		<td>站名：</td>
+		<td class="jdlConnectorValueTd">
+			<input type="text" class="jdlConnectorValueInput" name="stationName" value="{{obj.stationName}}"/>
+		</td>
+	</tr>
+</script>
 \ No newline at end of file
+<style>
+.blue{
+	background-color: #87CEFF
+}
+</style>
+<div class="page-head">
+    <div class="page-title">
+        <h1>充电枪自编号</h1>
+    </div>
+</div>
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">能耗管理</span> <i class="fa fa-circle"></i></li>
+    <li><span class="active">充电枪自编号</span></li>
+</ul>
+
+<div class="row" id="jdlConnector_list">
+    <div class="col-md-12">
+        <!-- Begin: life time stats -->
+        <div class="portlet light portlet-fit portlet-datatable bordered">
+            <div class="portlet-title">
+                <div class="caption">
+                    <i class="fa fa-fire-extinguisher"></i> <span
+                        class="caption-subject font-dark sbold uppercase">充电枪自编号</span>
+                </div>
+				<div class="actions">
+					<div class="btn-group btn-group-devided btn-Connector-add" data-toggle="buttons">
+						<a class="btn btn-circle blue"><i class="fa fa-plus"></i> 新建充电枪</a>
+					</div>
+				</div>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 0px">
+                    <table
+                            class="table table-striped table-bordered table-hover table-checkable"
+                            id="datatable_dlb">
+                        <thead>
+                        <tr role="row" class="filter">
+                            <td colspan="1">充电枪名称:</td>
+                            <td colspan="2">
+                                <input type="text" style="width: 160px" name="connectorName" id="connectorName"/>
+                            </td>
+                            <td colspan="1">充电枪编号:</td>
+                            <td colspan="1">
+                                <input type="text" style="width: 160px" name="connectorId" id="connectorId"/>
+                            </td>
+                            <td colspan="1">充电站:</td>
+                            <td colspan="1">
+                                <input type="text" style="width: 160px" name="stationName" id="stationName"/>
+                            </td>
+                            <td width="16%">
+                                <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
+                                    <i class="fa fa-search"></i> 搜索
+                                </button>
+                                <button class="btn btn-sm red btn-outline filter-cancel" style="margin-right:0px">
+                                    <i class="fa fa-times"></i> 重置
+                                </button>
+                            </td>
+                        </tr>
+                        <tr role="row" class="heading">
+                            <th>#</th>
+                            <th colspan="2">充电枪名称</th>
+                            <th colspan="2">充电枪编号</th>
+                            <th colspan="2">充电站</th>
+							<td colspan="1">操作</td>
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                    <div style="text-align: right;">
+                        <ul id="pagination" class="pagination"></ul>
+                    </div>
+                </div>
+            </div>
+			<div class="portlet-body">
+				<div id="modules_tree"></div>
+			</div>
+        </div>
+    </div>
+</div>
+
+
+<script src="/assets/js/ajaxfileupload/ajaxfileupload.js"></script>
+<script>
+    $(function () {
+
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+    	
+        $("#rq").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
+        var d = new Date();
+//         d.setTime(d.getTime() - 1*1000*60*60*24);
+        d.setTime(d.getTime());
+    	var year = d.getFullYear();
+    	var month = d.getMonth() + 1;
+    	var day = d.getDate();
+    	if(month < 10)
+    		month = "0" + month;
+    	if(day < 10)
+    		day = "0" + day;
+    	$("#rq").val(year + "-" + month + "-" + day);
+
+        var page = 0, initPagination;
+        var icheckOptions = {
+            radioClass: 'iradio_square-blue icheck',
+            increaseArea: '20%'
+        }
+
+        //重置
+        $('tr.filter .filter-cancel').on('click', function () {
+            $('tr.filter input, select').val('').change();
+        });
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function () {
+
+            var params = getParams();
+            
+            page = 0;
+            jsDoQuery(params, true);
+        });
+
+        
+    	$.get('/user/companyData', function(result){
+    		obj = result;
+    		var options="";
+// 			= '<option value="">请选择</option>';
+    		for(var i = 0; i < obj.length; i++){
+    			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+//     			setFgsqx(obj[i].companyCode);
+    		}
+    		$('#gsbm').html(options);
+    		updateCompany();
+    	});
+    	
+    	$("#gsbm").on("change",updateCompany);
+    	function updateCompany(){
+    		var company = $('#gsbm').val();
+    		var options ="";
+//     		= '<option value="">请选择</option>';
+    		for(var i = 0; i < obj.length; i++){
+    			if(obj[i].companyCode == company){
+    				var children = obj[i].children;
+    				for(var j = 0; j < children.length; j++){
+    					options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+    				}
+    			}
+    		}
+    		$('#fgsbm').html(options);
+    	}
+        /*
+         * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+         */
+        function jsDoQuery(p, pagination) {
+            var params = {};
+            if (p)
+                params = p;
+            params['page'] = page;
+            params['connectorName'] = $("#connectorName").val();
+            params['connectorId'] = $("#connectorId").val();
+            params['stationName'] = $("#stationName").val();
+            
+            var j = layer.load(2);
+            $get('/jdl/queryJdlConnector', params, function (data) {
+                var bodyHtml = template('jdlConnectorList', {list:data});
+                $('#datatable_dlb tbody').html(bodyHtml);
+				
+                layer.close(j);
+				
+                $('.btn-Connector-upd').on('click', openConnectoraUpd);
+                $('.btn-Connector-del').on('click', openReceptionBatchDataDel);
+            });
+        }
+        
+        $('.btn-Connector-add').on('click', function(){
+        	$.get('/pages/electricity/connector/edit.html', function (content) {
+	        	layer.open({
+					type: 1,
+					area: ['650px', '400px'],
+					content: content,
+					title: '新建充电枪',
+					shift: 5,
+					scrollbar: false,
+					success: function () {
+						$('#jdlConnectorEdit').trigger('init', "0,add");
+					},
+					btn:["保存", "取消"],
+					btn1: function(index, layero){
+						layer.msg('操作中...', {icon: 16, shade: 0.31});
+						var connectorName = "", connectorId = "", stationName = "";
+						$('#jdlConnector_tbody input').each(function(i, e){
+							var obj = $(e);
+							if("connectorName" == obj.attr("name")){
+								connectorName = obj.val();
+							} else if("connectorId" == obj.attr("name")){
+								connectorId = obj.val();
+							} else if("stationName" == obj.attr("name")){
+								stationName = obj.val();
+							}
+						});
+						if(connectorName == null || connectorName.trim().length == 0
+								|| connectorId == null || connectorId.trim().length == 0
+								|| stationName == null || stationName.trim().length == 0){
+							layer.msg("请填写充电枪名称、编号、充电站信息");
+							return;
+						}
+						$get('/jdl/queryJdlConnector',{connectorId:connectorId,type:'query'},function(result){
+							if(result.length > 0){
+								layer.msg("充电枪编号已被使用，请重新输入编号");
+							} else {
+								$post('/jdl/addJdlConnector', {connectorName:connectorName,connectorId:connectorId,stationName:stationName}, function (rs) {
+									if(rs.status && rs.status == "SUCCESS"){
+										layer.msg('新建成功。');
+										$('.filter-submit.margin-bottom').trigger('click');
+										layer.close(index);
+									} else {
+										layer.msg(rs.msg);
+									}
+								});
+							}
+						});
+						
+					}
+				});
+        	});
+        });
+		
+		function openConnectoraUpd(){
+			var id = $(this).data('id');
+			id += ",upd";
+			$.get('/pages/electricity/connector/edit.html', function (content) {
+				layer.open({
+					type: 1,
+					area: ['650px', '400px'],
+					content: content,
+					title: '充电枪修改',
+					shift: 5,
+					scrollbar: false,
+					success: function () {
+						$('#jdlConnectorEdit').trigger('init', id);
+					},
+					btn:["保存", "取消"],
+					btn1: function(index, layero){
+						layer.msg('操作中...', {icon: 16, shade: 0.31});
+						var id = "", connectorName = "", connectorId = "", stationName = "";
+						$('#jdlConnector_tbody input').each(function(i, e){
+							var obj = $(e);
+							if("id" == obj.attr("name")){
+								id = obj.val();
+							} else if("connectorName" == obj.attr("name")){
+								connectorName = obj.val();
+							} else if("connectorId" == obj.attr("name")){
+								connectorId = obj.val();
+							} else if("stationName" == obj.attr("name")){
+								stationName = obj.val();
+							}
+						});
+						if(connectorName == null || connectorName.trim().length == 0
+								|| connectorId == null || connectorId.trim().length == 0
+								|| stationName == null || stationName.trim().length == 0){
+							layer.msg("请填写充电枪名称、编号、充电站信息");
+							return;
+						}
+						$get('/jdl/queryJdlConnector',{connectorId:connectorId,type:'query'},function(result){
+							if(result.length > 0){
+								layer.msg("充电枪编号已被使用，请重新输入编号");
+							} else {
+								$post('/jdl/updateJdlConnector', {id:id,connectorName:connectorName,connectorId:connectorId,stationName:stationName}, function (rs) {
+									if(rs.status && rs.status == "SUCCESS"){
+										layer.msg('修改成功。');
+										$('.filter-submit.margin-bottom').trigger('click');
+										layer.close(index);
+									} else {
+										layer.msg(rs.msg);
+									}
+								});
+							}
+						});
+						
+					}
+				});
+			});
+		}
+		
+		function openReceptionBatchDataDel(){
+			var id = $(this).data('id');
+			layer.confirm('你确定要删除充电量吗？', {
+				btn: ['确定删除','取消'] //按钮
+			}, function(){
+				layer.msg('操作中...', {icon: 16,shade: 0.01});
+				$post('/jdl/deleteJdlConnector', {id:id}, function (rs) {
+					layer.msg('删除成功！');
+					$('.filter-submit.margin-bottom').trigger('click');
+				});
+			});
+		}
+
+
+
+		function getParams(){
+			var cells = $('tr.filter')[0].cells
+                    , params = {}
+                    , name;
+            $.each(cells, function (i, cell) {
+                var items = $('input,select', cell);
+                for (var j = 0, item; item = items[j++];) {
+                    name = $(item).attr('name');
+                    if (name) {
+                        params[name] = $(item).val();
+                    }
+                }
+            });
+			return params;
+		};
+
+    });
+
+</script>
+
+<script id="jdlConnectorList" type="text/html">
+    {{each list as obj i}}
+    <tr>
+        <td style="vertical-align: middle;">
+			{{i + 1}}
+        </td>
+        <td colspan="2">{{obj.connectorName}}</td>
+        <td colspan="2">{{obj.connectorId}}</td>
+        <td colspan="2">{{obj.stationName}}</td>
+		<td colspan="1">
+			<button class="btn blue-madison btn-sm btn-Connector-upd" data-id="{{obj.id}}">
+				<i class="fa fa-pencil"></i> 修改
+			</button>
+			<button class="btn btn-danger btn-sm red btn-Connector-del" data-id="{{obj.id}}">
+				<i class="fa fa-times"></i> 删除
+			</button>
+		</td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
 \ No newline at end of file
@@ -31,7 +31,6 @@
 						<thead>
 							<tr>
 								<td style="min-width: 170px">批次号</td>
-								<td style="min-width: 80px">桩号</td>
 								<td style="min-width: 170px">枪号</td>
 								<td>车号</td>
 								<td>开始时间</td>
@@ -100,7 +99,6 @@
 	{{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>
@@ -21,7 +21,7 @@
             <div class="portlet-title">
                 <div class="caption">
                     <i class="fa fa-fire-extinguisher"></i> <span
-                        class="caption-subject font-dark sbold uppercase">车辆充电量</span>
+                        class="caption-subject font-dark sbold uppercase">充电量导入批次</span>
                 </div>
 <!--                 <div class="actions"> -->
 <!-- 					<button type="button" class="btn btn-circle blue" id="upload"><i class="fa fa-file-excel-o"></i> -->
@@ -39,9 +39,13 @@
                             id="datatable_dlb">
                         <thead>
                         <tr role="row" class="filter">
-                            <td colspan="2">日期:</td>
-                            <td colspan="2" width="120px">
-                                <input type="text" style="width: 100px" name="rq" id="rq"/>
+                            <td colspan="2">日期区间：
+                            	<input type="text" style="width: 100px" name="rq1" id="rq1"/>
+                            	 - 
+                                <input type="text" style="width: 100px" name="rq2" id="rq2"/>
+                            </td>
+                            <td colspan="2" width="120px">处理人：
+                                <input type="text" style="width: 100px" name="createBy" id="createBy"/>
                             </td>
                             <td width="24%">
                                 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
@@ -83,10 +87,14 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-        $("#rq").datetimepicker({
+        $("#rq1").datetimepicker({
             format: 'YYYY-MM-DD',
             locale: 'zh-cn'
         });
+        $("#rq2").datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'zh-cn'
+        });
         var d = new Date();
 //         d.setTime(d.getTime() - 1*1000*60*60*24);
         d.setTime(d.getTime());
@@ -97,7 +105,8 @@
     		month = "0" + month;
     	if(day < 10)
     		day = "0" + day;
-    	$("#rq").val(year + "-" + month + "-" + day);
+    	$("#rq1").val(year + "-" + month + "-" + day);
+    	$("#rq2").val(year + "-" + month + "-" + day);
         var page = 0, initPagination;
         var icheckOptions = {
@@ -112,7 +121,8 @@
         //提交
         $('tr.filter .filter-submit').on('click', function () {
-			if ($("#rq").val() == "" || $("#rq").val() ==null){
+			if ($("#rq1").val() == "" || $("#rq1").val() ==null
+					|| $("#rq2").val() == "" || $("#rq2").val() ==null){
 				layer.msg('请选择日期.');
 			}else {
@@ -160,7 +170,8 @@
                 params = p;
             params['order'] = 'nbbm';
             params['page'] = page;
-            params['rq'] = $("#rq").val();
+            params['rq1'] = $("#rq1").val();
+            params['rq2'] = $("#rq2").val();
             var j = layer.load(2);
             $get('/jdl/queryJdlReceptionBatch', params, function (data) {
@@ -229,9 +240,6 @@
 					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){
@@ -26,7 +26,9 @@
 							<tr>
 								<td style="min-width: 170px">批次号</td>
 								<td style="min-width: 90px">营运日期</td>
-								<td style="min-width: 80px">桩号</td>
+								<td style="min-width: 80px">枪名</td>
+								<td style="min-width: 80px">枪号</td>
+								<td style="min-width: 80px">充电站</td>
 								<td>车号</td>
 								<td>开始时间</td>
 								<td>结束时间</td>
@@ -73,25 +75,46 @@
 				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'
-			        });
+// 					$("input[name=dateStr]").datetimepicker({
+// 			            format: 'YYYY-MM-DD',
+// 			            locale: 'zh-cn'
+// 			        });
 				} else {
-					var jdlReceptionBatchData = template('jdlReceptionBatchData_tbody',{list:result});
-					$('#forms_2 tbody').html(jdlReceptionBatchData);
+					var jdlReceptionBatchDataView = template('jdlReceptionBatchData_tbody_view',{list:result});
+					$('#forms_2 tbody').html(jdlReceptionBatchDataView);
 				}
 			});
 		})
 	});
+	
+	function formatInputNumber(e){
+		// 获取输入值
+		var value = e.target.value;
+		var v = value.replace(/[^0-9.]/g, '');
+		if('\.' == v.charAt(0)){
+			v = '0' + v;
+		}
+		if(v.indexOf('\.') > 0){
+			var split = v.split('\.');
+			if(split[1].length > 0){
+				v = split[0] + '\.' + (split[1].substring(0, 2));
+			} else {
+				v = split[0] + '\.0';
+			}
+		}
+		// 更新输入框的值
+		e.target.value = v;
+	}
 </script>
-<script type="text/html" id="jdlReceptionBatchData_tbody">
+<script type="text/html" id="jdlReceptionBatchData_tbody_view">
 	{{each list as obj i}}
 		<tr>
 		<td>{{obj.batchNo}}</td>
 		<td>{{obj.dateStr}}</td>
-		<td>{{obj.pileId}}</td>
+		<td>{{obj.connectorName}}</td>
+		<td>{{obj.connectorId}}</td>
+		<td>{{obj.stationName}}</td>
 		<td>{{obj.carCode}}</td>
 		<td>{{obj.startTime}}</td>
 		<td>{{obj.endTime}}</td>
@@ -99,12 +122,11 @@
 		<td>{{obj.startSoc}}</td>
 		<td>{{obj.endSoc}}</td>
 		<td>{{obj.chargeCapacity}}</td>
-		<!-- <td>{{obj.stopReason}}</td> -->
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -112,21 +134,22 @@
 	{{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> -->
+		<td>{{obj.dateStr}}</td>
+		<td>{{obj.connectorName}}</td>
+		<td>{{obj.connectorId}}</td>
+		<td>{{obj.stationName}}</td>
+		<td>{{obj.carCode}}</td>
+		<td>{{obj.startTime}}</td>
+		<td>{{obj.endTime}}</td>
+		<td>{{obj.sumTime}}</td>
+		<td>{{obj.startSoc}}</td>
+		<td>{{obj.endSoc}}</td>
+		<td><input type="text" name="chargeCapacity" value="{{obj.chargeCapacity}}" oninput="formatInputNumber(event)"/></td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -17,6 +17,12 @@
 					</div>
 					<div class="form-body">
 						<div class="form-group">
+							<div class="col-md-12">
+								<label class="col-md-3 control-label">充电站：</label>
+								<select name="stationName" id="stationName_">
+								</select>
+							</div>
+							<div style="margin-top: 50px;width: 100%;height: 1px;"></div>
 							<label class="col-md-3 control-label">选择文件</label>
 							<div class="col-md-9">
 								<input type="file" name="file" id="file"
@@ -53,6 +59,14 @@
 		$('#fgsbm_').val('-1');
 		$('#fgsName').val('全部车队');
+		$get('/jdl/queryJdlStationName', {}, function(array){
+			var text = '';
+			$.each(array, function(i, e){
+				text += '<option value="'+e+'">'+e+'</option>';
+			});
+			$('#stationName_').html(text);
+		});
+		
 		//modal 显示事件
 		$('#uploadFile').on('show.bs.modal', function(){
 		})
@@ -66,6 +80,8 @@
 			param["gsName"] = $('#gsName').val();
 			param["fgsbm_"] = $('#fgsbm_').val();
 			param["fgsName"] = $('#fgsName').val();
+			var stationName = $('#stationName_').val();
+			param["stationName"] = stationName;
 			$.ajaxFileUpload({
 				url : '/jdl/uploadFile_2412',
 				secureuri : false,