Merge branch 'qingpu' of

http://192.168.168.201:8888/panzhaov5/control_service_data_Interface.git into qingpu Conflicts: src/main/java/com/bsth/server_ws/util/WSDataConver.java src/main/resources/application-prod.properties

Merge branch 'qingpu' of
http://192.168.168.201:8888/panzhaov5/control_service_data_Interface.git into qingpu Conflicts: src/main/java/com/bsth/server_ws/util/WSDataConver.java src/main/resources/application-prod.properties
王通
2 parents 344861b0 7e903c37
Showing 3 changed files with 2 additions and 79 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
src/main/java/com/bsth/server_ws/waybill/LD_Service.java
src/main/java/com/bsth/server_ws/waybill/LD_ServiceSoap.java
@@ -49,26 +49,8 @@ public class WSDataConver {
     static {
         gsMap = new HashMap<>();
-        gsMap.put("55", "上南公司");
-        gsMap.put("55_4", "上南一分公司");
-        gsMap.put("55_3", "上南六分公司");
-        gsMap.put("55_1", "上南二分公司");
-        gsMap.put("55_2", "上南三分公司");
-        gsMap.put("22", "金高公司");
-        gsMap.put("22_2", "二分公司");
-        gsMap.put("22_1", "四分公司");
-        gsMap.put("22_3", "三分公司");
-        gsMap.put("22_5", "一分公司");
-        gsMap.put("05", "杨高公司");
-        gsMap.put("05_5", "杨高分公司");
-        gsMap.put("05_6", "周浦分公司");
-        gsMap.put("05_3", "芦潮港分公司");
-        gsMap.put("05_1", "川沙分公司");
-        gsMap.put("26", "南汇公司");
-        gsMap.put("26_3", "南汇三分");
-        gsMap.put("26_2", "南汇二分");
-        gsMap.put("26_1", "南汇一分");
-        gsMap.put("26_4", "南汇维修公司");
+        gsMap.put("99", "青浦公交");
+        gsMap.put("99_100", "青浦公交");
     }
     /**
@@ -34,23 +34,6 @@ public interface LD_Service {
             @WebParam(name = "companyId") String companyId,
             @WebParam(name = "resultArray", mode = WebParam.Mode.INOUT) Holder<NH_waybill[]> result,
             @WebParam(name = "fError", mode = WebParam.Mode.INOUT) Holder<String> fError);
-    
-    /***
-     * 路单接口（原南汇格式 公司内部用）
-     * @param password 密码
-     * @param rq    日期
-     * @param companyId 公司编码
-     * @param result
-     * @param fError
-     * @return
-     */
-    @WebMethod
-    boolean waybill_NH4TH(
-            @WebParam(name = "password") String password,
-            @WebParam(name = "rq") String rq,
-            @WebParam(name = "companyId") String companyId,
-            @WebParam(name = "resultArray", mode = WebParam.Mode.INOUT) Holder<NH_waybill[]> result,
-            @WebParam(name = "fError", mode = WebParam.Mode.INOUT) Holder<String> fError);
     /**
      * 路单接口（上南格式）
@@ -16,10 +16,8 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import com.bsth.entity.DutyEmployee;
-import com.bsth.entity.ElecInfo;
 import com.bsth.entity.OilInfo;
 import com.bsth.entity.ScheduleRealInfo;
-import com.bsth.redis.ElecRedisService;
 import com.bsth.redis.OilRedisService;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.repository.DutyEmployeeRepository;
@@ -43,7 +41,6 @@ import com.google.common.collect.ArrayListMultimap;
 public class LD_ServiceSoap implements LD_Service, ApplicationContextAware {
     static OilRedisService oilRedisService;
-    static ElecRedisService elecRedisService;
     static ScheduleRedisService scheduleRedisService;
     static DutyEmployeeRepository dutyEmployeeRepository;
@@ -91,44 +88,6 @@ public class LD_ServiceSoap implements LD_Service, ApplicationContextAware {
     }
     @Override
-    public boolean waybill_NH4TH(String password, String rq, String companyId, Holder<NH_waybill[]> result, Holder<String> fError) {
-        try {
-            if(userService.get(password) == null){
-                fError.value = "无效的密码！";
-                return false;
-            }
-            //日期减一天，老接口是这样的
-            //rq = fmtyyyyMMdd.print(fmtyyyyMMdd.parseDateTime(rq).minusDays(1));
-            String prveRq = fmtyyyyMMdd.print(fmtyyyyMMdd.parseDateTime(rq).minusDays(1));
-
-            //实际排班
-            ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm(prveRq, companyId);
-            //油耗信息
-            Map<String, OilInfo> oilInfoMap = oilRedisService.findByNbbmGroup(listMap.keySet(), prveRq);
-            //电耗信息
-            Map<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_NH4TH(listMap, oilInfoMap, elecInfoMap, des);
-            result.value = array;
-
-            //不再代理老接口数据
-            /*if(companyId.equals("26") && !WebServiceProxy.isAllNew(companyId)){
-                ClsLDInfo[] oldArray = OldWSClient.getNH_LD(companyId, rq);
-                //合并新老系统的数据
-                result.value = WebServiceProxy.mergerData(result.value, oldArray, companyId);
-            }*/
-        } catch (Exception e) {
-            logger.error("", e);
-            fError.value = "服务器出现异常！";
-            return false;
-        }
-        return true;
-    }
-
-    @Override
     public boolean waybill_SN(String password, String rq, String companyId, Holder<SN_waybill[]> result, Holder<String> fError) {
         try {
             if(userService.get(password) == null){
@@ -176,7 +135,6 @@ public class LD_ServiceSoap implements LD_Service, ApplicationContextAware {
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         oilRedisService = applicationContext.getBean(OilRedisService.class);
-        elecRedisService = applicationContext.getBean(ElecRedisService.class);
         scheduleRedisService = applicationContext.getBean(ScheduleRedisService.class);
         dutyEmployeeRepository = applicationContext.getBean(DutyEmployeeRepository.class);
         userService = applicationContext.getBean(UserService.class);