Commit 3c3f246b8584632107730a5eefa0e4c79d5c062d
1 parent
e4e550bc
update...
Showing
3 changed files
with
14 additions
and
14 deletions
src/main/java/com/bsth/server_ws/electric_oil/OilServiceSoap.java
| ... | ... | @@ -32,7 +32,7 @@ public class OilServiceSoap implements OilService { |
| 32 | 32 | @Override |
| 33 | 33 | public String upLoadKWHInfo(String fCheckBM, String fStationID, List<ClsCDL> fKWHInfoArr) { |
| 34 | 34 | try{ |
| 35 | - logger.info("上传电量数据, id: " + fStationID + " data [" + JSON.toJSONString(fKWHInfoArr) + "]"); | |
| 35 | + logger.info("上传电量数据, id: " + fStationID + " -data [" + JSON.toJSONString(fKWHInfoArr) + "]"); | |
| 36 | 36 | }catch (Exception e){ |
| 37 | 37 | logger.error("", e); |
| 38 | 38 | } | ... | ... |
src/main/java/com/bsth/server_ws/electric_oil/entity/ClsCDL.java
| ... | ... | @@ -31,7 +31,7 @@ public class ClsCDL { |
| 31 | 31 | /** |
| 32 | 32 | * 充电量 |
| 33 | 33 | */ |
| 34 | - private int cdl; | |
| 34 | + private String cdl; | |
| 35 | 35 | |
| 36 | 36 | public String getYyrq() { |
| 37 | 37 | return yyrq; |
| ... | ... | @@ -65,11 +65,11 @@ public class ClsCDL { |
| 65 | 65 | this.jsyGh = jsyGh; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - public int getCdl() { | |
| 68 | + public String getCdl() { | |
| 69 | 69 | return cdl; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - public void setCdl(int cdl) { | |
| 72 | + public void setCdl(String cdl) { | |
| 73 | 73 | this.cdl = cdl; |
| 74 | 74 | } |
| 75 | 75 | } | ... | ... |
src/main/java/com/bsth/server_ws/electric_oil/entity/Electric.java
| ... | ... | @@ -46,22 +46,22 @@ public class Electric { |
| 46 | 46 | if(null == nbbm) |
| 47 | 47 | return null; |
| 48 | 48 | |
| 49 | + Electric elec = new Electric(); | |
| 49 | 50 | try{ |
| 50 | 51 | Car car = CarBufferData.findOne(clsCDL.getNbbm()); |
| 51 | 52 | |
| 52 | - Electric e = new Electric(); | |
| 53 | - e.setGsBm(car.getCompanyCode()); | |
| 54 | - e.setGsName(BusinessCodeData.code2Name.get(e.getGsBm())); | |
| 55 | - e.setFgsBm(car.getBrancheCompanyCode()); | |
| 56 | - e.setFgsName(BusinessCodeData.code2Name.get(e.getFgsBm())); | |
| 57 | - e.setRq(fmtyyyyMMdd.parseDateTime(clsCDL.getYyrq()).toDate()); | |
| 58 | - e.setCreateDate(fmtyyyyMMddHHmmss.parseDateTime(clsCDL.getCreateRq()).toDate()); | |
| 59 | - e.setNbbm(nbbm); | |
| 60 | - e.setJdl(Double.parseDouble(String.valueOf(clsCDL.getCdl()))); | |
| 53 | + elec.setGsBm(car.getCompanyCode()); | |
| 54 | + elec.setGsName(BusinessCodeData.code2Name.get(elec.getGsBm())); | |
| 55 | + elec.setFgsBm(car.getBrancheCompanyCode()); | |
| 56 | + elec.setFgsName(BusinessCodeData.code2Name.get(elec.getFgsBm())); | |
| 57 | + elec.setRq(fmtyyyyMMdd.parseDateTime(clsCDL.getYyrq()).toDate()); | |
| 58 | + elec.setCreateDate(fmtyyyyMMddHHmmss.parseDateTime(clsCDL.getCreateRq()).toDate()); | |
| 59 | + elec.setNbbm(nbbm); | |
| 60 | + elec.setJdl(Double.parseDouble(clsCDL.getCdl())); | |
| 61 | 61 | }catch (Exception e){ |
| 62 | 62 | logger.error("异常数据;" + JSON.toJSONString(clsCDL)); |
| 63 | 63 | } |
| 64 | - return null; | |
| 64 | + return elec; | |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** | ... | ... |