1.浦东分支油耗逻辑问题修复

王通
1 parent b58f098c
Showing 3 changed files with 67 additions and 21 deletions
src/main/java/com/bsth/redis/OilRedisService.java
src/main/java/com/bsth/server_ws/util/WSDataConver.java
src/main/java/com/bsth/server_ws/waybill/LD_ServiceSoap.java
@@ -18,11 +18,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 /**
@@ -85,9 +81,13 @@ public class OilRedisService implements CommandLineRunner {
         rq = rq.replaceAll("-", "");
         try {
             List<OilInfo> list = new ArrayList<>();
+            Set<String> nbbms = new HashSet<>();
             for (String nbbm : nbbmArray) {
                 nbbm = nbbm.split("_")[1];
-                list.addAll(read(nbbm, rq));
+                if (!nbbms.contains(nbbm)) {
+                    nbbms.add(nbbm);
+                    list.addAll(read(nbbm, rq));
+                }
             }
             Class clazz = OilInfo.class;
             rs = new ConvertUtil().groupMultiList(list, "_", clazz.getDeclaredField("nbbm"), clazz.getDeclaredField("jsy"));
@@ -15,6 +15,7 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -168,7 +169,7 @@ public class WSDataConver {
      * @param oilInfoMap
      * @return
      */
-    public static NH_waybill[] to_waybill_NH(ArrayListMultimap<String, ScheduleRealInfo> listMap, ArrayListMultimap<String, OilInfo> oilInfoMap, List<DutyEmployee> des) throws NoSuchFieldException {
+    public static NH_waybill[] to_waybill_NH(ArrayListMultimap<String, ScheduleRealInfo> listMap, ArrayListMultimap<String, OilInfo> oilInfoMap, ArrayListMultimap<String, ElecInfo> elecInfoMap, List<DutyEmployee> des) throws NoSuchFieldException {
         List<String> nbbmArray = new ArrayList<>(listMap.keySet());
         NH_waybill[] rs = new NH_waybill[nbbmArray.size() + 1];
@@ -181,9 +182,11 @@ public class WSDataConver {
         NH_waybill nh_waybill, total = new NH_waybill();
         NH_waybillItem nh_waybillItem, totalItem = new NH_waybillItem();
         List<OilInfo> oilInfo;
+        List<ElecInfo> elecInfo;
         boolean isFirst = true;
         double jhlc = 0, sjjhlc = 0, cclc = 0, jclc = 0, yylc = 0, kslc = 0, cjlc = 0, lblc = 0, zjlc = 0, zlc = 0;
+        double yhTotal = 0;
         for (int i = 0; i < nbbmArray.size(); i++) {
             list = listMap.get(nbbmArray.get(i));
             if (list.size() == 0)
@@ -282,16 +285,18 @@ public class WSDataConver {
                 nh_waybillItem.setM_strBZ("");
                 oilInfo = oilInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
-                if (oilInfo != null) {
+                if (oilInfo != null && oilInfo.size() > 0) {
                     Double czyl = 0., jzyl = 0., jzl = 0., ns = 0., yh = 0.;
                     String rylx = "";
                     for (OilInfo oi : oilInfo) {
-                        czyl = Arith.add(czyl, oi.getCzyl());
-                        jzyl = Arith.add(jzyl, oi.getJzyl());
-                        jzl = Arith.add(jzl, oi.getJzl());
-                        ns = Arith.add(ns, oi.getNs());
-                        yh = Arith.add(yh, oi.getYh());
-                        rylx = oi.getRylx();
+                        if (oi.getXlbm().equals(sch.getXlBm())) {
+                            czyl = Arith.add(czyl, oi.getCzyl());
+                            jzyl = Arith.add(jzyl, oi.getJzyl());
+                            jzl = Arith.add(jzl, oi.getJzl());
+                            ns = Arith.add(ns, oi.getNs());
+                            yh = Arith.add(yh, oi.getYh());
+                            rylx = oi.getRylx();
+                        }
                     }
                     //出场存油
                     nh_waybillItem.setM_dblCCCY(czyl);
@@ -305,6 +310,7 @@ public class WSDataConver {
                     nh_waybillItem.setM_dblNS(ns);
                     //消耗量
                     nh_waybillItem.setM_dblYH(yh);
+                    yhTotal = Arith.add(yhTotal, yh);
                     //加油地点1
                     nh_waybillItem.setM_strJYD1("");
                     //加油地点2
@@ -319,6 +325,40 @@ public class WSDataConver {
                     nh_waybillItem.setM_strYHLX1("");
                 }
+                /*elecInfo = elecInfoMap.get(list.get(0).getClZbh() + "_" + list.get(0).getjGh());
+                if (elecInfo != null && elecInfo.size() > 0) {
+                    Double cdl = 0., hd = 0.;
+                    for (ElecInfo ei : elecInfo) {
+                        cdl = Arith.add(cdl, ei.getCdl());
+                        hd = Arith.add(hd, ei.getHd());
+                    }
+                    //出场存油
+                    nh_waybillItem.setM_dblCCCY(100.0);
+                    //进场存油
+                    nh_waybillItem.setM_dblJCCY(100.0);
+                    //加注量1
+                    nh_waybillItem.setM_dblJZL1(cdl);
+                    //加注量2
+                    nh_waybillItem.setM_dblJZL2(0.0);
+                    //尿素
+                    nh_waybillItem.setM_dblNS(0.0);
+                    //消耗量
+                    nh_waybillItem.setM_dblYH(hd);
+                    yhTotal = Arith.add(yhTotal, hd);
+                    //加油地点1
+                    nh_waybillItem.setM_strJYD1("");
+                    //加油地点2
+                    nh_waybillItem.setM_strJYD2("");
+                    //加油工工号1
+                    nh_waybillItem.setM_strJYG1("");
+                    //加油工工号1
+                    nh_waybillItem.setM_strJYG2("");
+                    //油耗类型1
+                    nh_waybillItem.setM_strYHLX1("");
+                    //油耗类型2
+                    nh_waybillItem.setM_strYHLX1("");
+                }*/
+
                 nh_waybill.getM_SubInfos().add(nh_waybillItem);
             }
@@ -340,6 +380,7 @@ public class WSDataConver {
         totalItem.setM_strSPYKQ("");
         totalItem.setM_strYYZT("");
         totalItem.setM_strBZ("");
+        totalItem.setM_dblYH(yhTotal);
         total.getM_SubInfos().add(totalItem);
@@ -453,12 +494,14 @@ public class WSDataConver {
                     Double czyl = 0., jzyl = 0., jzl = 0., ns = 0., yh = 0.;
                     String rylx = "";
                     for (OilInfo oi : oilInfo) {
-                        czyl = Arith.add(czyl, oi.getCzyl());
-                        jzyl = Arith.add(jzyl, oi.getJzyl());
-                        jzl = Arith.add(jzl, oi.getJzl());
-                        ns = Arith.add(ns, oi.getNs());
-                        yh = Arith.add(yh, oi.getYh());
-                        rylx = oi.getRylx();
+                        if (oi.getXlbm().equals(sch.getXlBm())) {
+                            czyl = Arith.add(czyl, oi.getCzyl());
+                            jzyl = Arith.add(jzyl, oi.getJzyl());
+                            jzl = Arith.add(jzl, oi.getJzl());
+                            ns = Arith.add(ns, oi.getNs());
+                            yh = Arith.add(yh, oi.getYh());
+                            rylx = oi.getRylx();
+                        }
                     }
                     //出场存油
                     nh_waybillItem.setM_dblCCCY(czyl);
@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.jws.WebService;
 import javax.xml.ws.Holder;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -69,11 +70,13 @@ public class LD_ServiceSoap implements LD_Service, ApplicationContextAware {
             ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm(prveRq, companyId);
             //油耗信息
             ArrayListMultimap<String, OilInfo> oilInfoMap = oilRedisService.findByNbbmGroup(listMap.keySet(), prveRq);
+            //电耗信息
+            ArrayListMultimap<String, ElecInfo> elecInfoMap = elecRedisService.findByNbbmGroup(listMap.keySet(), prveRq);
             //当班调派
             long st = fmtyyyyMMddHHmm.parseMillis(prveRq + "00:00"), et = fmtyyyyMMddHHmm.parseMillis(prveRq + "23:59");
             List<DutyEmployee> des = dutyEmployeeRepository.findByTime(st, et);
             //转换成南汇路单需要的格式
-            NH_waybill[] array = WSDataConver.to_waybill_NH(listMap, oilInfoMap, des);
+            NH_waybill[] array = WSDataConver.to_waybill_NH(listMap, oilInfoMap, elecInfoMap, des);
             result.value = array;
             //不再代理老接口数据