Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/java/com/steerinfo/dil/config/RedisConfiguration.java

@@ -1,46 +0,0 @@
-package com.steerinfo.dil.config;
-
-
-import com.steerinfo.route.config.KeyExpiredListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-/**
- * @program: SpringCloud * @description: redis配置类 * @author: zhang yi * @create: 2020-03-24 14:17
- */
-@Configuration
-public class RedisConfiguration {
-    @Autowired
-    private RedisConnectionFactory redisConnectionFactory;
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Bean
-    public RedisTemplate<String, Object> stringSerializerRedisTemplate() {
-        RedisSerializer<String> stringSerializer = new StringRedisSerializer();
-        redisTemplate.setKeySerializer(stringSerializer);
-        redisTemplate.setValueSerializer(stringSerializer);
-        redisTemplate.setHashKeySerializer(stringSerializer);
-        redisTemplate.setHashValueSerializer(stringSerializer);
-        return redisTemplate;
-    }
-
-    @Bean
-    public RedisMessageListenerContainer redisMessageListenerContainer() {
-        RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
-        redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
-        return redisMessageListenerContainer;
-    }
-
-    @Bean
-    public KeyExpiredListener keyExpiredListener() {
-        return new KeyExpiredListener(this.redisMessageListenerContainer());
-    }
-}

src/main/java/com/steerinfo/dil/controller/OffSiteTransportationController.java

@@ -1,446 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
-import com.steerinfo.dil.service.impl.OffSiteTransportationServiceImpl;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.route.config.ImageFileUtils;
-import com.steerinfo.route.service.impl.RouteServiceImpl;
-import com.steerinfo.route.threeRequest.ZhongJiaoXingLu;
-import com.steerinfo.route.util.DataConversionTool;
-import com.steerinfo.route.util.HTTPRequestUtils;
-import com.steerinfo.route.vo.FullPathVisualizationTo.ViewVisualization;
-import com.steerinfo.route.vo.Map.RouteVo;
-import com.steerinfo.route.vo.ResultWarn;
-import com.steerinfo.route.vo.resultJson.SearchPoint;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-import java.math.BigDecimal;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-@Api("厂外运输接口")
-@RestController
-@RequestMapping("/${api.version}/pathDisplay")
-public class OffSiteTransportationController extends BaseRESTfulController {
-    @Autowired
-    private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
-    @Autowired
-    private RouteServiceImpl routeService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-    @Autowired
-    ImageFileUtils imageFileUtils;
-    @Autowired
-    private ZhongJiaoXingLu zhongJiaoXingLu;
-
-    @Value("${str.tengxun.key}")
-    private String key;
-    @Value("${redis.prefix.order}")
-    private String prefixOrder;
-    @Value("${redis.prefix.line}")
-    private String prefixLine;
-    @Value("${redis.prefix.suffix}")
-    private String suffix;
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-
-    @Autowired
-    OffSiteTransportationServiceImpl offSiteTransportationService;
-    @ApiOperation("保存路径")
-    @PostMapping("/savePath")
-    public CompletableFuture<String> savePath() throws Exception {
-
-        Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult("WYSDD2022040600045906");
-        parem.put("turnOf","0");
-        return routeService.createTotalResult(parem);
-        //运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-        //初始化请求参数
-//        HashMap<String,Object> mapValue=new HashMap<>();
-//        mapValue.put("orderNumber","WYSDD2021091000000001");
-//        mapValue.put("capacityNumber","豫SB6238");
-//        mapValue.put("resultOutGateTime","2021-11-17 14:20:19");
-//        mapValue.put("turnOf","0");
-//        mapValue.put("shipperName","四川达州钢铁集团有限");
-//        mapValue.put("receiveAddress","长沙市");
-//        return routeService.createTotalResult(mapValue);
-    }
-    @ApiOperation("全路径查询")
-    @PostMapping("/fullPath")
-    public Object fullPath(String orderNumber) throws Exception {
-        //运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-        //初始化请求参数
-        HashMap<String,Object> mapValue=new HashMap<>();
-        mapValue.put("orderNumber",orderNumber);
-        return routeService.fullPathVisualization(mapValue);
-    }
-
-    @ApiOperation("查询在途运输")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getInTransitTransportation")
-    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-                                                    )
-    {
-        if(mapValue.containsKey("startTime")&&mapValue.containsKey("endTime")){
-            Date  startDate=new Date(Long.parseLong(mapValue.get("startTime").toString())) ;
-            Date  endDate=new Date(Long.parseLong(mapValue.get("endTime").toString())) ;
-            Calendar ca = Calendar.getInstance();
-            ca.setTime(endDate);
-            ca.add(Calendar.DATE,1);
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-            String startTime1=simpleDateFormat.format(startDate);
-            String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
-        }else {
-            Date  startDate=new Date() ;
-            Date  endDate=new Date() ;
-            Calendar ca = Calendar.getInstance();
-            ca.setTime(endDate);
-            ca.add(Calendar.DATE,1);
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-            String startTime1=simpleDateFormat.format(startDate);
-            String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.put("startTime",startTime1);
-            mapValue.put("endTime",endTime1);
-        }
-        List<Map<String,Object>> filter= offSiteTransportationService.getInTransitTransportation(mapValue);
-        PageHelper.startPage(pageNum, pageSize);
-        List<Map<String,Object>> list= offSiteTransportationService.getInTransitTransportation(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, filter,list);
-        return success(pageList);
-    }
-
-    @ApiOperation("有异常")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getHaveAbnormalTruckOrderInfo")
-    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    )
-    {
-        if(mapValue.containsKey("startTime")&&mapValue.containsKey("endTime")){
-            Date  startDate=new Date(Long.parseLong(mapValue.get("startTime").toString())) ;
-            Date  endDate=new Date(Long.parseLong(mapValue.get("endTime").toString())) ;
-            Calendar ca = Calendar.getInstance();
-            ca.setTime(endDate);
-            ca.add(Calendar.DATE,1);
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-            String startTime1=simpleDateFormat.format(startDate);
-            String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
-        }else {
-            Date  startDate=new Date() ;
-            Date  endDate=new Date() ;
-            Calendar ca = Calendar.getInstance();
-            ca.setTime(endDate);
-            ca.add(Calendar.DATE,1);
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-            String startTime1=simpleDateFormat.format(startDate);
-            String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.put("startTime",startTime1);
-            mapValue.put("endTime",endTime1);
-        }
-        List<Map<String,Object>> filter= offSiteTransportationService.getHaveAbnormalTruckOrderInfo(mapValue);
-        PageHelper.startPage(pageNum, pageSize);
-        List<Map<String,Object>> list= offSiteTransportationService.getHaveAbnormalTruckOrderInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, filter,list);
-        return success(pageList);
-    }
-
-
-
-    @ApiOperation("查询在途运输")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer")
-    })
-    @PostMapping("/getFinishTruckOrderInfo")
-    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    )
-    {
-        if(mapValue.containsKey("startTime")&&mapValue.containsKey("endTime")){
-            Date  startDate=new Date(Long.parseLong(mapValue.get("startTime").toString())) ;
-            Date  endDate=new Date(Long.parseLong(mapValue.get("endTime").toString())) ;
-            Calendar ca = Calendar.getInstance();
-            ca.setTime(endDate);
-            ca.add(Calendar.DATE,1);
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-            String startTime1=simpleDateFormat.format(startDate);
-            String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
-        }else {
-            Date  startDate=new Date() ;
-            Date  endDate=new Date() ;
-            Calendar ca = Calendar.getInstance();
-            ca.setTime(endDate);
-            ca.add(Calendar.DATE,1);
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-            String startTime1=simpleDateFormat.format(startDate);
-            String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.put("startTime",startTime1);
-            mapValue.put("endTime",endTime1);
-        }
-        //已经完成
-        mapValue.put("orderStatus",2);
-        List<Map<String,Object>> filter= offSiteTransportationService.getInTransitTransportation(mapValue);
-        PageHelper.startPage(pageNum, pageSize);
-        List<Map<String,Object>> list= offSiteTransportationService.getInTransitTransportation(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, filter,list);
-        return success(pageList);
-    }
-
-    @PostMapping(value = "/addTmstruckReceiptResult" )
-    public synchronized RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  value , Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
-
-        Map<String,Object> map = new HashMap<String,Object>();
-        map.put("orderNumber",orderNumber);
-        map.put("resultArrivalAddress",resultArrivalAddress);
-        Integer orderStatus = offSiteTransportationService.getOrderStatus(map);
-        //判断是否已经结束
-        if (orderStatus!=null&&orderStatus==2){
-            return failed(-3);
-        }
-        map.putAll(value);
-        //添加入库实绩
-        Integer resTfulResult = offSiteTransportationService.addTmstruckReceiptResult(map);
-        if (!resTfulResult.equals("4")){
-            //保存路线
-            String redisJson = (String) redisTemplate.opsForValue().get(prefixOrder+":"+orderNumber);
-            HashMap mapValue = JSON.parseObject(redisJson, HashMap.class);
-            String json = zhongJiaoXingLu.visualRoute(mapValue);
-            ViewVisualization to=null;
-            if (json!=null){
-                //设置60天后过期
-                Calendar calendar=Calendar.getInstance();
-                long agoTime= calendar.getTime().getTime();
-                calendar.add(Calendar.MONTH,2);
-                long lateTime= calendar.getTime().getTime();
-                long saveTime=(lateTime-agoTime)/1000;
-                redisTemplate.opsForValue().set(prefixLine+":"+orderNumber, json, saveTime, TimeUnit.SECONDS);
-                //删除订单
-                redisTemplate.delete(prefixOrder+":"+orderNumber);
-                redisTemplate.delete(prefixOrder+":"+orderNumber+suffix);
-                //添加运输距离
-                to= (ViewVisualization) DataConversionTool.jsonToBean(json,ViewVisualization.class);
-
-            }else {
-                HashMap<String,Object> hashMap=new HashMap();
-                hashMap.put("orderNumber",orderNumber);
-                Map<String,Object> resultMap= offSiteTransportationService.getStartAndEndCapacityNumber(hashMap);
-
-                if (resultMap!=null){
-                    json= getPathJSON(resultMap.get("capacityNumber").toString(),resultMap.get("resultOutGateTime").toString());
-
-
-                    if (json!=null&&!json.equals("")){
-                        to= (ViewVisualization) DataConversionTool.jsonToBean(json,ViewVisualization.class);
-                    }
-                }
-            }
-            //设置运输距离，并且结束订单
-            if (to!=null&&to.getResult()!=null&&to.getResult().getRunDistance()!=null){
-                Map<String,Object> ordermap=new HashMap<>();
-                ordermap.put("orderNumber",orderNumber);
-                ordermap.put("orderMileage",to.getResult().getRunDistance()==null?"1":to.getResult().getRunDistance());
-                offSiteTransportationService.insertOrderMileage(ordermap);
-
-            }else {
-                if (to!=null&&to.getStatus()==1006){
-
-                    Map<String,Object> ordermap=new HashMap<>();
-                    ordermap.put("orderNumber",orderNumber);
-                    ordermap.put("orderMileage","-1");
-                    offSiteTransportationService.insertOrderMileage(ordermap);
-                }else if (to!=null&&to.getStatus()==1001){
-                    Map<String,Object> ordermap=new HashMap<>();
-                    ordermap.put("orderNumber",orderNumber);
-                    ordermap.put("orderMileage","1");
-                    offSiteTransportationService.insertOrderMileage(ordermap);
-                } else {
-                    Map<String,Object> ordermap=new HashMap<>();
-                    ordermap.put("orderNumber",orderNumber);
-                    ordermap.put("orderMileage","-1");
-                    offSiteTransportationService.insertOrderMileage(ordermap);
-                }
-
-            }
-            //关闭运输订单
-            offSiteTransportationService.orderClose(orderNumber);
-        }
-
-
-        return success(1);
-    }
-
-    //如果内容丢失重新获得
-    public String getPathJSON(String capacityNumber,String resultOutGateTime) throws Exception {
-
-        //入网验证
-        String netValidationResult = zhongJiaoXingLu.netValidation(capacityNumber);
-        Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
-        if (Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
-            String searchPointJson = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+ URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-            SearchPoint searchPoint= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson, SearchPoint.class);
-            String searchPointJson2 = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-            SearchPoint searchPoint2= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint.class);
-            //运单生成之后保存
-            HashMap<String,String> redisMap=new HashMap<>();
-            String startLon=searchPoint.getResult().getLocation().getLng().toString().length()>9?searchPoint.getResult().getLocation().getLng().toString().substring(0,9):searchPoint.getResult().getLocation().getLng().toString();
-            String startLat=searchPoint.getResult().getLocation().getLat().toString().length()>9?searchPoint.getResult().getLocation().getLat().toString().substring(0,8):searchPoint.getResult().getLocation().getLat().toString();
-            redisMap.put("startLonlat", startLon+","+startLat);
-            String endLon= searchPoint2.getResult().getLocation().getLng().toString().length()>9?searchPoint2.getResult().getLocation().getLng().toString().substring(0,9):searchPoint2.getResult().getLocation().getLng().toString();
-            String endLat= searchPoint2.getResult().getLocation().getLat().toString().length()>9?searchPoint2.getResult().getLocation().getLat().toString().substring(0,8):searchPoint2.getResult().getLocation().getLat().toString();
-            redisMap.put("endLonlat",endLon+","+endLat);
-            redisMap.put("vclN", capacityNumber);
-            redisMap.put("vco","2");
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
-            String qryBtm=resultOutGateTime;
-            //获得23小时、45分钟之后的时间
-            Date parse = simpleDateFormat.parse(qryBtm);
-            //时间添加
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(parse);
-            calendar.add(Calendar.HOUR_OF_DAY, 23);
-            calendar.add(Calendar.SECOND, 45);
-            redisMap.put("qryBtm", qryBtm);
-            redisMap.put("qryEtm",simpleDateFormat.format(calendar.getTime()));
-            System.out.println(redisMap);
-            String json = zhongJiaoXingLu.visualRoute(redisMap);
-            System.out.println(json.length()>100?json.substring(0,100):json);
-            return json;
-        }
-        return null;
-    }
-
-    public String removeData(){
-        offSiteTransportationService.removeDate();
-        return "success";
-    }
-
-    /**查询是否开启运输报警状态
-     * warnSwitch
-     * @param
-     * @return
-     */
-    @ApiOperation(value="查询是否开启运输报警状态")
-    @ApiImplicitParams({
-    })
-    @PostMapping(value = "/selectWarnSwitch")
-    public RESTfulResult selectWarnSwitch() {
-        Map<String,Object> warnSwitch = offSiteTransportationService.selectWarnSwitch();
-        return success(warnSwitch);
-    }
-
-    /**是否开启运输报警状态
-     * warnSwitchaddTmstruckTotalResult
-     * @param
-     * @returninTransitOrderMileage
-     */
-    @ApiOperation(value="是否开启运输报警状态")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "warnSwitch", value = "运输报警状态", required = false, dataType = "String")
-    })
-    @PostMapping(value = "/inTransitWarn")
-    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio) {
-        int i = offSiteTransportationService.updateWarnSwitch(warnSwitch,radio);
-        return success(i);
-    }
-
-    @PostMapping("/abnormalLineWarn")
-    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        System.out.println("abnormalLineWarn");
-        System.out.println(data);
-        ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
-        Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
-        int i= offSiteTransportationService.addTransportationAlarm(map);
-        return "success";
-    }
-    @PostMapping("/parkWarn")
-    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception {
-        System.out.println("parkWarn");
-        System.out.println(data);
-        ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
-        Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
-        int i=offSiteTransportationService.addTransportationAlarm(map);
-
-        return "success";
-    }
-    @PostMapping("/offLineWarn")
-    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        System.out.println("offLineWarn");
-        System.out.println(data);
-        ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
-        Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
-        int i=offSiteTransportationService.addTransportationAlarm(map);
-        return "success";
-    }
-
-    @ApiOperation(value="展示运输在途异常信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(472)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping("/getTransportAbnormalInfo")
-    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
-                                                  @RequestParam(name = "pageNum") Integer pageNum,
-                                                  @RequestParam(name = "pageSize") Integer pageSize){
-        List<Map<String, Object>> transportAbnormalInfo = offSiteTransportationService.getTransportAbnormalInfo(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> transportAbnormalInfo1 = offSiteTransportationService.getTransportAbnormalInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,transportAbnormalInfo,transportAbnormalInfo1);
-        return success(pageList);
-    }
-    @ApiOperation(value="查询路径")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "查询条件", required = false, dataType = "HashMap")
-    })
-    @PostMapping("/fullPathVisualizationByCarNumber")
-    public RouteVo fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception {
-
-        CompletableFuture<RouteVo> createOrder =routeService.fullPathVisualizationByCarNumber(mapValue);
-
-        return createOrder.get();
-    }
-
-}

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -82,13 +82,17 @@ public class StatisticalReportController extends BaseRESTfulController {
                                        String endTime,
                                        String carrierSsoId,
                                           Integer orderType,
-                                          Integer shipperId
+                                          Integer shipperId,
+                                          String receiveName
     ){
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId)){
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
+        if (receiveName != null && !"null".equals(receiveName)) {
+            mapValue.put("receivName","%" + receiveName + "%");
+        }
         mapValue.put("orderType",orderType);
         mapValue.put("shipperId",shipperId);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据

src/main/java/com/steerinfo/dil/controller/TestController.java

@@ -1,84 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
-import com.steerinfo.dil.service.impl.TmstruckMeasureCommissionServiceImpl;
-import com.steerinfo.dil.service.impl.UtilsServiceImpl;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.route.service.impl.RouteServiceImpl;
-import com.steerinfo.route.vo.Map.RouteVo;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-@RestController
-@RequestMapping("/${api.version}/Test")
-public class TestController extends BaseRESTfulController {
-
-    @Autowired
-    private RouteServiceImpl routeService;
-    @Autowired
-    private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
-
-    @Autowired
-    TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
-
-    @Autowired
-    private UtilsServiceImpl utilsService;
-
-    @PostMapping("/savePath")
-    public String savePath() throws Exception {
-
-        Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult("WYSDD2021091000000002");
-        parem.put("turnOf","0");
-        //运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-        //初始化请求参数
-//        HashMap<String,Object> mapValue=new HashMap<>();
-//        mapValue.put("orderNumber","WYSDD2021091000000001");
-//        mapValue.put("capacityNumber","豫SB6238");
-//        mapValue.put("resultOutGateTime","2021-11-17 14:20:19");
-//        mapValue.put("turnOf","0");
-//        mapValue.put("shipperName","四川达州钢铁集团有限");
-//        mapValue.put("receiveAddress","长沙市");
-        return routeService.saveRoute(parem).toString();
-    }
-    @PostMapping("/fullPath")
-    public Object fullPath(String orderNumber) throws Exception {
-        //运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-        //初始化请求参数
-        HashMap<String,Object> mapValue=new HashMap<>();
-        mapValue.put("orderNumber",orderNumber);
-        return routeService.fullPathVisualization(mapValue);
-    }
-
-
-
-
-    @PostMapping("/addMao")
-    public int addMaoMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
-        return tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
-    }
-
-    @PostMapping("/fullPathVisualizationByCarNumber")
-    public RouteVo fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue) throws Exception {
-
-        CompletableFuture<RouteVo> createOrder =routeService.fullPathVisualizationByCarNumber(mapValue);
-
-        return createOrder.get();
-    }
-
-
-    @PostMapping("/Test")
-    public int test(){
-        utilsService.pushMesToWebsocket("湘M99999","排队信息");
-        return 1;
-    }
-
-}

src/main/java/com/steerinfo/dil/controller/TmstruckLeaveFactoryResultController.java

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ESFeign;
-import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -9,19 +8,14 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.route.service.impl.RouteServiceImpl;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.File;
-import java.math.BigDecimal;
+
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -44,8 +38,7 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
 
     @Autowired
     ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
-    @Autowired
-    private RouteServiceImpl routeService;
+
     @Autowired
     ESFeign esFeign;
 

src/main/java/com/steerinfo/dil/controller/TmstruckReceiptResultController.java

@@ -1,248 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.feign.ESFeign;
-import com.steerinfo.dil.model.TmstruckReceiptResult;
-import com.steerinfo.dil.service.ITmstruckReceiptResultService;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.route.config.ImageFileUtils;
-import com.steerinfo.route.mapper.TmstruckArrivalResultMapper;
-import com.steerinfo.route.model.TmstruckReceiptResultChild;
-import com.steerinfo.route.service.impl.TmstruckReceiptResultChildServiceImpl;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * TmstruckReceiptResult RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-10 10:10
- * 类描述
- * 修订历史：
- * 日期：2021-09-10
- * 作者：generator
- * 参考：
- * 描述：TmstruckReceiptResult RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/tmstruckreceiptresults")
-public class TmstruckReceiptResultController extends BaseRESTfulController {
-
-    @Autowired
-    ITmstruckReceiptResultService tmstruckReceiptResultService;
-    @Autowired
-    TmstruckArrivalResultMapper tmstruckArrivalResultMapper;
-    @Autowired
-    TmstruckReceiptResultChildServiceImpl tmstruckReceiptResultChildService;
-
-    @Autowired
-    ESFeign esFeign;
-
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-
-    @Autowired
-    ImageFileUtils imageFileUtils;
-
-    private final SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
-
-    private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-    @ApiOperation(value="查询收货实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(107)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getReceiveResult")
-    public RESTfulResult getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer orderType,
-                                          String con
-    ){
-        mapValue.put("orderTypee", orderType);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> receiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,receiveResult);
-        return success(pageList);
-    }
-
-
-    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
-    @PostMapping("/addSteelNzReceiptResult")
-    public RESTfulResult addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map) {
-        int i = tmstruckReceiptResultService.addSteelNzReceiptResult(map);
-        return success(i);
-    }
-
-    /**
-     * 新增收货实绩
-     * @param map
-     * @return
-     */
-    @ApiOperation(value="新增收货实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "收货实绩map", required = false, dataType = "java.util.Map")
-    })
-    @PostMapping(value = "/addTmstruckReceiptResult")
-    public RESTfulResult addTmstruckReceiptResult(@RequestBody(required = false) Map<String, Object> map){
-        BigDecimal alreadyExistsArrivalResult = tmstruckArrivalResultMapper.alreadyExistsArrivalResult((String) map.get("orderNumber"));
-        if(alreadyExistsArrivalResult!=null){
-            TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-            //获取运输订单号和收货点地址
-            String orderNumber = (String) map.get("orderNumber");
-            String resultArrivalAddress = (String) map.get("resultArrivalAddress");
-            //获取空货箱照片、已签字的送货单照片
-            String resultEmptyContainerPhoto = (String) map.get("url1");
-            String resultSignedNotePhoto = (String) map.get("url2");
-            tmstruckReceiptResult.setResultArrivalAddress(resultArrivalAddress);
-            tmstruckReceiptResult.setResultEmptyContainerPhoto(resultEmptyContainerPhoto);
-            tmstruckReceiptResult.setResultSignedNotePhoto(resultSignedNotePhoto);
-            if(map.containsKey("url3")){
-                //如果有，获取客户签收单照片
-                String resultReceiveNotePhoto = (String) map.get("url3");
-                tmstruckReceiptResult.setResultReceiveNotePhoto(resultReceiveNotePhoto);
-            }
-            //新增收货实绩主表
-            BigDecimal receiptResultId = tmstruckReceiptResultService.addTmstruckReceiptResult(orderNumber, tmstruckReceiptResult);
-            //初始化收货实绩子表信息
-            TmstruckReceiptResultChild tmstruckReceiptResultChild = new TmstruckReceiptResultChild();
-            //关联收货实绩主表
-            tmstruckReceiptResultChild.setReceiptResultId(receiptResultId);
-            //如果有，获取最多三张其他照片
-            if(map.containsKey("fourFiles")){
-                List<String> fourFiles = (List<String>) map.get("fourFiles");
-                if(fourFiles.size()==0){}
-                else if(fourFiles.size()==1){
-                    tmstruckReceiptResultChild.setOtherPhoto1(fourFiles.get(0));
-                }else if(fourFiles.size()==2){
-                    tmstruckReceiptResultChild.setOtherPhoto1(fourFiles.get(0));
-                    tmstruckReceiptResultChild.setOtherPhoto2(fourFiles.get(1));
-                }else {
-                    tmstruckReceiptResultChild.setOtherPhoto1(fourFiles.get(0));
-                    tmstruckReceiptResultChild.setOtherPhoto2(fourFiles.get(1));
-                    tmstruckReceiptResultChild.setOtherPhoto3(fourFiles.get(2));
-                }
-            }
-            //新增收货实绩子表
-            int i = tmstruckReceiptResultChildService.addTmstruckReceiptResultChild(tmstruckReceiptResultChild);
-            return success(i);
-        }else{
-            return success(4);
-        }
-
-    }
-
-
-
-    @ApiOperation(value="展示抵达实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(470)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping("/getReceiptResult")
-    public RESTfulResult getReceiptResult(@RequestBody(required=false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          String startTime,
-                                          String endTime,
-                                          String con){
-        if (con != null && (con.equals("") || con.equals("undefined")) ) {
-            con = null;
-        }
-        if (con != null && con.length() != 0) {
-            mapValue.put("con","%" + con + "%");
-        }
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);
-        PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> receiptResultInfo = tmstruckReceiptResultService.getReceiptResultInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null,receiptResultInfo);
-        return success(pageList);
-    }
-
-    @ApiOperation(value = "获取抵达作业照片")
-    @PostMapping("/getReceiptPhoto")
-    public RESTfulResult getReceiptPhoto(@RequestParam String orderNumber){
-        String receiptPhoto = tmstruckReceiptResultService.getReceiptPhoto(orderNumber);
-        String photo =null;
-        try {
-            photo = imageFileUtils.downloadFile(receiptPhoto).toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return success(photo);
-    }
-
-    @ApiOperation(value="展示收货实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(470)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping("/getReceivingResult")
-    public RESTfulResult getReceivingResult(@RequestBody(required=false) Map<String, Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          String startTime,
-                                          String endTime,
-                                          String con){
-        if (con != null && (con.equals("") || con.equals("undefined")) ) {
-            con = null;
-        }
-        if (con != null && con.length() != 0) {
-            mapValue.put("con","%" + con + "%");
-        }
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);
-        PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> receiptResultInfo = tmstruckReceiptResultService.getReceivingResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null,receiptResultInfo);
-        return success(pageList);
-    }
-
-    @ApiOperation(value = "获取收货作业照片")
-    @PostMapping("/getReceivingPhoto")
-    public RESTfulResult getReceivingPhoto(@RequestParam String orderNumber) throws Exception {
-        List<Map<String,Object>> mapList = tmstruckReceiptResultService.getReceivingPhoto(orderNumber);
-
-        for(Map<String,Object> map:mapList){
-            if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
-                String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
-                map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
-            }
-            if(map.containsKey("resultSignedNotePhoto") && map.get("resultSignedNotePhoto")!=null){
-                String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultSignedNotePhoto").toString());
-              map.put("resultSignedNotePhoto",resultSignedNotePhoto);
-            }
-        }
-
-        return success(mapList.get(0));
-    }
-    @ApiOperation(value = "获取收货作业照片")
-    @PostMapping("/getReceivingPhotoByUrl")
-    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
-        List<Map<String,Object>> mapList = tmstruckReceiptResultService.getReceivingPhoto(orderNumber);
-        Map<String,Object> mapvalue = null;
-        if (mapList!=null){
-            mapvalue=mapList.get(0);
-        }
-        
-        return mapvalue;
-    }
-
-}

src/main/java/com/steerinfo/dil/service/OffSiteTransportationService.java

@@ -1,35 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.route.vo.Map.RouteVo;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-public interface OffSiteTransportationService {
-    List<Map<String, Object>> getInTransitTransportation(Map<String, Object> mapValue);
-
-    //修改是否开启运输报警状态
-    int updateWarnSwitch(String warnSwitch,String radio);
-
-    Integer getOrderStatus(Map<String, Object> map);
-
-    public Map<String, Object> getStartAndEndCapacityNumber(Map<String,Object> map);
-
-    void insertOrderMileage(Map<String, Object> ordermap);
-
-    void removeDate();
-    //查询是否开启运输报警状态
-    Map<String,Object> selectWarnSwitch();
-
-     int insertOrderTripId(Map<String, Object> map);
-
-    int addTransportationAlarm(Map<String, Object> map);
-
-    List<Map<String, Object>> getHaveAbnormalTruckOrderInfo(Map<String, Object> mapValue);
-
-    List<Map<String, Object>> getTransportAbnormalInfo(Map<String, Object> mapValue);
-
-}

src/main/java/com/steerinfo/dil/service/impl/OffSiteTransportationServiceImpl.java

@@ -1,268 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.OffSiteTransportationMapper;
-import com.steerinfo.dil.mapper.TmstruckAbnormalResultMapper;
-import com.steerinfo.dil.mapper.TmstruckInTransitWarnMapper;
-import com.steerinfo.dil.model.TmstruckAbnormalResult;
-import com.steerinfo.dil.model.TmstruckInTransitWarn;
-import com.steerinfo.dil.model.TmstruckReceiptResult;
-import com.steerinfo.dil.service.ITmstruckReceiptResultService;
-import com.steerinfo.dil.service.OffSiteTransportationService;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.route.mapper.TmstruckArrivalResultMapper;
-import com.steerinfo.route.model.TmstruckReceiptResultChild;
-import com.steerinfo.route.service.ITmstruckReceiptResultChildService;
-import com.steerinfo.route.service.impl.RouteServiceImpl;
-import com.steerinfo.route.vo.Map.RouteVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-@Service
-public class OffSiteTransportationServiceImpl implements OffSiteTransportationService {
-    @Autowired
-    private RouteServiceImpl routeService;
-    @Autowired
-    OffSiteTransportationMapper offSiteTransportationMapper;
-    @Autowired
-    private TmstruckArrivalResultMapper tmstruckArrivalResultMapper;
-    @Autowired
-    private ITmstruckReceiptResultService  tmstruckReceiptResultService;
-    @Autowired
-    private  ITmstruckReceiptResultChildService  tmstruckReceiptResultChildService;
-    @Autowired
-    private TmstruckInTransitWarnMapper tmstruckInTransitWarnMapper;
-    @Autowired
-    private TmstruckAbnormalResultMapper tmstruckAbnormalResultMapper;
-    @Override
-    public List<Map<String, Object>> getInTransitTransportation(Map<String, Object> mapValue) {
-        return offSiteTransportationMapper.getInTransitTransportation(mapValue);
-    }
-
-    @Override
-    public Integer getOrderStatus(Map<String, Object> map) {
-        String orderNumber = (String) map.get("orderNumber");
-        //判断是否已经结束
-        Integer statu= offSiteTransportationMapper.getOrderStatu(orderNumber);
-        if (statu==null){
-            return 1;
-        }
-        return statu;
-    }
-
-    @Override
-    public Map<String, Object> getStartAndEndCapacityNumber(Map<String,Object> map) {
-        return offSiteTransportationMapper.getStartAndEndCapacityNumber(map);
-    }
-
-    @Override
-    public void   insertOrderMileage(Map<String, Object> map) {
-        //获取运输订单号
-        String orderNumber = (String) map.get("orderNumber");
-        //获取并插入总实绩Id
-        BigDecimal truckTotalId = tmstruckArrivalResultMapper.getTotalIdByOrderNumber(orderNumber);
-        //获取总距离
-        String orderMileage = (String) map.get("orderMileage");
-        //将两个属性放到运输订单中
-        HashMap<String,Object> omstruckOrder=new HashMap<>();
-        omstruckOrder.put("truckTotalId",truckTotalId);
-        omstruckOrder.put("orderMileage",orderMileage);
-         offSiteTransportationMapper.insertOrderMileage(omstruckOrder);
-
-    }
-
-    @Override
-    public void removeDate() {
-       List<Map<String,Object>> list= offSiteTransportationMapper.getReceiptData();
-       for (Map<String,Object> map:list){
-         int i=  offSiteTransportationMapper.insertReceive(map);
-       }
-    }
-
-    public int orderClose(String orderNumber){
-        return offSiteTransportationMapper.orderClose(orderNumber);
-    }
-
-    @Override
-    public Map<String,Object> selectWarnSwitch() {
-        return offSiteTransportationMapper.selectWarnSwitch();
-    }
-
-    @Override
-    public int insertOrderTripId(Map<String, Object> map) {
-        //获取运输订单号
-        String orderNumber = (String) map.get("orderNumber");
-        //获取行程线路id
-        String tripId = (String) map.get("rid");
-        //将两个属性放到运输订单中
-        return offSiteTransportationMapper.insertOrderTripId(map);
-    }
-
-    public int addTransportationAlarm(Map<String,Object> map) {
-        String label = (String) map.get("label");
-        //获取行程id
-        String rid = (String) map.get("rid");
-
-        //查询是否已经收货
-        BigDecimal orderStatus = offSiteTransportationMapper.selectIsReceiving(rid);
-        if (orderStatus!=null){
-            if(label.equals("1")&&orderStatus.intValue()==1){
-                //获取异常地点
-                String abnormalAddress = (String) map.get("adr");
-                //获取异常选型
-                String abnormalType = (String) map.get("type");
-                System.out.println("map.get(time)");
-                System.out.println(map);
-                System.out.println(map.get("time"));
-                //获取异常时间
-                String time = map.get("time").toString().length()>13?map.get("time").toString().substring(0,13):map.get("time").toString();
-                long lt = new Long(time);
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Date date = new Date(lt);
-                //获取异常持续时间
-                BigDecimal abnormalDuration1 = null;
-                if(map.get("warnTime")!=null){
-                    Integer abnormalDuration = (Integer) map.get("warnTime");
-                    abnormalDuration1 = new BigDecimal(abnormalDuration);
-                }
-                //插入"偏离"、"停车"、"离线"运输报警
-                TmstruckAbnormalResult tmstruckAbnormalResult = new TmstruckAbnormalResult();
-                tmstruckAbnormalResult.setAbnormalAddress(abnormalAddress);
-                tmstruckAbnormalResult.setAbnormalType(new BigDecimal(abnormalType.toString()));
-                tmstruckAbnormalResult.setAbnormalTime(date);
-                tmstruckAbnormalResult.setAbnormalDuration(abnormalDuration1);
-                addTransportationAlarm(tmstruckAbnormalResult,rid);
-            }
-        }
-
-        return 1;
-    }
-
-    @Override
-    public List<Map<String, Object>> getHaveAbnormalTruckOrderInfo(Map<String, Object> mapValue) {
-        return offSiteTransportationMapper.getHaveAbnormalTruckOrderInfo(mapValue);
-    }
-
-    @Override
-    public List<Map<String, Object>> getTransportAbnormalInfo(Map<String, Object> mapValue) {
-        return offSiteTransportationMapper.getTransportAbnormalInfo(mapValue);
-    }
-
-
-    public synchronized int addTransportationAlarm(TmstruckAbnormalResult tmstruckAbnormalResult,String tripId) {
-        long id;
-        if(tmstruckAbnormalResultMapper.selectMaxId()==null){
-            id = 1;
-        }else {
-            id = tmstruckAbnormalResultMapper.selectMaxId().longValue()+1;
-        }
-        //生成主键id
-        tmstruckAbnormalResult.setAbnormalId(new BigDecimal(id));
-        //获取并插入总实绩Id
-        BigDecimal truckTotalId = tmstruckAbnormalResultMapper.getTotalIdByTripId(tripId);
-        tmstruckAbnormalResult.setResultTotalId(truckTotalId);
-        //常规字段
-        tmstruckAbnormalResult.setInsertUsername("admin");
-        tmstruckAbnormalResult.setInsertTime(new Date());
-        tmstruckAbnormalResult.setUpdateUsername("admin");
-        tmstruckAbnormalResult.setUpdateTime(new Date());
-        tmstruckAbnormalResult.setInsertUpdateRemark("无");
-        return tmstruckAbnormalResultMapper.insert(tmstruckAbnormalResult);
-    }
-
-
-    public String savePath() throws Exception {
-
-        Map<String, Object> parem=offSiteTransportationMapper.getTruckFactoryResult("WYSDD2021091000000002");
-        parem.put("turnOf","0");
-        return routeService.saveRoute(parem).toString();
-        //运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-        //初始化请求参数
-//        HashMap<String,Object> mapValue=new HashMap<>();
-//        mapValue.put("orderNumber","WYSDD2021091000000001");
-//        mapValue.put("capacityNumber","豫SB6238");
-//        mapValue.put("resultOutGateTime","2021-11-17 14:20:19");
-//        mapValue.put("turnOf","0");
-//        mapValue.put("shipperName","四川达州钢铁集团有限");
-//        mapValue.put("receiveAddress","长沙市");
-//        return routeService.saveRoute(parem).toString();
-    }
-
-    public Integer addTmstruckReceiptResult(@RequestBody(required = false) Map<String,Object> map){
-        BigDecimal alreadyExistsArrivalResult = tmstruckArrivalResultMapper.alreadyExistsArrivalResult((String) map.get("orderNumber"));
-        if(alreadyExistsArrivalResult!=null){
-            TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-            //获取运输订单号和收货点地址
-            String orderNumber = (String) map.get("orderNumber");
-            String resultArrivalAddress = (String) map.get("resultArrivalAddress");
-            //获取空货箱照片、已签字的送货单照片
-            String resultEmptyContainerPhoto = (String) map.get("url0");
-            String resultSignedNotePhoto = (String) map.get("url1");
-            tmstruckReceiptResult.setResultArrivalAddress(resultArrivalAddress);
-            tmstruckReceiptResult.setResultEmptyContainerPhoto(resultEmptyContainerPhoto);
-            tmstruckReceiptResult.setResultSignedNotePhoto(resultSignedNotePhoto);
-            if(map.containsKey("url3")){
-                //如果有，获取客户签收单照片
-                String resultReceiveNotePhoto = (String) map.get("url3");
-                tmstruckReceiptResult.setResultReceiveNotePhoto(resultReceiveNotePhoto);
-            }
-            //新增收货实绩主表
-            BigDecimal receiptResultId = tmstruckReceiptResultService.addTmstruckReceiptResult(orderNumber, tmstruckReceiptResult);
-            //初始化收货实绩子表信息
-            TmstruckReceiptResultChild tmstruckReceiptResultChild = new TmstruckReceiptResultChild();
-            //关联收货实绩主表
-            tmstruckReceiptResultChild.setReceiptResultId(receiptResultId);
-            //如果有，获取最多三张其他照片
-            if(map.containsKey("fourFiles")){
-                List<String> fourFiles = (List<String>) map.get("fourFiles");
-                if(fourFiles.size()==0){}
-                else if(fourFiles.size()==1){
-                    tmstruckReceiptResultChild.setOtherPhoto1(fourFiles.get(0));
-                }else if(fourFiles.size()==2){
-                    tmstruckReceiptResultChild.setOtherPhoto1(fourFiles.get(0));
-                    tmstruckReceiptResultChild.setOtherPhoto2(fourFiles.get(1));
-                }else {
-                    tmstruckReceiptResultChild.setOtherPhoto1(fourFiles.get(0));
-                    tmstruckReceiptResultChild.setOtherPhoto2(fourFiles.get(1));
-                    tmstruckReceiptResultChild.setOtherPhoto3(fourFiles.get(2));
-                }
-            }
-            //新增收货实绩子表
-            int i = tmstruckReceiptResultChildService.addTmstruckReceiptResultChild(tmstruckReceiptResultChild);
-            return i;
-        }else{
-            return 4;
-        }
-
-    }
-
-    @Override
-    public int updateWarnSwitch(String warnSwitch,String radio) {
-//        //查询数据库中是否有运输预警数据,有，则修改运输报警信息，无，则新增运输报警信息
-        TmstruckInTransitWarn tmstruckInTransitWarn = tmstruckInTransitWarnMapper.selectByPrimaryKey(new BigDecimal(1));
-        if(tmstruckInTransitWarn!=null){
-            tmstruckInTransitWarn.setWarnSwitch(warnSwitch);
-            tmstruckInTransitWarn.setWarnType(radio);
-            return tmstruckInTransitWarnMapper.updateByPrimaryKey(tmstruckInTransitWarn);
-        }else {
-            TmstruckInTransitWarn tmstruckInTransitWarn1 = new TmstruckInTransitWarn();
-            tmstruckInTransitWarn1.setWarnId(new BigDecimal(1));
-            tmstruckInTransitWarn1.setWarnSwitch(warnSwitch);
-            tmstruckInTransitWarn1.setInsertUsername("admin");
-            tmstruckInTransitWarn1.setInsertTime(new Date());
-            tmstruckInTransitWarn1.setUpdateUsername("admin");
-            tmstruckInTransitWarn1.setUpdateTime(new Date());
-            tmstruckInTransitWarn1.setInsertUpdateRemark("无");
-            tmstruckInTransitWarn1.setWarnType("0");
-            return tmstruckInTransitWarnMapper.insertSelective(tmstruckInTransitWarn1);
-        }
-    }
-}

src/main/java/com/steerinfo/dil/service/impl/StatisticalReportImpl.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.StatisticalReportMapper;
 import com.steerinfo.dil.service.IStatisticalReportService;
 import com.steerinfo.dil.util.DataChange;
+import oracle.sql.DATE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -84,7 +85,27 @@ public class StatisticalReportImpl implements IStatisticalReportService {
 
     @Override
     public List<Map<String, Object>> getAllSaleReportNum(Map<String, Object> map) {
-        return statisticalReportMapper.getAllSaleReport(map);
+         List<Map<String, Object>> listMap = statisticalReportMapper.getAllSaleReport(map);
+         for(Map<String, Object> map1 : listMap) {
+             if ( map1.get("resultEntryGateTime") == null) {
+                 map1.put("transportStatus", "未进厂");
+                 continue;
+             }
+             if (map1.get("resultOutGateTime") == null) {
+                 map1.put("transportStatus", "已进厂");
+                 continue;
+             }
+             if (map1.get("arrivaladdress") == null) {
+                 map1.put("transportStatus", "运输中");
+                 continue;
+             }
+             if (map1.get("receiveTime") == null) {
+                 map1.put("transportStatus", "已抵达");
+                 continue;
+             } else
+                 map1.put("transportStatus", "已签收");
+         }
+         return listMap;
     }
 
     /**

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -6,17 +6,12 @@ import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
-import com.steerinfo.dil.service.IUtilsService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.route.service.impl.RouteServiceImpl;
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.apache.commons.lang3.builder.ToStringExclude;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -37,8 +32,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 
     @Autowired
     private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
-    @Autowired
-    private RouteServiceImpl routeService;
+
     @Autowired
     private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
 
@@ -57,9 +51,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     @Autowired
     private TmstruckEnfactoryResultServiceImpl tmstruckEnfactoryResultService;
 
-    @Autowired
-    OffSiteTransportationServiceImpl offSiteTransportationService;
-
     @Autowired
     TmstruckSmsRusultServiceImpl tmstruckSmsRusultService;
 

src/main/java/com/steerinfo/dil/service/impl/TmstruckReceiptResultServiceImpl.java

@@ -1,175 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
-import com.steerinfo.dil.mapper.TmstruckReceiveResultMapper;
-import com.steerinfo.dil.mapper.UtilsMapper;
-import com.steerinfo.dil.model.TmstruckReceiptResult;
-import com.steerinfo.dil.service.ITmstruckReceiptResultService;
-import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.route.mapper.TmstruckArrivalResultMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * TmstruckReceiptResult服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-10 10:10
- * 类描述
- * 修订历史：
- * 日期：2021-09-10
- * 作者：generator
- * 参考：
- * 描述：TmstruckReceiptResult服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "tmstruckReceiptResultService")
-public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultService {
-
-    @Autowired
-    private TmstruckReceiptResultMapper tmstruckReceiptResultMapper;
-
-    @Autowired
-    private UtilsMapper utilsMapper;
-
-    @Autowired
-    private TmstruckReceiveResultMapper tmstruckReceiveResultMapper;
-
-    @Autowired
-    private TmstruckArrivalResultMapper tmstruckArrivalResultMapper;
-
-    @Override
-    public synchronized BigDecimal addTmstruckReceiptResult(String orderNumber, TmstruckReceiptResult tmstruckReceiptResult) {
-        long id;
-        if(tmstruckReceiptResultMapper.selectMaxId()==null){
-            id = 1;
-        }else {
-            id = tmstruckReceiptResultMapper.selectMaxId().longValue()+1;
-        }
-        //生成主键id
-        tmstruckReceiptResult.setResultId(new BigDecimal(id));
-        //获取并插入总实绩Id
-        BigDecimal truckTotalId = tmstruckArrivalResultMapper.getTotalIdByOrderNumber(orderNumber);
-        tmstruckReceiptResult.setResultTotalId(truckTotalId);
-        //常规字段
-        tmstruckReceiptResult.setInsertUsername("admin");
-        tmstruckReceiptResult.setInsertTime(new Date());
-        tmstruckReceiptResult.setUpdateUsername("admin");
-        tmstruckReceiptResult.setUpdateTime(new Date());
-        tmstruckReceiptResult.setInsertUpdateRemark("无");
-        tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);
-        return new BigDecimal(id);
-    }
-
-    @Override
-    public List<Map<String, Object>> getReceiptResultInfo(Map<String, Object> map) {
-        return tmstruckReceiptResultMapper.getReceiptResultInfo(map);
-    }
-
-    @Override
-    public String getReceiptPhoto(String orderNumber) {
-        return tmstruckReceiptResultMapper.getReceiptPhoto(orderNumber);
-    }
-
-    @Override
-    public List<Map<String, Object>> getReceivingResult(Map<String, Object> mapValue) {
-        return tmstruckReceiptResultMapper.getReceivingResult(mapValue);
-    }
-
-    @Override
-    public List<Map<String, Object>> getReceivingPhoto(String orderNumber) {
-        return tmstruckReceiptResultMapper.getReceivingPhoto(orderNumber);
-    }
-
-    /**
-     * 查询所有收货实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getReceiveResult(Map<String, Object> map) {
-        Integer orderType = (Integer) map.get("orderTypee");
-        switch (orderType){
-            case 1:
-                break;
-            case 2:
-                break;
-            case 3:
-                break;
-            case 4:
-                return tmstruckReceiptResultMapper.getSteelNzReceiptResult(map); //apiId: 266
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-            case 17:
-            case 18:
-                return tmstruckReceiveResultMapper.getCGReceiveResult(map); //apiId: 107
-            case 9:
-            case 10:
-                return tmstruckReceiveResultMapper.getInwardReceive(map); //apiId: 107
-            case 11:
-
-        }
-        return null;
-    }
-
-    /**
-     * 新增一条虚拟收货实绩
-     * @param  {resultTotalId：总实绩ID}
-     * @return
-     */
-//    public int addReceiptResult(BigDecimal resultTotalId){
-//        //根据总实绩ID查询收货实绩查看是否已收货
-//        Integer receiptResult = tmstruckReceiptResultMapper.getReceiptResult(resultTotalId);
-//        if(receiptResult != null){
-//            return 0;
-//        }
-//        //新增完卸车实绩后新增一条收货实绩
-//        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-//        tmstruckReceiptResult.setId(tmstruckReceiptResultMapper.selectMaxId());//添加主键
-//        tmstruckReceiptResult.setResultTotalId(resultTotalId);//添加总实绩Id
-//        tmstruckReceiptResult.setStatus(new BigDecimal(0)); // 卸货完成后添加的为虚拟收货实绩
-//        return tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);
-//    }
-
-    /**
-     * 确认收货（修改收货实绩为真实收货实绩）
-     * @param map {resultTotalId：总实绩ID}
-     * @return
-     */
-//    public int updateReceiptResult(Map<String, Object> map){
-//        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-//        tmstruckReceiptResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-//        tmstruckReceiptResult.setStatus(new BigDecimal(1));
-//        tmstruckReceiptResult.setInsertUsername("admin");
-//        tmstruckReceiptResult.setInsertTime(new Date());
-//        return tmstruckReceiptResultMapper.updateByTotalResultId(tmstruckReceiptResult);
-//    }
-
-    /**
-     * 新增钢材到异地库达州站驻港人员确定收货
-     * @param map
-     * @return
-     */
-    public int addSteelNzReceiptResult(Map<String, Object> map){
-        String orderNumber = (String) map.get("orderNumber");
-        //通过运输订单号获取总实绩ID
-        BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderNumber(orderNumber);
-        //获取异地库ID
-        BigDecimal warehouseId =  DataChange.dataToBigDecimal(map.get("warehouseId"));
-        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-        tmstruckReceiptResult.setResultId(tmstruckReceiptResultMapper.selectMaxId());
-        tmstruckReceiptResult.setResultTotalId(resultTotalId);
-        tmstruckReceiptResult.setStatus(new BigDecimal(1));
-        tmstruckReceiptResult.setWarehouseId(warehouseId);
-        tmstruckReceiptResult.setInsertTime(new Date());
-        tmstruckReceiptResult.setInsertUsername("admin");
-        return tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);
-    }
-}

src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -35,8 +35,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     @Autowired
     private TmstruckUnloadResultMapper tmstruckUnloadResultMapper;
 
-    @Autowired
-    private TmstruckReceiptResultServiceImpl tmstruckReceiptResultService;
 
     @Autowired
     private TmstruckReceiveResultServiceImpl tmstruckReceiveResultService;
@@ -50,8 +48,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     @Autowired
     private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
 
-    @Autowired
-    private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
 
     @Autowired
     OmsFeign omsFeign;

src/main/java/com/steerinfo/route/config/FileUtils.java

@@ -1,12 +0,0 @@
-package com.steerinfo.route.config;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-public interface FileUtils {
-
-    public List<String> updateFiles(MultipartFile files[])throws Exception;
-
-     public Object downloadFile(String url) throws Exception;
-}

src/main/java/com/steerinfo/route/config/ImageFileUtils.java

@@ -1,234 +0,0 @@
-package com.steerinfo.route.config;
-
-import com.steerinfo.framework.utils.misc.IdGenerator;
-import com.steerinfo.framework.utils.upload.UploadUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.*;
-
-@Component
-public class ImageFileUtils implements FileUtils {
-
-    @Value(value = "${piction.path:/shared}" )
-    private String path;
-
-    public static final HashMap fileTypes = new HashMap();
-
-    static {
-
-        // images
-
-        fileTypes.put("FFD8FF", "jpg");
-
-        fileTypes.put("89504E47", "png");
-
-        fileTypes.put("47494638", "gif");
-
-        fileTypes.put("49492A00", "tif");
-
-        fileTypes.put("424D", "bmp");
-
-        // CAD
-
-        fileTypes.put("41433130", "dwg");
-
-        fileTypes.put("38425053", "psd");
-
-        // 日记本
-
-        fileTypes.put("7B5C727466", "rtf");
-
-        fileTypes.put("3C3F786D6C", "xml");
-
-        fileTypes.put("68746D6C3E", "html");
-
-        // 邮件
-
-        fileTypes.put("44656C69766572792D646174653A", "eml");
-
-        fileTypes.put("D0CF11E0", "doc");
-
-        //excel2003版本文件
-
-        fileTypes.put("D0CF11E0", "xls");
-
-        fileTypes.put("5374616E64617264204A", "mdb");
-
-        fileTypes.put("252150532D41646F6265", "ps");
-
-        fileTypes.put("255044462D312E", "pdf");
-
-        fileTypes.put("504B0304", "docx");
-
-        //excel2007以上版本文件
-
-        fileTypes.put("504B0304", "xlsx");
-
-        fileTypes.put("52617221", "rar");
-
-        fileTypes.put("57415645", "wav");
-
-        fileTypes.put("41564920", "avi");
-
-        fileTypes.put("2E524D46", "rm");
-
-        fileTypes.put("000001BA", "mpg");
-
-        fileTypes.put("000001B3", "mpg");
-
-        fileTypes.put("6D6F6F76", "mov");
-
-        fileTypes.put("3026B2758E66CF11", "asf");
-
-        fileTypes.put("4D546864", "mid");
-
-        fileTypes.put("1F8B08", "gz");
-
-    }
-
-
-    /**
-     * 上传多张图片
-     * @param files
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public synchronized List<String> updateFiles(MultipartFile files[]) throws Exception {
-        //首先通过Calendard对象获得年月日
-        Calendar calendar= Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-        int month = calendar.get(Calendar.MONTH);
-        int day= calendar.get(Calendar.DAY_OF_MONTH);
-        //上传文件夹路径
-        List<String> urls=new ArrayList<>();
-        for (int i=0;i<files.length;i++){
-            String url = UploadUtils.uploadFile(files[i], new IdGenerator(i, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
-            urls.add(url);
-        }
-        return urls;
-    }
-
-
-    /**
-     * 上传单张图片
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    public synchronized String updateFile(MultipartFile file) throws Exception {
-        //首先通过Calendard对象获得年月日
-        Calendar calendar= Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-        int month = calendar.get(Calendar.MONTH);
-        int day= calendar.get(Calendar.DAY_OF_MONTH);
-        String url = UploadUtils.uploadFile(file, new IdGenerator(0, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
-        return url;
-    }
-
-    /**
-     * 下载图片获得字节码
-     * @param filePath
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public Object downloadFile(String filePath) throws Exception {
-        File file = new File(filePath);
-        if(file.isDirectory()){
-
-            throw new RuntimeException("当前路径是目录");
-
-        }
-        byte[] b = bytes(file);
-        String type =getFileHeader(b);
-        String src="data:image/"+type+";base64,"+ Base64.getEncoder().encodeToString(b);
-        return src;
-    }
-
-
-
-
-    /**
-     * @return 文件头信息
-     * @author liang.pan
-     * <p>
-     * 方法描述：根据输入流获取文件头信息
-     */
-    public static String getFileHeader(byte[] b) {
-        String value = bytesToHexString(b);
-
-        if (StringUtils.startsWith(value, "FFD8FF")) {
-            value = value.substring(0, 6);
-        }
-
-        //判断什么类型的
-        Set set = fileTypes.keySet();
-        Iterator iterator = set.iterator();
-        while(iterator.hasNext()){
-            String key=iterator.next().toString();
-            if (value.contains(key)){
-                return fileTypes.get(key).toString();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @param src 要读取文件头信息的文件的byte数组
-     * @return 文件头信息
-     * @author liang.pan
-     * <p>
-     * 方法描述：将要读取文件头信息的文件的byte数组转换成string类型表示
-     */
-    private static String bytesToHexString(byte[] src) {
-        StringBuilder builder = new StringBuilder();
-        if (src == null || src.length <= 0) {
-            return null;
-        }
-        String hv;
-        for (int i = 0; i < src.length; i++) {
-            // 以十六进制（基数 16）无符号整数形式返回一个整数参数的字符串表示形式，并转换为大写
-            hv = Integer.toHexString(src[i] & 0xFF).toUpperCase();
-            if (hv.length() < 2) {
-                builder.append(0);
-            }
-            builder.append(hv);
-        }
-        return builder.toString();
-    }
-
-
-    public byte[] bytes(File file) throws Exception {
-        FileInputStream fin = new FileInputStream(file);
-        try {
-            //可能溢出,简单起见就不考虑太多,如果太大就要另外想办法，比如一次传入固定长度byte[]
-            byte[] bytes  = new byte[fin.available()];
-            //将文件内容写入字节数组，提供测试的case
-            fin.read(bytes);
-            fin.close();
-            return bytes;
-        }catch (Exception ex){
-            throw ex;
-        }
-        finally {
-            if (null != fin) {
-
-                try {
-
-                    fin.close();
-
-                } catch (IOException e) {
-
-                }
-
-            }
-        }
-    }
-}

src/main/java/com/steerinfo/route/config/KeyExpiredListener.java

@@ -1,56 +0,0 @@
-package com.steerinfo.route.config;
-
-import com.alibaba.fastjson.JSON;
-import com.steerinfo.route.threeRequest.ZhongJiaoXingLu;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.connection.Message;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
-
-@Api("redis过期的监听")
-public class KeyExpiredListener extends KeyExpirationEventMessageListener
-{
-    @Value("${redis.prefix.order}")
-    private String prefixOrder;
-    @Value("${redis.prefix.line}")
-    private String prefixLine;
-    @Value("${redis.prefix.suffix}")
-    private String suffix;
-    @Autowired
-    private RedisTemplate redisTemplate;
-    @Autowired
-    private ZhongJiaoXingLu zhongJiaoXingLu;
-    public KeyExpiredListener(RedisMessageListenerContainer listenerContainer)
-    {
-        super(listenerContainer);
-    }
-    @Override
-    public void onMessage(Message message, byte[] pattern)
-    {
-        //当订单快超过三天，这边就要对路径进行保存了
-        if (message.toString().startsWith(prefixOrder)){
-            String redisJson = (String) redisTemplate.opsForValue().get(message.toString()+suffix);
-            redisTemplate.delete(message.toString()+suffix);
-            HashMap mapValue = JSON.parseObject(redisJson, HashMap.class);
-            String json = zhongJiaoXingLu.visualRoute(mapValue);
-            //设置60天后过期
-            Calendar calendar= Calendar.getInstance();
-            long agoTime= calendar.getTime().getTime();
-            calendar.add(Calendar.MONTH,2);
-            long lateTime= calendar.getTime().getTime();
-            long saveTime=(lateTime-agoTime)/1000;
-            String orderId=message.toString().replace(prefixOrder+":","");
-            if (json!=null){
-                redisTemplate.opsForValue().set(prefixLine+":"+orderId, json, saveTime, TimeUnit.SECONDS);
-            }
-
-        }
-    }
-}

src/main/java/com/steerinfo/route/controller/TmstruckArrivalResultController.java

@@ -1,124 +0,0 @@
-package com.steerinfo.route.controller;
-
-import com.steerinfo.dil.feign.ColumnDataFeign;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.route.config.ImageFileUtils;
-import com.steerinfo.route.model.TmstruckArrivalResult;
-import com.steerinfo.route.service.ITmstruckArrivalResultService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * TmstruckArrivalResult RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-06 07:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-06
- * 作者：generator
- * 参考：
- * 描述：TmstruckArrivalResult RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/tmstruckarrivalresults")
-public class TmstruckArrivalResultController extends BaseRESTfulController {
-
-    @Autowired
-    ImageFileUtils imageFileUtils;
-    @Autowired
-    ITmstruckArrivalResultService tmstruckArrivalResultService;
-
-    @Autowired
-    ColumnDataFeign columnDataFeign;
-
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-
-    /**
-     * 新增抵达实绩信息
-     * @param map
-     * @return
-     */
-    @ApiOperation(value="新增抵达实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "map", value = "抵达实绩map", required = false, dataType = "java.util.Map")
-    })
-    @PostMapping(value = "/addtmstruckArrivalResult2")
-    public RESTfulResult addtmstruckArrivalResult2(@RequestBody(required = false) Map<String, Object> map){
-        String orderNumber = (String) map.get("orderNumber");
-        String resultArrivalAddress = (String) map.get("resultArrivalAddress");
-        String resultFullContainerPhoto = (String) map.get("url");
-        TmstruckArrivalResult tmstruckArrivalResult = new TmstruckArrivalResult();
-        tmstruckArrivalResult.setResultArrivalAddress(resultArrivalAddress);
-        tmstruckArrivalResult.setResultFullContainerPhoto(resultFullContainerPhoto);
-        int i = tmstruckArrivalResultService.addtmstruckArrivalResult(orderNumber,tmstruckArrivalResult);
-        return success(i);
-    }
-
-    @PostMapping(value = "/addtmstruckArrivalResult")
-    public RESTfulResult addtmstruckArrivalResult(String orderNumber, String resultArrivalAddress, MultipartFile file) throws Exception {
-
-        String url = imageFileUtils.updateFile(file);
-        TmstruckArrivalResult tmstruckArrivalResult = new TmstruckArrivalResult();
-        tmstruckArrivalResult.setResultArrivalAddress(resultArrivalAddress);
-        tmstruckArrivalResult.setResultFullContainerPhoto(url);
-        int i = tmstruckArrivalResultService.addtmstruckArrivalResult(orderNumber,tmstruckArrivalResult);
-        return success(i);
-
-    }
-
-    @ApiOperation(value="展示抵达实绩信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId(136)", value = "表头", required = false, dataType = "Interger")
-    })
-    @PostMapping("/getArrivalResultInfo")
-    public RESTfulResult getArrivalResultInfo(@RequestBody(required=false) Map<String, Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize){
-
-        if(mapValue.containsKey("startTime")&&mapValue.containsKey("endTime")){
-            Date startDate=new Date(Long.parseLong(mapValue.get("startTime").toString())) ;
-            Date endDate=new Date(Long.parseLong(mapValue.get("endTime").toString())) ;
-            Calendar ca = Calendar.getInstance();
-            ca.setTime(endDate);
-            ca.add(Calendar.DATE,1);
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-            String startTime1=simpleDateFormat.format(startDate);
-            String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
-        }
-        List<Map<String, Object>> arrivalResultInfo = tmstruckArrivalResultService.getArrivalResultInfo(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> arrivalResultInfo1 = tmstruckArrivalResultService.getArrivalResultInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,arrivalResultInfo,arrivalResultInfo1);
-        return success(pageList);
-    }
-    @ApiOperation("通过运输订单号获得收货地址的市区")
-    @GetMapping("/getAddressDistrict")
-    public String getAddressDistrict(@RequestParam(required = true) String orderNumber){
-        String addressDistrict=tmstruckArrivalResultService.getAddressDistrict(orderNumber);
-        return addressDistrict;
-    }
-
-    @PostMapping(value = "/uploadImage")
-    public String uploadImage(String orderNumber,MultipartFile file) throws Exception {
-        String url = imageFileUtils.updateFile(file);
-        return url;
-    }
-}

src/main/java/com/steerinfo/route/controller/TmstruckReceiptResultChildController.java

@@ -1,30 +0,0 @@
-package com.steerinfo.route.controller;
-
-
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.route.service.ITmstruckReceiptResultChildService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * TmstruckReceiptResultChild RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-06 07:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-06
- * 作者：generator
- * 参考：
- * 描述：TmstruckReceiptResultChild RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/tmstruckreceiptresultchilds")
-public class TmstruckReceiptResultChildController extends BaseRESTfulController {
-
-    @Autowired
-    ITmstruckReceiptResultChildService tmstruckReceiptResultChildService;
-
-}

src/main/java/com/steerinfo/route/controller/ZhongJiaoXingLuContoller.java

@@ -1,64 +0,0 @@
-package com.steerinfo.route.controller;
-
-//import com.steerinfo.route.feign.TMSFeign;
-import com.steerinfo.route.threeRequest.ZhongJiaoXingLu;
-import com.steerinfo.route.util.DataConversionTool;
-import com.steerinfo.route.vo.ResultWarn;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-@RestController
-@RequestMapping("apis")
-public class ZhongJiaoXingLuContoller {
-
-//    偏离预警回调示例：https://xxxx.xxxx.xxx/apis/abnormalLineWarn
-//    停车预警回调示例：https:// xxxx.xxxx.xxx/apis/parkWarn
-//    离线预警回调示例：https:// xxxx.xxxx.xxx/apis/offLineWarn
-    @Autowired
-    private ZhongJiaoXingLu zhongJiaoXingLu;
-
-    //TMSFeign tmsFeign;
-   // @PostMapping("/recordInfo")
-//    public String startTransit(String data) throws Exception {
-//
-//        HashMap<String,Object> mapValue= (HashMap<String, Object>) JSON.parse(data);
-//        //System.out.println(mapValue);
-//        omsFeign.addOmstruckOrder(mapValue);
-//        return "success";
-//    }
-    @PostMapping("/abnormalLineWarn")
-    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        System.out.println("abnormalLineWarn");
-        ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
-        Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
-        //tmsFeign.addTransportationAlarm(map);
-        System.out.println("success");
-        return "success";
-    }
-    @PostMapping("/parkWarn")
-    public String parkWarn(@RequestParam(value = "data") String data) throws Exception {
-        System.out.println("parkWarn");
-        ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
-        Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
-       // tmsFeign.addTransportationAlarm(map);
-        System.out.println("success");
-        return "success";
-    }
-    @PostMapping("/offLineWarn")
-    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception {
-        System.out.println("offLineWarn");
-        ResultWarn resultWarn= (ResultWarn) DataConversionTool.jsonToBean(data, ResultWarn.class);
-        Map<String, Object> map=  DataConversionTool.objectToMap(resultWarn);
-        //tmsFeign.addTransportationAlarm(map);
-        System.out.println("success");
-        return "success";
-    }
-
-
-
-}

src/main/java/com/steerinfo/route/mapper/DilVersionMapper.java

@@ -1,19 +0,0 @@
-package com.steerinfo.route.mapper;
-
-import com.steerinfo.dil.model.DilVersion;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.math.BigDecimal;
-
-@Mapper
-public interface DilVersionMapper extends IBaseMapper<DilVersion, BigDecimal> {
-    @Select("select VERSION_VALUE from DIL_VERSION where VERSION_TYPE = 3")
-    String getToken();
-
-    @Update("update DIL_VERSION set VERSION_VALUE = #{token}, UPDATE_TIME = SYSDATE where VERSION_TYPE = 3")
-    int updateToken(@Param("token") String token);
-}

src/main/java/com/steerinfo/route/mapper/TmstruckArrivalResultMapper.java

@@ -1,30 +0,0 @@
-package com.steerinfo.route.mapper;
-
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.route.model.TmstruckArrivalResult;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface TmstruckArrivalResultMapper extends IBaseMapper<TmstruckArrivalResult, BigDecimal> {
-    //获取主键最大值
-    BigDecimal selectMaxId();
-    //获取抵达实绩信息
-    List<Map<String, Object>> getArrivalResultInfo(Map<String, Object> map);
-
-    //查询是否存在抵达实绩
-    BigDecimal alreadyExistsArrivalResult(String orderNumber);
-
-    String getAddressDistrict(String orderNumber);
-
-    List<String> getAdjustment();
-
-    int updateTown(@Param("city") String city, @Param("item") String item);
-
-    //通过运输订单号获取总实绩Id
-    BigDecimal getTotalIdByOrderNumber(String capacityNumber);
-}

src/main/java/com/steerinfo/route/mapper/TmstruckReceiptResultChildMapper.java

@@ -1,13 +0,0 @@
-package com.steerinfo.route.mapper;
-
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.route.model.TmstruckReceiptResultChild;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.math.BigDecimal;
-
-@Mapper
-public interface TmstruckReceiptResultChildMapper extends IBaseMapper<TmstruckReceiptResultChild, BigDecimal> {
-    //获取主键最大值
-    BigDecimal selectMaxId();
-}

src/main/java/com/steerinfo/route/model/TmstruckArrivalResult.java

@@ -1,184 +0,0 @@
-package com.steerinfo.route.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel(value="汽运抵达实绩")
-public class TmstruckArrivalResult implements IBasePO<BigDecimal> {
-    /**
-     * 实绩ID(RESULT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="实绩ID",required=true)
-    private BigDecimal resultId;
-
-    /**
-     * 作业点ID(POINT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="作业点ID",required=false)
-    private BigDecimal pointId;
-
-    /**
-     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="总实绩ID",required=false)
-    private BigDecimal resultTotalId;
-
-    /**
-     * 抵达收货点的地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,20)
-     */
-    @ApiModelProperty(value="抵达收货点的地址",required=false)
-    private String resultArrivalAddress;
-
-    /**
-     * 满货箱照片(RESULT_FULL_CONTAINER_PHOTO,VARCHAR,100)
-     */
-    @ApiModelProperty(value="满货箱照片",required=false)
-    private String resultFullContainerPhoto;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.resultId;
-    }
-
-    @Override
-    public void setId(BigDecimal resultId) {
-        this.resultId = resultId;
-    }
-
-    public BigDecimal getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(BigDecimal resultId) {
-        this.resultId = resultId;
-    }
-
-    public BigDecimal getPointId() {
-        return pointId;
-    }
-
-    public void setPointId(BigDecimal pointId) {
-        this.pointId = pointId;
-    }
-
-    public BigDecimal getResultTotalId() {
-        return resultTotalId;
-    }
-
-    public void setResultTotalId(BigDecimal resultTotalId) {
-        this.resultTotalId = resultTotalId;
-    }
-
-    public String getResultArrivalAddress() {
-        return resultArrivalAddress;
-    }
-
-    public void setResultArrivalAddress(String resultArrivalAddress) {
-        this.resultArrivalAddress = resultArrivalAddress == null ? null : resultArrivalAddress.trim();
-    }
-
-    public String getResultFullContainerPhoto() {
-        return resultFullContainerPhoto;
-    }
-
-    public void setResultFullContainerPhoto(String resultFullContainerPhoto) {
-        this.resultFullContainerPhoto = resultFullContainerPhoto == null ? null : resultFullContainerPhoto.trim();
-    }
-
-    public String getInsertUsername() {
-        return insertUsername;
-    }
-
-    public void setInsertUsername(String insertUsername) {
-        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public String getUpdateUsername() {
-        return updateUsername;
-    }
-
-    public void setUpdateUsername(String updateUsername) {
-        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getInsertUpdateRemark() {
-        return insertUpdateRemark;
-    }
-
-    public void setInsertUpdateRemark(String insertUpdateRemark) {
-        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", resultId=").append(resultId);
-        sb.append(", pointId=").append(pointId);
-        sb.append(", resultTotalId=").append(resultTotalId);
-        sb.append(", resultArrivalAddress=").append(resultArrivalAddress);
-        sb.append(", resultFullContainerPhoto=").append(resultFullContainerPhoto);
-        sb.append(", insertUsername=").append(insertUsername);
-        sb.append(", insertTime=").append(insertTime);
-        sb.append(", updateUsername=").append(updateUsername);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/route/model/TmstruckReceiptResult.java

@@ -1,227 +0,0 @@
-package com.steerinfo.route.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel(value="收货实绩")
-public class TmstruckReceiptResult implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(RESULT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal resultId;
-
-    /**
-     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="总实绩ID",required=false)
-    private BigDecimal resultTotalId;
-
-    /**
-     * 空货箱照片(RESULT_EMPTY_CONTAINER_PHOTO,VARCHAR,100)
-     */
-    @ApiModelProperty(value="空货箱照片",required=false)
-    private String resultEmptyContainerPhoto;
-
-    /**
-     * 已签字的送货单照片(RESULT_SIGNED_NOTE_PHOTO,VARCHAR,100)
-     */
-    @ApiModelProperty(value="已签字的送货单照片",required=false)
-    private String resultSignedNotePhoto;
-
-    /**
-     * 客户签收单照片(RESULT_RECEIVE_NOTE_PHOTO,VARCHAR,100)
-     */
-    @ApiModelProperty(value="客户签收单照片",required=false)
-    private String resultReceiveNotePhoto;
-
-    /**
-     * 异地库ID(WAREHOUSE_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="异地库ID",required=false)
-    private BigDecimal warehouseId;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-    /**
-     * 收货状态(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货状态",required=false)
-    private BigDecimal status;
-
-    /**
-     * 抵达收货点的地址(RESULT_ARRIVAL_ADDRESS,VARCHAR,100)
-     */
-    @ApiModelProperty(value="抵达收货点的地址",required=false)
-    private String resultArrivalAddress;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.resultId;
-    }
-
-    @Override
-    public void setId(BigDecimal resultId) {
-        this.resultId = resultId;
-    }
-
-    public BigDecimal getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(BigDecimal resultId) {
-        this.resultId = resultId;
-    }
-
-    public BigDecimal getResultTotalId() {
-        return resultTotalId;
-    }
-
-    public void setResultTotalId(BigDecimal resultTotalId) {
-        this.resultTotalId = resultTotalId;
-    }
-
-    public String getResultEmptyContainerPhoto() {
-        return resultEmptyContainerPhoto;
-    }
-
-    public void setResultEmptyContainerPhoto(String resultEmptyContainerPhoto) {
-        this.resultEmptyContainerPhoto = resultEmptyContainerPhoto == null ? null : resultEmptyContainerPhoto.trim();
-    }
-
-    public String getResultSignedNotePhoto() {
-        return resultSignedNotePhoto;
-    }
-
-    public void setResultSignedNotePhoto(String resultSignedNotePhoto) {
-        this.resultSignedNotePhoto = resultSignedNotePhoto == null ? null : resultSignedNotePhoto.trim();
-    }
-
-    public String getResultReceiveNotePhoto() {
-        return resultReceiveNotePhoto;
-    }
-
-    public void setResultReceiveNotePhoto(String resultReceiveNotePhoto) {
-        this.resultReceiveNotePhoto = resultReceiveNotePhoto == null ? null : resultReceiveNotePhoto.trim();
-    }
-
-    public BigDecimal getStatus() {
-        return status;
-    }
-
-    public void setStatus(BigDecimal status) {
-        this.status = status;
-    }
-
-    public BigDecimal getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(BigDecimal warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getInsertUsername() {
-        return insertUsername;
-    }
-
-    public void setInsertUsername(String insertUsername) {
-        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public String getUpdateUsername() {
-        return updateUsername;
-    }
-
-    public void setUpdateUsername(String updateUsername) {
-        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getInsertUpdateRemark() {
-        return insertUpdateRemark;
-    }
-
-    public void setInsertUpdateRemark(String insertUpdateRemark) {
-        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
-    }
-
-    public String getResultArrivalAddress() {
-        return resultArrivalAddress;
-    }
-
-    public void setResultArrivalAddress(String resultArrivalAddress) {
-        this.resultArrivalAddress = resultArrivalAddress == null ? null : resultArrivalAddress.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", resultId=").append(resultId);
-        sb.append(", resultTotalId=").append(resultTotalId);
-        sb.append(", resultEmptyContainerPhoto=").append(resultEmptyContainerPhoto);
-        sb.append(", resultSignedNotePhoto=").append(resultSignedNotePhoto);
-        sb.append(", resultReceiveNotePhoto=").append(resultReceiveNotePhoto);
-        sb.append(", warehouseId=").append(warehouseId);
-        sb.append(", insertUsername=").append(insertUsername);
-        sb.append(", insertTime=").append(insertTime);
-        sb.append(", updateUsername=").append(updateUsername);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", resultArrivalAddress=").append(resultArrivalAddress);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/route/model/TmstruckReceiptResultChild.java

@@ -1,184 +0,0 @@
-package com.steerinfo.route.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel(value="收货实绩子表")
-public class TmstruckReceiptResultChild implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(CHILD_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal childId;
-
-    /**
-     * 收货实绩ID(RECEIPT_RESULT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="收货实绩ID",required=false)
-    private BigDecimal receiptResultId;
-
-    /**
-     * 其他照片1(OTHER_PHOTO1,VARCHAR,100)
-     */
-    @ApiModelProperty(value="其他照片1",required=false)
-    private String otherPhoto1;
-
-    /**
-     * 其他照片2(OTHER_PHOTO2,VARCHAR,100)
-     */
-    @ApiModelProperty(value="其他照片2",required=false)
-    private String otherPhoto2;
-
-    /**
-     * 其他照片3(OTHER_PHOTO3,VARCHAR,100)
-     */
-    @ApiModelProperty(value="其他照片3",required=false)
-    private String otherPhoto3;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.childId;
-    }
-
-    @Override
-    public void setId(BigDecimal childId) {
-        this.childId = childId;
-    }
-
-    public BigDecimal getChildId() {
-        return childId;
-    }
-
-    public void setChildId(BigDecimal childId) {
-        this.childId = childId;
-    }
-
-    public BigDecimal getReceiptResultId() {
-        return receiptResultId;
-    }
-
-    public void setReceiptResultId(BigDecimal receiptResultId) {
-        this.receiptResultId = receiptResultId;
-    }
-
-    public String getOtherPhoto1() {
-        return otherPhoto1;
-    }
-
-    public void setOtherPhoto1(String otherPhoto1) {
-        this.otherPhoto1 = otherPhoto1 == null ? null : otherPhoto1.trim();
-    }
-
-    public String getOtherPhoto2() {
-        return otherPhoto2;
-    }
-
-    public void setOtherPhoto2(String otherPhoto2) {
-        this.otherPhoto2 = otherPhoto2 == null ? null : otherPhoto2.trim();
-    }
-
-    public String getOtherPhoto3() {
-        return otherPhoto3;
-    }
-
-    public void setOtherPhoto3(String otherPhoto3) {
-        this.otherPhoto3 = otherPhoto3 == null ? null : otherPhoto3.trim();
-    }
-
-    public String getInsertUsername() {
-        return insertUsername;
-    }
-
-    public void setInsertUsername(String insertUsername) {
-        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public String getUpdateUsername() {
-        return updateUsername;
-    }
-
-    public void setUpdateUsername(String updateUsername) {
-        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getInsertUpdateRemark() {
-        return insertUpdateRemark;
-    }
-
-    public void setInsertUpdateRemark(String insertUpdateRemark) {
-        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", childId=").append(childId);
-        sb.append(", receiptResultId=").append(receiptResultId);
-        sb.append(", otherPhoto1=").append(otherPhoto1);
-        sb.append(", otherPhoto2=").append(otherPhoto2);
-        sb.append(", otherPhoto3=").append(otherPhoto3);
-        sb.append(", insertUsername=").append(insertUsername);
-        sb.append(", insertTime=").append(insertTime);
-        sb.append(", updateUsername=").append(updateUsername);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/route/service/ITmstruckArrivalResultService.java

@@ -1,34 +0,0 @@
-package com.steerinfo.route.service;
-
-
-
-import com.steerinfo.route.model.TmstruckArrivalResult;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TmstruckArrivalResult服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-06 07:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-06
- * 作者：generator
- * 参考：
- * 描述：TmstruckArrivalResult服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface ITmstruckArrivalResultService {
-    //新增抵达实绩
-    int addtmstruckArrivalResult(String orderNumber, TmstruckArrivalResult tmstruckArrivalResult);
-    //获取抵达实绩信息
-    List<Map<String, Object>> getArrivalResultInfo(Map<String, Object> map);
-
-    String getAddressDistrict(String orderNumber);
-
-    List<String> getAdjustment();
-
-    int updateTown(String city, String item);
-}

src/main/java/com/steerinfo/route/service/ITmstruckReceiptResultChildService.java

@@ -1,22 +0,0 @@
-package com.steerinfo.route.service;
-
-
-import com.steerinfo.route.model.TmstruckReceiptResultChild;
-
-/**
- * TmstruckReceiptResultChild服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-06 07:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-06
- * 作者：generator
- * 参考：
- * 描述：TmstruckReceiptResultChild服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface ITmstruckReceiptResultChildService {
-    //添加收货实绩子表
-    int addTmstruckReceiptResultChild(TmstruckReceiptResultChild tmstruckReceiptResultChild);
-}

src/main/java/com/steerinfo/route/service/RouteService.java

@@ -1,18 +0,0 @@
-package com.steerinfo.route.service;
-
-import com.steerinfo.route.vo.Map.RouteVo;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-public interface RouteService {
-    CompletableFuture<String> saveRoute(Map mapValue) throws Exception;
-
-    CompletableFuture<RouteVo> fullPathVisualization(HashMap mapValue) throws Exception;
-
-    public CompletableFuture<String> saveRequstionDate(Map mapValue) throws Exception;
-
-    public CompletableFuture<RouteVo> fullPathVisualizationByCarNumber(HashMap mapValue) throws Exception;
-
-}

src/main/java/com/steerinfo/route/service/impl/RouteServiceImpl.java

@@ -1,849 +0,0 @@
-package com.steerinfo.route.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-
-import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
-import com.steerinfo.dil.service.OffSiteTransportationService;
-import com.steerinfo.dil.service.impl.OffSiteTransportationServiceImpl;
-import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.route.service.RouteService;
-import com.steerinfo.route.threeRequest.ZhongJiaoXingLu;
-import com.steerinfo.route.util.DataConversionTool;
-import com.steerinfo.route.util.HTTPRequestUtils;
-import com.steerinfo.route.util.LngLonUtil;
-import com.steerinfo.route.vo.FullPathVisualizationTo.ViewVisualization;
-import com.steerinfo.route.vo.Map.Point;
-import com.steerinfo.route.vo.Map.RouteVo;
-import com.steerinfo.route.vo.Map.RunRoutePoint;
-import com.steerinfo.route.vo.Map.StartAndEndRoute;
-import com.steerinfo.route.vo.resultJson.SearchPoint;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.math.BigDecimal;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@Service(value = "xmsService")
-public class RouteServiceImpl implements RouteService {
-    @Autowired
-    private RedisTemplate redisTemplate;
-    @Autowired
-    private ZhongJiaoXingLu zhongJiaoXingLu;
-
-    @Autowired
-    private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
-    @Autowired
-    private OffSiteTransportationServiceImpl offSiteTransportationService;
-    @Value("${str.tengxun.key}")
-    private String key;
-    @Value("${redis.prefix.order}")
-    private String prefixOrder;
-    @Value("${redis.prefix.line}")
-    private String prefixLine;
-    @Value("${redis.prefix.suffix}")
-    private String suffix;
-
-    //必须参数 运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-
-    public CompletableFuture<String> createTotalResult(Map mapValue) throws Exception {
-
-        if (mapValue.containsKey("capacityNumber")&&mapValue.containsKey("receiveAddress")&&mapValue.containsKey("shipperName")&&mapValue.containsKey("orderNumber")){
-
-
-        }
-        //carryno车牌号 ,gatepostName 门岗名称 resultOutGateTime出门时间
-        SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        if (true) {
-                //创建物质信息需要字段(本地字段名称：视图字段名称 中文解释) unitOfMeasureDesc单位、materialName：cMaterieldes：名称、 materialSpecification：cSpec：规格、materialModel：cMaterielcode：型号，
-                HashMap materieldesMap=new HashMap();
-
-
-                // System.out.println("https://apis.map.qq.com/ws/geocoder/v1/"+"address="+ URLEncoder.encode(vcMeasurerec.getcSupplydes(),"utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-                //创建托运人需要字段 (本地字段名称：视图字段名称 中文解释)cSupplyid：shipperCode 托运方代码 、cSupplydes：shipperName 托运方名称、addressLongitude 托运方地址经度、addressLatitude托运方地址纬度
-                String searchPointJson = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+URLEncoder.encode(mapValue.get("shipperName")==null?"安钢集团信阳钢铁有限责任公司":mapValue.get("shipperName").toString(),"utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-                SearchPoint searchPoint= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson, SearchPoint.class);
-                if (searchPoint.getStatus()==0){
-
-                    materieldesMap.put("addressLongitude",searchPoint.getResult().getLocation().getLng());
-                    materieldesMap.put("addressLatitude",searchPoint.getResult().getLocation().getLat());
-                }else {
-                    materieldesMap.put("addressLongitude",new BigDecimal(114.036293));
-                    materieldesMap.put("addressLatitude",new BigDecimal(32.483276));
-                }
-
-
-
-                //创建收货地址需要的字段    addressProvince 省份、addressDistrict 市区、addressTown 县镇 、addressDeliveryAddress 收货地址、 addressLongitude 收货地址经度、addressLatitude 收货地址纬度
-                String searchPointJson2 = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+URLEncoder.encode(mapValue.get("receiveAddress").toString()==null?"长沙市":mapValue.get("receiveAddress").toString(),"utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-                SearchPoint searchPoint2= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint.class);
-                if (searchPoint2.getStatus()==0&&searchPoint2.getResult()!=null){
-
-                    if (searchPoint2.getResult().getAddress_components()!=null){
-                        materieldesMap.put("addressProvince",searchPoint2.getResult().getAddress_components().getProvince()==null?"湖南省":searchPoint2.getResult().getAddress_components().getProvince());
-                        materieldesMap.put("addressDistrict",searchPoint2.getResult().getAddress_components().getDistrict()==null?"开福区":searchPoint2.getResult().getAddress_components().getDistrict());
-                        materieldesMap.put("addressTown",searchPoint2.getResult().getAddress_components().getCity()==null?"长沙市":searchPoint2.getResult().getAddress_components().getCity());
-                    }else {
-                        materieldesMap.put("addressProvince","湖南省");
-                        materieldesMap.put("addressDistrict","开福区");
-                        materieldesMap.put("addressTown","长沙市");
-                    }
-                    materieldesMap.put("addressDeliveryAddress",mapValue.get("receiveAddress").toString()==null?"长沙市":mapValue.get("receiveAddress").toString());
-                    if (searchPoint2.getResult().getLocation()!=null){
-                        materieldesMap.put("addressLongitude",searchPoint2.getResult().getLocation().getLng()==null?new BigDecimal(112.98626):searchPoint2.getResult().getLocation().getLng());
-                        materieldesMap.put("addressLatitude",searchPoint2.getResult().getLocation().getLat()==null?new BigDecimal(28.25591):searchPoint2.getResult().getLocation().getLat());
-                    }else {
-                        materieldesMap.put("addressLongitude",new BigDecimal(112.98626));
-                        materieldesMap.put("addressLatitude",new BigDecimal(28.25591));
-                    }
-                    if (searchPoint2.getResult().getAd_info()!=null){
-                        materieldesMap.put("destCode",searchPoint2.getResult().getAd_info().getAdcode()==null?"无信息":searchPoint2.getResult().getAd_info().getAdcode());
-                    }else {
-                        materieldesMap.put("destCode","无信息");
-                    }
-
-                }else {
-                    //114.03629,32.48327","endLonlat":",28.25591"}
-                    materieldesMap.put("addressProvince","湖南省");
-                    materieldesMap.put("addressDistrict","开福区");
-                    materieldesMap.put("addressTown","长沙市");
-                    materieldesMap.put("destCode","430105");
-                    materieldesMap.put("addressDeliveryAddress","长沙市");
-                    materieldesMap.put("addressLongitude",new BigDecimal(112.98626));
-                    materieldesMap.put("addressLatitude",new BigDecimal(28.25591));
-                }
-
-
-                    //入网验证
-                    String netValidationResult = zhongJiaoXingLu.netValidation(mapValue.get("capacityNumber").toString());
-                    Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
-                    if (Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
-
-                        //运单生成之后保存
-                        HashMap<String,String> redisMap=new HashMap<>();
-                        String startLon=searchPoint.getResult().getLocation().getLng().toString().length()>9?searchPoint.getResult().getLocation().getLng().toString().substring(0,9):searchPoint.getResult().getLocation().getLng().toString();
-                        String startLat=searchPoint.getResult().getLocation().getLat().toString().length()>9?searchPoint.getResult().getLocation().getLat().toString().substring(0,8):searchPoint.getResult().getLocation().getLat().toString();
-                        redisMap.put("startLonlat", startLon+","+startLat);
-                        String endLon= materieldesMap.get("addressLongitude").toString().length()>9?materieldesMap.get("addressLongitude").toString().substring(0,9):materieldesMap.get("addressLongitude").toString();
-                        String endLat= materieldesMap.get("addressLatitude").toString().length()>9?materieldesMap.get("addressLatitude").toString().substring(0,8):materieldesMap.get("addressLatitude").toString();
-                        redisMap.put("endLonlat",endLon+","+endLat);
-                        redisMap.put("vclN", mapValue.get("capacityNumber").toString());
-                        redisMap.put("vco","2");
-                        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
-                        String qryBtm=mapValue.get("resultOutGateTime").toString();
-
-                        //获得两天、23小时、45分钟之后的时间
-                        Date parse = simpleDateFormat.parse(qryBtm);
-                        //时间添加
-                        Calendar calendar = Calendar.getInstance();
-                        calendar.setTime(parse);
-                        //calendar.add(Calendar.DAY_OF_MONTH, 2);
-                        calendar.add(Calendar.HOUR_OF_DAY, 23);
-                        calendar.add(Calendar.SECOND, 45);
-                        //计算时间差
-                        long agetime = parse.getTime();
-                        long lateTime = calendar.getTimeInMillis();
-                        //两天、23小时、45分钟之后的时间差毫秒
-                        long reductionTime1=lateTime-agetime;
-                        long currentTime = new Date().getTime();
-                        //减去已经过的时间(毫秒)
-                        long reductionTime2=currentTime-agetime;
-
-                        //redis 存储的时间（秒）
-                        long saveTime=(reductionTime1-reductionTime2)/1000;
-                        redisMap.put("qryBtm", simpleDateFormat.format(simpleDateFormat.parse(qryBtm)));
-                        String qryEtm= simpleDateFormat.format(calendar.getTime());
-                        redisMap.put("qryEtm",qryEtm );
-                        String orderUrl=prefixOrder+":"+mapValue.get("orderNumber").toString();
-                        String redisJson=JSON.toJSONString(redisMap);
-                        if (saveTime>0){
-                            redisTemplate.opsForValue().set(orderUrl, redisJson, saveTime, TimeUnit.SECONDS);
-                        }else {
-                            redisTemplate.opsForValue().set(orderUrl, redisJson, 36000, TimeUnit.SECONDS);
-                        }
-
-                        redisTemplate.opsForValue().set(orderUrl+suffix, redisJson);
-                        //预警开关判断0开启1关闭
-                        Map<String,Object> resTfulResultValues = offSiteTransportationService.selectWarnSwitch();
-
-
-                        if(!resTfulResultValues.get("switch").toString().equals("0")){
-
-                            redisMap.put("startCode",searchPoint.getResult().getAd_info().getAdcode());
-                            redisMap.put("destCode",materieldesMap.get("destCode").toString());
-                            redisMap.put("qryBtm",parse.toString());
-                            redisMap.put("qryEtm",calendar.getTime().toString());
-                            redisMap.put("type",resTfulResultValues.get("type").toString());
-                            String subAbnormalLineWarnV2Json = zhongJiaoXingLu.subAbnormalLineWarnV2(redisMap);
-
-                            JSONObject jsonObject = JSONObject.parseObject(subAbnormalLineWarnV2Json);
-
-
-                            if (jsonObject!=null&&jsonObject.get("status").toString().equals(1001+"")){
-                                HashMap<String,Object> tripMap=new HashMap();
-                                tripMap.put("orderNumber",mapValue.get("orderNumber").toString());
-                                tripMap.put("rid",jsonObject.get("result").toString());
-                                int i=offSiteTransportationService.insertOrderTripId(tripMap);
-                            }
-                        }
-                    }
-                    return  CompletableFuture.completedFuture("successful");
-                }
-
-
-        return CompletableFuture.completedFuture("fail");
-    }
-
-    /**
-     *
-     * @param matrial 物质名称
-     * @param selectStr 0,没有选1"带钢",2"微粉",3("螺纹钢","盘螺","盘圆"),4"钢坯",5"其他"
-     */
-    public  boolean checkTurnOff(String matrial,String selectStr) {
-        //0,没有选1"带钢",2"微粉",3("螺纹钢","盘螺","盘圆"),4"钢坯",5"其他"
-
-        int index=0;
-        String[]  matrialList=new String[]{"带钢","微粉","螺纹钢","盘螺","盘圆","钢坯","其他"};
-        //判断是那种物质
-        lable:for (int i=0;i<matrialList.length;i++){
-            if (matrial.contains(matrialList[i])) {
-                if(4>=i&&i>=2){
-                    //螺纹钢
-                    index=3;
-                }else if (i==5){
-                    //钢坯
-                    index=4;
-                }else if (i==6) {
-                    //其他
-                    index=5;
-                }else{
-                    index=i+1;
-                }
-                break lable;
-            }
-
-        }
-        //判断是否选择这种物质
-        if (index!=0&&selectStr.contains(String.valueOf(index))){
-            return true;
-        }
-        return false;
-
-    }
-
-    /**
-     * 必须参数 运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-     * @param mapValue
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public CompletableFuture<String> saveRoute(Map mapValue) throws Exception {
-
-            //获得起点的经纬度和code
-           SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-           Date gateTime = dateFormat.parse(mapValue.get("resultOutGateTime").toString());
-           String searchPointJson = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+ URLEncoder.encode(mapValue.get("shipperName").toString()==null?"四川省达州钢铁集团有限责任公司":mapValue.get("shipperName").toString(),"utf-8")+"&key="+key);
-           SearchPoint searchPoint= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson, SearchPoint.class);
-
-           //创建收货地址    addressProvince 省份、addressDistrict 市区、addressTown 县镇 、addressDeliveryAddress 收货地址、 addressLongitude 收货地址经度、addressLatitude 收货地址纬度
-           String searchPointJson2 = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+ URLEncoder.encode(mapValue.get("receiveAddress").toString()==null?"长沙市":mapValue.get("receiveAddress").toString(),"utf-8")+"&key="+key);
-           SearchPoint searchPoint2= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint.class);
-
-           //入网验证
-           String netValidationResult = zhongJiaoXingLu.netValidation(mapValue.get("capacityNumber").toString());
-           Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
-           if (Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
-
-               //运单生成之后保存
-               HashMap<String, String> redisMap=new HashMap<>();
-               redisMap.put("startLonlat", searchPoint.getResult().getLocation().getLng().toString().substring(0,9)+","+searchPoint.getResult().getLocation().getLat().toString().substring(0,8));
-               redisMap.put("endLonlat", searchPoint2.getResult().getLocation().getLng().toString().substring(0,9)+","+searchPoint2.getResult().getLocation().getLat().toString().substring(0,8));
-               redisMap.put("vclN", mapValue.get("capacityNumber").toString());
-               redisMap.put("vco","2");
-               SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
-               String qryBtm=mapValue.get("resultOutGateTime").toString();
-
-               //获得两天、23小时、45分钟之后的时间
-               Date parse = simpleDateFormat.parse(qryBtm);
-               //时间添加
-               Calendar calendar = Calendar.getInstance();
-               calendar.setTime(parse);
-               calendar.add(Calendar.DAY_OF_MONTH, 2);
-               calendar.add(Calendar.HOUR_OF_DAY, 23);
-               calendar.add(Calendar.SECOND, 45);
-               //计算时间差
-               long agetime = parse.getTime();
-               long lateTime = calendar.getTimeInMillis();
-               //两天、23小时、45分钟之后的时间差毫秒
-               long reductionTime1=lateTime-agetime;
-               long currentTime = new Date().getTime();
-               //减去已经过的时间(毫秒)
-               long reductionTime2=currentTime-agetime;
-
-               //redis 存储的时间（秒）
-               long saveTime=(reductionTime1-reductionTime2)/1000;
-               redisMap.put("qryBtm", simpleDateFormat.format(simpleDateFormat.parse(qryBtm)));
-               String qryEtm= simpleDateFormat.format(calendar.getTime());
-               redisMap.put("qryEtm",qryEtm );
-               String orderUrl=prefixOrder+":"+mapValue.get("orderNumber").toString();
-               String redisJson= JSON.toJSONString(redisMap);
-               //保存请求中交的参数
-               redisTemplate.opsForValue().set(orderUrl, redisJson, saveTime, TimeUnit.SECONDS);
-               redisTemplate.opsForValue().set(orderUrl+suffix, redisJson);
-               //预警开关判断0开启1关闭
-               if(mapValue.get("turnOf").toString().equals("0")){
-
-                   redisMap.put("startCode",searchPoint.getResult().getAd_info().getAdcode());
-                   redisMap.put("destCode",searchPoint2.getResult().getAd_info().getAdcode());
-                   redisMap.put("qryBtm",parse.toString());
-                   redisMap.put("qryEtm",calendar.getTime().toString());
-                   String subAbnormalLineWarnV2Json = zhongJiaoXingLu.subAbnormalLineWarnV2(redisMap);
-
-                   JSONObject jsonObject = JSONObject.parseObject(subAbnormalLineWarnV2Json);
-
-
-                   if (jsonObject!=null&&jsonObject.get("status").toString().equals(1001+"")) {
-                       HashMap<String, Object> tripMap = new HashMap();
-                       tripMap.put("orderNumber", mapValue.get("orderNumber").toString());
-                       tripMap.put("rid", jsonObject.get("result").toString());
-                       //omsFeign.insertOrderTripId(tripMap);
-                   }
-           }
-           return  CompletableFuture.completedFuture("successful");
-       }
-        return CompletableFuture.completedFuture("fail");
-    }
-
-    /**
-     * 必须参数 运输订单号：orderNumber、车牌号：capacityNumber、出厂时间:resultOutGateTime、预警开关：turnOf、发货地址:shipperName、收货地址:receiveAddress
-     * @param mapValue
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public CompletableFuture<String> saveRequstionDate(Map mapValue) throws Exception {
-
-        //获得起点的经纬度和code
-        SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date gateTime = dateFormat.parse(mapValue.get("resultOutGateTime").toString());
-        String searchPointJson = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+ URLEncoder.encode(mapValue.get("shipperName").toString()==null?"四川省达州钢铁集团有限责任公司":mapValue.get("shipperName").toString(),"utf-8")+"&key="+key);
-        SearchPoint searchPoint= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson, SearchPoint.class);
-
-        //创建收货地址    addressProvince 省份、addressDistrict 市区、addressTown 县镇 、addressDeliveryAddress 收货地址、 addressLongitude 收货地址经度、addressLatitude 收货地址纬度
-        String searchPointJson2 = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+ URLEncoder.encode(mapValue.get("receiveAddress").toString()==null?"长沙市":mapValue.get("receiveAddress").toString(),"utf-8")+"&key="+key);
-        SearchPoint searchPoint2= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint.class);
-
-        //入网验证
-        String netValidationResult = zhongJiaoXingLu.netValidation(mapValue.get("capacityNumber").toString());
-        Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
-        if (Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
-
-            //运单生成之后保存
-            HashMap<String, String> redisMap=new HashMap<>();
-            redisMap.put("startLonlat", searchPoint.getResult().getLocation().getLng().toString().substring(0,9)+","+searchPoint.getResult().getLocation().getLat().toString().substring(0,8));
-            redisMap.put("endLonlat", searchPoint2.getResult().getLocation().getLng().toString().substring(0,9)+","+searchPoint2.getResult().getLocation().getLat().toString().substring(0,8));
-            redisMap.put("vclN", mapValue.get("capacityNumber").toString());
-            redisMap.put("vco","2");
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
-            String qryBtm=mapValue.get("resultOutGateTime").toString();
-
-            //获得两天、23小时、45分钟之后的时间
-            Date parse = simpleDateFormat.parse(qryBtm);
-            //时间添加
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(parse);
-            calendar.add(Calendar.DAY_OF_MONTH, 2);
-            calendar.add(Calendar.HOUR_OF_DAY, 23);
-            calendar.add(Calendar.SECOND, 45);
-            //计算时间差
-            long agetime = parse.getTime();
-            long lateTime = calendar.getTimeInMillis();
-            //两天、23小时、45分钟之后的时间差毫秒
-            long reductionTime1=lateTime-agetime;
-            long currentTime = new Date().getTime();
-            //减去已经过的时间(毫秒)
-            long reductionTime2=currentTime-agetime;
-
-            //redis 存储的时间（秒）
-            long saveTime=(reductionTime1-reductionTime2)/1000;
-            redisMap.put("qryBtm", simpleDateFormat.format(simpleDateFormat.parse(qryBtm)));
-            String qryEtm= simpleDateFormat.format(calendar.getTime());
-            redisMap.put("qryEtm",qryEtm );
-            String orderUrl=prefixOrder+":"+mapValue.get("orderNumber").toString();
-            String redisJson= JSON.toJSONString(redisMap);
-            //保存请求中交的参数
-            redisTemplate.opsForValue().set(orderUrl, redisJson, saveTime, TimeUnit.SECONDS);
-            redisTemplate.opsForValue().set(orderUrl+suffix, redisJson);
-            //预警开关判断0开启1关闭
-            if(mapValue.get("turnOf").toString().equals("0")){
-
-                redisMap.put("startCode",searchPoint.getResult().getAd_info().getAdcode());
-                redisMap.put("destCode",searchPoint2.getResult().getAd_info().getAdcode());
-                redisMap.put("qryBtm",parse.toString());
-                redisMap.put("qryEtm",calendar.getTime().toString());
-                String subAbnormalLineWarnV2Json = zhongJiaoXingLu.subAbnormalLineWarnV2(redisMap);
-
-                JSONObject jsonObject = JSONObject.parseObject(subAbnormalLineWarnV2Json);
-
-
-                if (jsonObject!=null&&jsonObject.get("status").toString().equals(1001+"")) {
-                    HashMap<String, Object> tripMap = new HashMap();
-                    tripMap.put("orderNumber", mapValue.get("orderNumber").toString());
-                    tripMap.put("rid", jsonObject.get("result").toString());
-                    //omsFeign.insertOrderTripId(tripMap);
-                }
-            }
-            return  CompletableFuture.completedFuture("successful");
-        }
-        return CompletableFuture.completedFuture("fail");
-    }
-
-    @Override
-    public CompletableFuture<RouteVo> fullPathVisualization(HashMap mapValue) throws Exception {
-
-        String redisJson =null;
-        if (redisTemplate.hasKey(prefixOrder + ":" + mapValue.get("orderNumber"))){
-            redisJson=(String) redisTemplate.opsForValue().get(prefixOrder + ":" + mapValue.get("orderNumber"));
-        }
-
-        HashMap routeMap = JSON.parseObject(redisJson, HashMap.class);
-        String json="";
-        if (routeMap!=null)
-        {
-            json =zhongJiaoXingLu.visualRoute(routeMap);
-        }else{
-            String j=prefixLine + ":" + mapValue.get("orderNumber");
-            if (redisTemplate.hasKey(prefixLine + ":" + mapValue.get("orderNumber"))){
-                json  = (String) redisTemplate.opsForValue().get(prefixLine + ":" + mapValue.get("orderNumber"));
-            }
-
-            if (json==null||json.equals("")){
-                HashMap<String,Object> hashMap=new HashMap();
-                hashMap.put("orderNumber",mapValue.get("orderNumber"));
-//                RESTfulResult startAndEndCapacityNumber = tmsFeign.getStartAndEndCapacityNumber(hashMap);
-//                HashMap<String,Object> resultMap= (HashMap<String, Object>) startAndEndCapacityNumber.getData();
-                Map<String, Object> resultMap=tmstruckLeaveFactoryResultService.getTruckFactoryResult(mapValue.get("orderNumber").toString());
-                //入网验证
-                String netValidationResult = zhongJiaoXingLu.netValidation(resultMap.get("capacityNumber").toString());
-                Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
-                if (Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
-                    String searchPointJson = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-                    SearchPoint searchPoint= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson, SearchPoint.class);
-
-                    String searchPointJson2 = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+URLEncoder.encode(resultMap.get("receiveAddress")==null||"".equals(String.valueOf(resultMap.get("receiveAddress")))?"长沙市":resultMap.get("receiveAddress").toString(),"utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-                    SearchPoint searchPoint2= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint.class);
-                    //运单生成之后保存
-                    HashMap<String,String> redisMap=new HashMap<>();
-                    String startLon=searchPoint.getResult().getLocation().getLng().toString().length()>9?searchPoint.getResult().getLocation().getLng().toString().substring(0,9):searchPoint.getResult().getLocation().getLng().toString();
-                    String startLat=searchPoint.getResult().getLocation().getLat().toString().length()>9?searchPoint.getResult().getLocation().getLat().toString().substring(0,8):searchPoint.getResult().getLocation().getLat().toString();
-                    redisMap.put("startLonlat", startLon+","+startLat);
-                    String endLon= searchPoint2.getResult().getLocation().getLng().toString().length()>9?searchPoint2.getResult().getLocation().getLng().toString().substring(0,9):searchPoint2.getResult().getLocation().getLng().toString();
-                    String endLat= searchPoint2.getResult().getLocation().getLat().toString().length()>9?searchPoint2.getResult().getLocation().getLat().toString().substring(0,8):searchPoint2.getResult().getLocation().getLat().toString();
-                    redisMap.put("endLonlat",endLon+","+endLat);
-                    redisMap.put("vclN", resultMap.get("capacityNumber").toString());
-                    redisMap.put("vco","2");
-                    SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
-                    String qryBtm=resultMap.get("resultOutGateTime").toString();
-
-                    //获得两天、23小时、45分钟之后的时间
-                    Date parse = simpleDateFormat.parse(qryBtm);
-                    //时间添加
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.setTime(parse);
-                    // calendar.add(Calendar.DAY_OF_MONTH, 2);
-                    calendar.add(Calendar.HOUR_OF_DAY, 23);
-                    calendar.add(Calendar.SECOND, 45);
-                    //计算时间差
-                    long agetime = parse.getTime();
-                    long lateTime = calendar.getTimeInMillis();
-                    //两天、23小时、45分钟之后的时间差毫秒
-                    long reductionTime1=lateTime-agetime;
-                    long currentTime = new Date().getTime();
-                    //减去已经过的时间(毫秒)
-                    long reductionTime2=currentTime-agetime;
-
-                    //redis 存储的时间（秒）
-                    long saveTime=(reductionTime1-reductionTime2)/1000;
-                    redisMap.put("qryBtm", simpleDateFormat.format(simpleDateFormat.parse(qryBtm)));
-                    String qryEtm= simpleDateFormat.format(calendar.getTime());
-                    redisMap.put("qryEtm", qryEtm);
-                    if (saveTime>1800){
-                        String orderUrl=prefixOrder+":"+mapValue.get("orderNumber").toString();
-
-                        String redisStr=JSON.toJSONString(redisMap);
-                        json = zhongJiaoXingLu.visualRoute(redisMap);
-                        redisTemplate.opsForValue().set(orderUrl, redisStr, saveTime<0?1000:saveTime, TimeUnit.SECONDS);
-                        redisTemplate.opsForValue().set(orderUrl+suffix, redisStr);
-
-                    }else {
-
-                        //设置60天后过期
-                        Calendar calendar2=Calendar.getInstance();
-                        long agoTime= calendar2.getTime().getTime();
-                        calendar2.add(Calendar.MONTH,2);
-                        long late= calendar2.getTime().getTime();
-                        long save=(lateTime-agoTime)/1000;
-
-                        json = zhongJiaoXingLu.visualRoute(redisMap);
-                        if (json!=null){
-                            redisTemplate.opsForValue().set(prefixLine+":"+mapValue.get("orderNumber").toString(), json, save>0?save:3184000, TimeUnit.SECONDS);
-                        }
-
-                    }
-
-                }
-            }else {
-
-            }
-        }
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        if (json!=null&&jsonObject!=null&&jsonObject.get("status").toString().equals(1001+"")){
-            //初始开始链路和结束线路、开始点、结束点、当前点的集合
-            List<StartAndEndRoute> startAndEndRouteList=new ArrayList<>();
-            //一条路线，开始链路和结束线路、开始点、结束点、当前点
-            StartAndEndRoute startAndEndRoute=new StartAndEndRoute();
-
-            ViewVisualization to= (ViewVisualization) DataConversionTool.jsonToBean(json,ViewVisualization.class);
-            //初始化vo对象
-            RouteVo vo=new RouteVo();
-            //当前所在的点
-            if ((!StringUtils.isEmpty(to.getResult().getLat()))&& (!StringUtils.isEmpty(to.getResult().getLon()))){
-                Double[] centerpoint = LngLonUtil.gps84_To_Gcj02((Double.valueOf(to.getResult().getLat()) / 600000), (Double.valueOf(to.getResult().getLon()) / 600000));
-                //当前所在的点
-                Point currentPoint=new Point();
-                currentPoint.setLat(centerpoint[0]+"");
-                currentPoint.setLon(centerpoint[1]+"");
-                startAndEndRoute.setCurrentPoint(currentPoint);
-            }
-            //当前所在地名称
-            startAndEndRoute.setCurrentPointName(to.getResult().getAdr());
-            //初始已行驶轨迹集合
-            if (to.getResult().getRunRoute()!=null){
-                List<RunRoutePoint> routes =new ArrayList();
-                List<Double[]> routesPath =new ArrayList();
-                for(RunRoutePoint item : to.getResult().getRunRoute()){
-                    RunRoutePoint runRoutePoint=item;
-                    //将已行驶轨迹转义数据格式
-                    Double[] points = LngLonUtil.gps84_To_Gcj02((Double.valueOf(item.getLat()) / 600000), (Double.valueOf(item.getLon()) / 600000));
-                    routesPath.add(new Double[]{points[1],points[0]});
-                    //经纬度
-                    runRoutePoint.setLat(points[0]+"");
-                    runRoutePoint.setLon(points[1]+"");
-                    //坐标点
-                    routes.add(runRoutePoint);
-                }
-                //初始化起始点,已经经过路段的第一个点
-                Point startPoint=new Point();
-                startPoint.setLat(routes.get(0).getLat());
-                startPoint.setLon(routes.get(0).getLon());
-                startAndEndRoute.setStartPoint(startPoint);
-                //点集合
-                startAndEndRoute.setRunPath(routesPath);
-                //已经完成路线点集合
-                startAndEndRoute.setRunRoute(routes);
-            }
-            //预估轨迹
-            if (to.getResult().getEstimateRoute()!=null){
-                List<Point> estimateRoute= new ArrayList<>();
-                List<Double[]> estimatePath =new ArrayList();
-                for(Point item :to.getResult().getEstimateRoute()){
-                    Point er=new Point();
-                    Double[] points = LngLonUtil.gps84_To_Gcj02((Double.valueOf(item.getLat()) / 600000), (Double.valueOf(item.getLon()) / 600000));
-                    estimatePath.add(new Double[]{points[1],points[0]});
-                    er.setLat(points[0]+"");
-                    er.setLon(points[1]+"");
-                    estimateRoute.add(er);
-                }
-                //路径
-                startAndEndRoute.setEstimatePath(estimatePath);
-                //结束点
-                startAndEndRoute.setEndPoint(estimateRoute.get(estimateRoute.size()-1));
-                //预估轨迹赋值
-                startAndEndRoute.setEstimateRoute(estimateRoute);
-            }
-            //当前所行驶历程数
-            String mil=to.getResult().getRunDistance()+"km";
-            startAndEndRoute.setMiled(mil);
-            startAndEndRouteList.add(startAndEndRoute);
-            vo.setStartAndEndRoutes(startAndEndRouteList);
-            //
-            //设置返回值对象
-            return CompletableFuture.completedFuture(vo) ;
-        }else {
-            return  CompletableFuture.completedFuture(new RouteVo());
-        }
-
-    }
-
-    /**
-     * 必须参数 orderNumber 运输订单号
-     * 获得运输全路径
-     * @param mapValue
-     * @return
-     * @throws Exception
-     */
-
-    public CompletableFuture<RouteVo> fullPaht(HashMap mapValue) throws Exception {
-
-        //获得saveRoute（）保存在redis请求中交的查询
-        String redisJson = (String) redisTemplate.opsForValue().get(prefixOrder + ":" + mapValue.get("orderNumber"));
-
-        HashMap routeMap = JSON.parseObject(redisJson, HashMap.class);
-        String json="";
-        //判断请求参数是否为空
-        if (routeMap!=null)
-        {
-            //获得路径
-            json =zhongJiaoXingLu.visualRoute(routeMap);
-        //可能中交请求参数已经过期、已经成了路线、可以直接获取路径
-        }else{
-
-            json  = (String) redisTemplate.opsForValue().get(prefixLine + ":" + mapValue.get("orderNumber"));
-            //当redis获取不到参数的备选方案从数据库获取
-            if (json==null){
-                HashMap<String, Object> hashMap=new HashMap();
-                hashMap.put("orderNumber",mapValue.get("orderNumber"));
-                //从数据库获取参数
-                RESTfulResult startAndEndCapacityNumber =null; //tmsFeign.getStartAndEndCapacityNumber(hashMap);
-                HashMap<String, Object> resultMap= (HashMap<String, Object>) startAndEndCapacityNumber.getData();
-                //入网验证
-                String netValidationResult = zhongJiaoXingLu.netValidation(resultMap.get("capacityNumber").toString());
-                Map netValidationMap = (Map) JSONObject.parse(netValidationResult);
-                if (Integer.parseInt(netValidationMap.get("status").toString())==1001&&netValidationMap.get("result").toString().equals("yes")){
-                    String searchPointJson = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+ URLEncoder.encode(resultMap.get("shipperName").toString(),"utf-8")+"&key="+key);
-                    SearchPoint searchPoint= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson, SearchPoint.class);
-                    String searchPointJson2 = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+ URLEncoder.encode(resultMap.get("addressDeliveryAddress").toString(),"utf-8")+"&key="+key);
-                    SearchPoint searchPoint2= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint.class);
-                    //运单生成之后保存
-                    HashMap<String, String> redisMap=new HashMap<>();
-                    redisMap.put("startLonlat", searchPoint.getResult().getLocation().getLng().toString().substring(0,9)+","+searchPoint.getResult().getLocation().getLat().toString().substring(0,8));
-                    redisMap.put("endLonlat", searchPoint2.getResult().getLocation().getLng().toString().substring(0,9)+","+searchPoint2.getResult().getLocation().getLat().toString().substring(0,8));
-                    redisMap.put("vclN", resultMap.get("capacityNumber").toString());
-                    redisMap.put("vco","2");
-                    SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
-                    String qryBtm=resultMap.get("resultOutGateTime").toString();
-
-                    //获得两天、23小时、45分钟之后的时间
-                    Date parse = simpleDateFormat.parse(qryBtm);
-                    //时间添加
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.setTime(parse);
-                    calendar.add(Calendar.DAY_OF_MONTH, 2);
-                    calendar.add(Calendar.HOUR_OF_DAY, 23);
-                    calendar.add(Calendar.SECOND, 45);
-                    //计算时间差
-                    long agetime = parse.getTime();
-                    long lateTime = calendar.getTimeInMillis();
-                    //两天、23小时、45分钟之后的时间差毫秒
-                    long reductionTime1=lateTime-agetime;
-                    long currentTime = new Date().getTime();
-                    //减去已经过的时间(毫秒)
-                    long reductionTime2=currentTime-agetime;
-
-                    //redis 存储的时间（秒）
-                    long saveTime=(reductionTime1-reductionTime2)/1000;
-                    redisMap.put("qryBtm", simpleDateFormat.format(simpleDateFormat.parse(qryBtm)));
-                    String qryEtm= simpleDateFormat.format(calendar.getTime());
-                    redisMap.put("qryEtm",qryEtm );
-                    if (saveTime>1800){
-                        String orderUrl=prefixOrder+":"+mapValue.get("orderNumber").toString();
-
-                        String redisStr= JSON.toJSONString(redisMap);
-                        redisTemplate.opsForValue().set(orderUrl, redisStr, saveTime, TimeUnit.SECONDS);
-
-                    }else {
-
-                        //设置60天后过期
-                        Calendar calendar2= Calendar.getInstance();
-                        long agoTime= calendar2.getTime().getTime();
-                        calendar2.add(Calendar.MONTH,2);
-                        long late= calendar2.getTime().getTime();
-                        long save=(lateTime-agoTime)/1000;
-
-                        json = zhongJiaoXingLu.visualRoute(redisMap);
-                        redisTemplate.opsForValue().set(prefixLine+":"+mapValue.get("orderNumber").toString(), json, save, TimeUnit.SECONDS);
-                    }
-
-                }
-            }
-        }
-        //获得路线之后封装成路线对象
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        if (json!=null&&jsonObject.get("status").toString().equals(1001+"")){
-            //初始开始链路和结束线路、开始点、结束点、当前点的集合
-            List<StartAndEndRoute> startAndEndRouteList=new ArrayList<>();
-            //一条路线，开始链路和结束线路、开始点、结束点、当前点
-            StartAndEndRoute startAndEndRoute=new StartAndEndRoute();
-
-            ViewVisualization to= (ViewVisualization) DataConversionTool.jsonToBean(json,ViewVisualization.class);
-            //初始化vo对象
-            RouteVo vo=new RouteVo();
-            //当前所在的点
-            if ((!StringUtils.isEmpty(to.getResult().getLat()))&& (!StringUtils.isEmpty(to.getResult().getLon()))){
-                Double[] centerpoint = LngLonUtil.gps84_To_Gcj02((Double.valueOf(to.getResult().getLat()) / 600000), (Double.valueOf(to.getResult().getLon()) / 600000));
-                //当前所在的点
-                Point currentPoint=new Point();
-                currentPoint.setLat(centerpoint[0]+"");
-                currentPoint.setLon(centerpoint[1]+"");
-                startAndEndRoute.setCurrentPoint(currentPoint);
-            }
-            //当前所在地名称
-            startAndEndRoute.setCurrentPointName(to.getResult().getAdr());
-            //初始已行驶轨迹集合
-            if (to.getResult().getRunRoute()!=null){
-                List<RunRoutePoint> routes =new ArrayList();
-                List<Double[]> routesPath =new ArrayList();
-                 for(RunRoutePoint item : to.getResult().getRunRoute()){
-                    RunRoutePoint runRoutePoint=item;
-                    //将已行驶轨迹转义数据格式
-                    Double[] points = LngLonUtil.gps84_To_Gcj02((Double.valueOf(item.getLat()) / 600000), (Double.valueOf(item.getLon()) / 600000));
-                    routesPath.add(new Double[]{points[1],points[0]});
-                    //经纬度
-                    runRoutePoint.setLat(points[0]+"");
-                    runRoutePoint.setLon(points[1]+"");
-                    //坐标点
-                     routes.add(runRoutePoint);
-                }
-                //初始化起始点,已经经过路段的第一个点
-                Point startPoint=new Point();
-                startPoint.setLat(routes.get(0).getLat());
-                startPoint.setLon(routes.get(0).getLon());
-                startAndEndRoute.setStartPoint(startPoint);
-                //点集合
-                startAndEndRoute.setRunPath(routesPath);
-                //已经完成路线点集合
-                startAndEndRoute.setRunRoute(routes);
-            }
-            //预估轨迹
-            if (to.getResult().getEstimateRoute()!=null){
-                List<Point> estimateRoute= new ArrayList<>();
-                List<Double[]> estimatePath =new ArrayList();
-                for(Point item :to.getResult().getEstimateRoute()){
-                    Point er=new Point();
-                    Double[] points = LngLonUtil.gps84_To_Gcj02((Double.valueOf(item.getLat()) / 600000), (Double.valueOf(item.getLon()) / 600000));
-                    estimatePath.add(new Double[]{points[1],points[0]});
-                    er.setLat(points[0]+"");
-                    er.setLon(points[1]+"");
-                    estimateRoute.add(er);
-                }
-                //路径
-                startAndEndRoute.setEstimatePath(estimatePath);
-                //结束点
-                startAndEndRoute.setEndPoint(estimateRoute.get(estimateRoute.size()-1));
-                //预估轨迹赋值
-                startAndEndRoute.setEstimateRoute(estimateRoute);
-            }
-            //当前所行驶历程数
-            String mil=to.getResult().getRunDistance()+"km";
-            startAndEndRoute.setMiled(mil);
-            startAndEndRouteList.add(startAndEndRoute);
-            vo.setStartAndEndRoutes(startAndEndRouteList);
-            //
-            //设置返回值对象
-            return CompletableFuture.completedFuture(vo) ;
-        }else {
-            return  CompletableFuture.completedFuture(new RouteVo());
-        }
-
-    }
-    @Override
-    public CompletableFuture<RouteVo> fullPathVisualizationByCarNumber(HashMap mapValue) throws Exception {
-
-        String searchPointJson = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+URLEncoder.encode("四川省达州钢铁集团有限责任公司","utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-        SearchPoint searchPoint= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson, SearchPoint.class);
-        String searchPointJson2 = HTTPRequestUtils.sendGet("https://apis.map.qq.com/ws/geocoder/v1/", "address="+URLEncoder.encode("四川省达川区","utf-8")+"&key=WDTBZ-A5VKJ-UDLFI-KYJY6-WTP2S-A6B4Y");
-        SearchPoint searchPoint2= (SearchPoint) DataConversionTool.jsonToBean(searchPointJson2, SearchPoint.class);
-        //运单生成之后保存
-        HashMap<String,String> redisMap=new HashMap<>();
-        String startLon=searchPoint.getResult().getLocation().getLng().toString().length()>9?searchPoint.getResult().getLocation().getLng().toString().substring(0,9):searchPoint.getResult().getLocation().getLng().toString();
-        String startLat=searchPoint.getResult().getLocation().getLat().toString().length()>9?searchPoint.getResult().getLocation().getLat().toString().substring(0,8):searchPoint.getResult().getLocation().getLat().toString();
-        redisMap.put("startLonlat", startLon+","+startLat);
-        String endLon= searchPoint2.getResult().getLocation().getLng().toString().length()>9?searchPoint2.getResult().getLocation().getLng().toString().substring(0,9):searchPoint2.getResult().getLocation().getLng().toString();
-        String endLat= searchPoint2.getResult().getLocation().getLat().toString().length()>9?searchPoint2.getResult().getLocation().getLat().toString().substring(0,8):searchPoint2.getResult().getLocation().getLat().toString();
-        redisMap.put("endLonlat",endLon+","+endLat);
-        redisMap.put("vclN", mapValue.get("capacityNumber").toString());
-        redisMap.put("vco","2");
-        redisMap.put("qryBtm", mapValue.get("startTime").toString());
-        redisMap.put("qryEtm",mapValue.get("endTime").toString());
-        String json = zhongJiaoXingLu.visualRoute2(redisMap);
-
-        JSONObject jsonObject = JSONObject.parseObject(json);
-        if (json!=null&&jsonObject.get("status").toString().equals(1001+"")){
-            //初始开始链路和结束线路、开始点、结束点、当前点的集合
-            List<StartAndEndRoute> startAndEndRouteList=new ArrayList<>();
-            //一条路线，开始链路和结束线路、开始点、结束点、当前点
-            StartAndEndRoute startAndEndRoute=new StartAndEndRoute();
-
-            ViewVisualization to= (ViewVisualization) DataConversionTool.jsonToBean(json,ViewVisualization.class);
-            //初始化vo对象
-            RouteVo vo=new RouteVo();
-            //当前所在的点
-            //当前所在的点
-            if ((!StringUtils.isEmpty(to.getResult().getLat()))&& (!StringUtils.isEmpty(to.getResult().getLon()))){
-                Double[] centerpoint = LngLonUtil.gps84_To_Gcj02((Double.valueOf(to.getResult().getLat()) / 600000), (Double.valueOf(to.getResult().getLon()) / 600000));
-                //当前所在的点
-                Point currentPoint=new Point();
-                currentPoint.setLat(centerpoint[0]+"");
-                currentPoint.setLon(centerpoint[1]+"");
-                startAndEndRoute.setCurrentPoint(currentPoint);
-            }
-            //当前所在地名称
-            startAndEndRoute.setCurrentPointName(to.getResult().getAdr());
-            //初始已行驶轨迹集合
-            if (to.getResult().getRunRoute()!=null){
-                List<RunRoutePoint> routes =new ArrayList();
-                List<Double[]> routesPath =new ArrayList();
-                for(RunRoutePoint item : to.getResult().getRunRoute()){
-                    RunRoutePoint runRoutePoint=item;
-                    //将已行驶轨迹转义数据格式
-                    Double[] points = LngLonUtil.gps84_To_Gcj02((Double.valueOf(item.getLat()) / 600000), (Double.valueOf(item.getLon()) / 600000));
-                    routesPath.add(new Double[]{points[1],points[0]});
-                    //经纬度
-                    runRoutePoint.setLat(points[0]+"");
-                    runRoutePoint.setLon(points[1]+"");
-                    //坐标点
-                    routes.add(runRoutePoint);
-                }
-                //初始化起始点,已经经过路段的第一个点
-                Point startPoint=new Point();
-                startPoint.setLat(routes.get(0).getLat());
-                startPoint.setLon(routes.get(0).getLon());
-                startAndEndRoute.setStartPoint(startPoint);
-                //点集合
-                startAndEndRoute.setRunPath(routesPath);
-                //已经完成路线点集合
-                startAndEndRoute.setRunRoute(routes);
-            }
-            //当前所行驶历程数
-            String mil=to.getResult().getRunDistance()+"km";
-            startAndEndRoute.setMiled(mil);
-            startAndEndRouteList.add(startAndEndRoute);
-            vo.setStartAndEndRoutes(startAndEndRouteList);
-            //
-            //设置返回值对象
-            return CompletableFuture.completedFuture(vo) ;
-        }else {
-            return  CompletableFuture.completedFuture(new RouteVo());
-        }
-
-    }
-
-
-}

src/main/java/com/steerinfo/route/service/impl/TmstruckArrivalResultServiceImpl.java

@@ -1,106 +0,0 @@
-package com.steerinfo.route.service.impl;
-
-
-import com.steerinfo.route.mapper.TmstruckArrivalResultMapper;
-import com.steerinfo.route.model.TmstruckArrivalResult;
-import com.steerinfo.route.service.ITmstruckArrivalResultService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * TmstruckArrivalResult服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-06 07:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-06
- * 作者：generator
- * 参考：
- * 描述：TmstruckArrivalResult服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "tmstruckArrivalResultService")
-public class TmstruckArrivalResultServiceImpl implements ITmstruckArrivalResultService {
-
-    @Autowired
-    private TmstruckArrivalResultMapper tmstruckArrivalResultMapper;
-
-
-//    @Override
-//    public synchronized int addtmstruckArrivalResult(String orderNumber,TmstruckArrivalResult tmstruckArrivalResult) {
-//        long id;
-//        if(tmstruckArrivalResultMapper.selectMaxId()==null){
-//            id = 1;
-//        }else {
-//            id = tmstruckArrivalResultMapper.selectMaxId().longValue()+1;
-//        }
-//        //生成主键id
-//        tmstruckArrivalResult.setResultId(new BigDecimal(id));
-//        //获取并插入总实绩Id
-//        BigDecimal truckTotalId = tmstruckAbnormalResultMapper.getTotalIdByOrderNumber(orderNumber);
-//        tmstruckArrivalResult.setResultTotalId(truckTotalId);
-//        //常规字段
-//        tmstruckArrivalResult.setInsertUsername("admin");
-//        tmstruckArrivalResult.setInsertTime(new Date());
-//        tmstruckArrivalResult.setUpdateUsername("admin");
-//        tmstruckArrivalResult.setUpdateTime(new Date());
-//        tmstruckArrivalResult.setInsertUpdateRemark("无");
-//        return tmstruckArrivalResultMapper.insert(tmstruckArrivalResult);
-//    }
-
-    @Override
-    public synchronized int addtmstruckArrivalResult(String orderNumber, TmstruckArrivalResult tmstruckArrivalResult) {
-        //通过运输订单号查询是否已存在抵达实绩
-        BigDecimal alreadyExistsArrivalResult = tmstruckArrivalResultMapper.alreadyExistsArrivalResult(orderNumber);
-        if(alreadyExistsArrivalResult==null){
-            long id;
-            if(tmstruckArrivalResultMapper.selectMaxId()==null){
-                id = 1;
-            }else {
-                id = tmstruckArrivalResultMapper.selectMaxId().longValue()+1;
-            }
-            //生成主键id
-            tmstruckArrivalResult.setResultId(new BigDecimal(id));
-            //获取并插入总实绩Id
-            BigDecimal truckTotalId = tmstruckArrivalResultMapper.getTotalIdByOrderNumber(orderNumber);
-            tmstruckArrivalResult.setResultTotalId(truckTotalId);
-            //常规字段
-            tmstruckArrivalResult.setInsertUsername("admin");
-            tmstruckArrivalResult.setInsertTime(new Date());
-            tmstruckArrivalResult.setUpdateUsername("admin");
-            tmstruckArrivalResult.setUpdateTime(new Date());
-            tmstruckArrivalResult.setInsertUpdateRemark("无");
-            return tmstruckArrivalResultMapper.insert(tmstruckArrivalResult);
-        }else{
-            return 3;
-        }
-
-    }
-
-    @Override
-    public List<Map<String, Object>> getArrivalResultInfo(Map<String, Object> map) {
-        return tmstruckArrivalResultMapper.getArrivalResultInfo(map);
-    }
-
-    @Override
-    public String getAddressDistrict(String orderNumber) {
-        return tmstruckArrivalResultMapper.getAddressDistrict(orderNumber);
-    }
-
-    @Override
-    public List<String> getAdjustment() {
-        return tmstruckArrivalResultMapper.getAdjustment();
-
-    }
-
-    @Override
-    public int updateTown(String city, String item) {
-        return tmstruckArrivalResultMapper.updateTown(city,item);
-    }
-}

src/main/java/com/steerinfo/route/service/impl/TmstruckReceiptResultChildServiceImpl.java

@@ -1,50 +0,0 @@
-package com.steerinfo.route.service.impl;
-
-
-import com.steerinfo.route.mapper.TmstruckReceiptResultChildMapper;
-import com.steerinfo.route.model.TmstruckReceiptResultChild;
-import com.steerinfo.route.service.ITmstruckReceiptResultChildService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * TmstruckReceiptResultChild服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-06 07:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-06
- * 作者：generator
- * 参考：
- * 描述：TmstruckReceiptResultChild服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "tmstruckReceiptResultChildService")
-public class TmstruckReceiptResultChildServiceImpl implements ITmstruckReceiptResultChildService {
-
-    @Autowired
-    private TmstruckReceiptResultChildMapper tmstruckReceiptResultChildMapper;
-
-    @Override
-    public synchronized int addTmstruckReceiptResultChild(TmstruckReceiptResultChild tmstruckReceiptResultChild) {
-        long id;
-        if(tmstruckReceiptResultChildMapper.selectMaxId()==null){
-            id = 1;
-        }else {
-            id = tmstruckReceiptResultChildMapper.selectMaxId().longValue()+1;
-        }
-        //生成主键id
-        tmstruckReceiptResultChild.setChildId(new BigDecimal(id));
-        //常规字段
-        tmstruckReceiptResultChild.setInsertUsername("admin");
-        tmstruckReceiptResultChild.setInsertTime(new Date());
-        tmstruckReceiptResultChild.setUpdateUsername("admin");
-        tmstruckReceiptResultChild.setUpdateTime(new Date());
-        tmstruckReceiptResultChild.setInsertUpdateRemark("无");
-        return tmstruckReceiptResultChildMapper.insertSelective(tmstruckReceiptResultChild);
-    }
-}

src/main/java/com/steerinfo/route/threeRequest/ZhongJiaoXingLu.java

@@ -1,258 +0,0 @@
-package com.steerinfo.route.threeRequest;
-
-import com.alibaba.fastjson.JSONObject;
-import com.openapi.sdk.service.DataExchangeService;
-
-import com.steerinfo.route.mapper.DilVersionMapper;
-import com.steerinfo.route.util.DataConversionTool;
-import com.steerinfo.route.util.LngLonUtil;
-import com.steerinfo.route.vo.FullPathVisualizationTo.ViewVisualization;
-import com.steerinfo.route.vo.Map.RouteVo;
-import com.steerinfo.route.vo.Map.StartAndEndRoute;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-@Component
-public class ZhongJiaoXingLu {
-
-
-    @Value("${str.ZhongJiaoXingLu.parkMins}")
-    private String parkMins;
-    @Value("${str.ZhongJiaoXingLu.abnMins}")
-    private String abnMins;
-    @Value("${str.ZhongJiaoXingLu.outMins}")
-    private String outMins;
-    @Value("${str.ZhongJiaoXingLu.type}")
-    private String type;
-//    private  String token="238684c3-1817-4e5e-8695-a8c85f8fd231";
-    @Value("${str.ZhongJiaoXingLu.cid}")
-    private  String cid;
-    @Value("${str.ZhongJiaoXingLu.srt}")
-    private  String srt;
-    @Value("${str.ZhongJiaoXingLu.user}")
-    private  String user;
-    @Value("${str.ZhongJiaoXingLu.pwd}")
-    private  String pwd;
-    @Autowired
-    private DilVersionMapper dilVersionMapper;
-
-
-    public  String visualRoute(HashMap routeMap) {
-        try {
-            //登陆之后返回的token:d21661ca-e0fe-4934-866a-7d78a0756bd4
-            Map<String, String> map = new HashMap<String, String>(3);
-            String token=dilVersionMapper.getToken();
-            map.put("token",token);
-            map.put("cid", cid);
-            map.put("srt", srt);
-            map.put("startLonlat", routeMap.get("startLonlat").toString());
-            map.put("endLonlat", routeMap.get("endLonlat").toString());
-            map.put("vclN", routeMap.get("vclN").toString());
-            map.put("vco",routeMap.get("vco").toString());
-            map.put("qryBtm", routeMap.get("qryBtm").toString());
-            //判断结束时间是否大于现在时间
-            SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            SimpleDateFormat simpleDateFormat2=new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-            Date nowDate=simpleDateFormat.parse(simpleDateFormat2.format(new Date()));
-            if (nowDate.getTime()<simpleDateFormat.parse(routeMap.get("qryEtm").toString()).getTime()){
-                map.put("qryEtm", simpleDateFormat.format(nowDate));
-            }else {
-                Date qryEtm = simpleDateFormat.parse(routeMap.get("qryEtm").toString());
-                map.put("qryEtm", simpleDateFormat2.format(qryEtm));
-            }
-            //routeMap.get("qryEtm").toString()
-            map.put("timeNearby", "30");
-            String url = "https://openapi.sinoiov.cn/save/apis/visualRoute";
-            DataExchangeService des = new DataExchangeService(5000, 8000);
-
-            // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
-            String res = des.postHttps(url, map);
-            System.out.println("visualRoute"+res);
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            if (jsonObject.get("status").toString().equals(1016+"")){
-                login();
-                return visualRoute( routeMap);
-            }
-            return res;
-        } catch (Exception e) {
-            System.out.println("e:" + e.getMessage());
-        }
-        return null;
-    }
-
-    public  String visualRoute2(HashMap routeMap) {
-        try {
-            //登陆之后返回的token:d21661ca-e0fe-4934-866a-7d78a0756bd4
-            Map<String, String> map = new HashMap<String, String>(3);
-            String token=dilVersionMapper.getToken();
-            map.put("token", token);
-            map.put("cid", cid);
-            map.put("srt", srt);
-            map.put("startLonlat", routeMap.get("startLonlat").toString());
-            map.put("endLonlat", routeMap.get("endLonlat").toString());
-            map.put("vclN", routeMap.get("vclN").toString());
-            map.put("vco",routeMap.get("vco").toString());
-            map.put("qryBtm", routeMap.get("qryBtm").toString());
-            map.put("qryEtm", routeMap.get("qryEtm").toString());
-
-            //routeMap.get("qryEtm").toString()
-            map.put("timeNearby", "30");
-            String url = "https://openapi.sinoiov.cn/save/apis/visualRoute";
-            DataExchangeService des = new DataExchangeService(5000, 8000);
-
-            // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
-            String res = des.postHttps(url, map);
-
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            if (jsonObject.get("status").toString().equals(1016+"")){
-                login();
-                return visualRoute( routeMap);
-            }
-            System.out.println(res);
-            return res;
-        } catch (Exception e) {
-            System.out.println("e:" + e.getMessage());
-        }
-        return null;
-    }
-    //String startLonlat,String endLonlat,String vclN,String vco,String qryBtm,String qryEtm
-    public  String subAbnormalLineWarnV2(HashMap routeMap ) {
-        try {
-            //登陆之后返回的token:d21661ca-e0fe-4934-866a-7d78a0756bd4
-            Map<String, String> map = new HashMap<String, String>(3);
-            String token=dilVersionMapper.getToken();
-            map.put("token", token);
-            map.put("cid", cid);
-            map.put("srt", srt);
-            map.put("vclN", routeMap.get("vclN").toString());
-            map.put("vco","2");
-            map.put("startCode", routeMap.get("startCode").toString());
-            map.put("destCode", routeMap.get("destCode").toString());
-            map.put("startCoor", routeMap.get("startLonlat").toString());
-            map.put("destCoor", routeMap.get("endLonlat").toString());
-            //把字符串转换成CST日期类型
-            map.put("stime", cstToGMT(new Date().toString()).toString());
-            map.put("etime", cstToGMT(routeMap.get("qryEtm").toString()).toString());
-            map.put("parkMins", parkMins);
-            map.put("outMins", outMins);
-            map.put("abnMins", abnMins);
-            map.put("type", routeMap.get("type").toString());
-            String url = "https://openapi.sinoiov.cn/save/apis/subAbnormalLineWarnV2";
-            DataExchangeService des = new DataExchangeService(5000, 8000);
-
-            // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
-            String res = des.postHttps(url, map);
-            System.out.println("subAbnormalLineWarnV2"+res);
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            if (jsonObject.get("status").toString().equals(1016+"")){
-                login();
-                return subAbnormalLineWarnV2(routeMap);
-            }
-
-            return res;
-        } catch (Exception e) {
-            System.out.println("e:" + e.getMessage());
-        }
-        return null;
-    }
-
-    public String cstToGMT(String data) throws InterruptedException, ParseException {
-
-        SimpleDateFormat sdf1 = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
-        SimpleDateFormat sdf = new SimpleDateFormat("EEE d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
-        sdf.setTimeZone(TimeZone.getTimeZone("GMT+8")); // 设置时区为GMT  +8为北京时间东八区
-        String str = String.valueOf(sdf1.parse(data).getTime()+60000);
-        return str;
-    }
-    public  String netValidation(String vclN) {
-        try {
-            //登陆之后返回的token:d21661ca-e0fe-4934-866a-7d78a0756bd4
-            Map<String, String> map = new HashMap<String, String>(4);
-            String token=dilVersionMapper.getToken();
-            map.put("token", token);
-            map.put("cid", cid);
-            map.put("srt", srt);
-            map.put("vclN", vclN+"_2");
-            String url = "https://openapi.sinoiov.cn/save/apis/checkTruckExistV2";
-            DataExchangeService des = new DataExchangeService(5000, 8000);
-
-            // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
-            String res = des.postHttps(url, map);
-            System.out.println("netValidation"+res);
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            if (jsonObject.get("status").toString().equals(1016+"")){
-                login();
-                return netValidation(vclN);
-            }
-            return res;
-        } catch (Exception e) {
-            System.out.println("e:" + e.getMessage());
-        }
-        return null;
-    }
-    public  void login() {
-        try {
-            Map<String, String> map = new HashMap<String, String>(4);
-            map.put("user", user);
-            map.put("pwd", pwd);
-            map.put("cid", cid);
-            map.put("srt", srt);
-            String url = "https://openapi.sinoiov.cn/save/apis/login/";
-            DataExchangeService des = new DataExchangeService(5000, 8000);
-            // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
-            String res = des.postHttps(url, map);
-            System.out.println("login"+res);
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            String token=jsonObject.get("result").toString();
-            dilVersionMapper.updateToken(token);
-            //System.out.println("返回:"+ res);
-        } catch (Exception e) {
-            System.out.println("e:" + e.getMessage());
-        }
-    }
-
-
-    public  String getCid() {
-        return cid;
-    }
-
-    public  void setCid(String cid) {
-        this.cid = cid;
-    }
-
-    public  String getSrt() {
-        return srt;
-    }
-
-    public  void setSrt(String srt) {
-        this.srt = srt;
-    }
-
-    public  String getUser() {
-        return user;
-    }
-
-    public  void setUser(String user) {
-        this.user = user;
-    }
-
-    public  String getPwd() {
-        return pwd;
-    }
-
-    public  void setPwd(String pwd) {
-        this.pwd = pwd;
-    }
-
-
-}

src/main/java/com/steerinfo/route/util/DataConversionTool.java

@@ -1,228 +0,0 @@
-package com.steerinfo.route.util;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.logging.SimpleFormatter;
-
-//@Auther Tiroble
-//@meil 2439003195@qq.com
-public class DataConversionTool {
-
-
-    /**
-     *
-     * @param json
-     * @param type
-     * @return
-     * @throws Exception
-     */
-    public static Object jsonToBean(Object json, Object type) throws Exception {
-        try{
-            JSONObject jsonObject=null;
-            //首先需要判断是否是json字符串如果是解析为jsonObject如果是JsonObject就直接赋值给jsonObject
-            if (json instanceof String){
-                //将json转为JSONOject
-                jsonObject= JSONObject.parseObject(json.toString());
-            }
-            else {
-                jsonObject= (JSONObject) json;
-            }
-            //获得Class对象
-            //Class clazz=type.getClass().getDeclaringClass();
-            Class clazz= (Class) type;
-            //通过空参构造器创建实例
-            Constructor constructor = clazz.getDeclaredConstructor();
-            constructor.setAccessible(true);
-            Object classObject =  constructor.newInstance();
-            //获得对象的所有属性名
-            Field[] fields = clazz.getDeclaredFields();
-            //遍历属性集合
-            for (int i=0;i<fields.length;i++){
-                Field field=fields[i];
-                //开启权限
-                field.setAccessible(true);
-                //判断是否保护属性值
-                if(jsonObject.containsKey(field.getName())){
-                    Object objectValue =jsonObject.get(field.getName());
-                    //判断jsonObject的item是否是String或者Integer,是简单类型直接赋值
-                    if ((objectValue instanceof Long)||(objectValue instanceof String)||(objectValue instanceof Integer)||(objectValue instanceof Boolean)||(objectValue instanceof BigDecimal)){
-                        //进行数据判断
-                        if (field.getType()==BigDecimal.class){
-                            field.set(classObject,new BigDecimal(objectValue.toString()));
-                        } else if (field.getType()==Short.class){
-                            field.set(classObject,Short.parseShort(objectValue.toString()));
-                        }else if (field.getType()==Date.class){
-                            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                            Date time = formatter.parse(objectValue.toString());
-                            field.set(classObject,time);
-                        }
-                        else {
-                            if(field.getType()==Long.class||field.getType()==String.class||field.getType()==Integer.class||field.getType()==Boolean.class){
-                                field.set(classObject,objectValue);
-                            }
-
-                        }
-                    }
-                    //集合类型类型
-                    else if(objectValue instanceof JSONArray){
-                        Iterator<Object> iterator = ((JSONArray) objectValue).iterator();
-                        //这里使用的是arryList接收
-                        List list=new ArrayList<>();
-                        // 如果是List类型，得到其Generic的类型
-                        Type genericType = field.getGenericType();
-                        //如果是空的
-                        if(genericType == null) {
-                            genericType=Object.class;
-                        }
-                        // 如果是泛型参数的类型
-                        else if(genericType instanceof ParameterizedType){
-                            ParameterizedType pt = (ParameterizedType) genericType;
-                            //得到泛型里的class类型对象
-                            Class<?> genericClazz = (Class<?>)pt.getActualTypeArguments()[0];
-                            genericType=genericClazz;
-                        }
-                        while (iterator.hasNext()){
-                            Object nextObject = iterator.next();
-                            Object fieldValue =  jsonToBean(nextObject, genericType);
-                            list.add(fieldValue);
-                        }
-                        field.set(classObject,list);
-                    }
-//                    else if(field.getType()==Object.class){
-//                        field.set(classObject,objectValue);
-//                    }
-                    //如果不是再判断是否是JSONOArray,复杂数据类型
-                    else{
-                        //如果是JSONObject需要判断是否是引用类型，如果是引用类型就还需要将值转为对应类型
-                        Object fieldValue =  jsonToBean(objectValue, field.getType());
-                        field.set(classObject,fieldValue);
-                    }
-
-                }
-
-
-            }
-
-            return classObject;
-        }catch (Exception ex){
-            throw ex;
-        }
-    }
-
-    /**
-     * 将Object对象里面的属性和值转化成Map对象
-     *
-     * @param obj
-     * @return
-     * @throws IllegalAccessException
-     */
-    public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
-        Map<String, Object> map = new HashMap<String,Object>();
-        Class<?> clazz = obj.getClass();
-        for (Field field : clazz.getDeclaredFields()) {
-            field.setAccessible(true);
-            String fieldName = field.getName();
-            Object value = field.get(obj);
-            map.put(fieldName, value);
-        }
-        return map;
-    }
-    /**
-     *
-     * @param map
-     * @param type
-     * @return
-     * @throws Exception
-     */
-    public static Object mapToBean(Map map, Object type) throws Exception {
-
-        try{
-            //获得Class对象
-            //Class clazz=type.getClass().getDeclaringClass();
-            Class clazz= (Class) type;
-            //通过空参构造器创建实例
-            Constructor constructor = clazz.getDeclaredConstructor();
-            constructor.setAccessible(true);
-            Object classObject =  constructor.newInstance();
-            //获得对象的所有属性名
-            Field[] fields = clazz.getDeclaredFields();
-            //遍历属性集合
-            for (int i=0;i<fields.length;i++){
-                Field field=fields[i];
-                //开启权限
-                field.setAccessible(true);
-                //判断是否保护属性值
-                if(map.containsKey(field.getName())){
-                    Object objectValue =map.get(field.getName());
-                    //判断jsonObject的item是否是String或者Integer,是简单类型直接赋值
-                    if ((objectValue instanceof String)||(objectValue instanceof Integer)||(objectValue instanceof Boolean)){
-                        //进行数据判断
-                        if (field.getType()==BigDecimal.class){
-                            field.set(classObject,new BigDecimal(objectValue.toString()));
-                        } else if (field.getType()==Short.class){
-                            if(objectValue.toString()=="0.00"){
-                                field.set(classObject,0);
-                            }
-                            field.set(classObject,Short.parseShort(objectValue.toString()));
-                        }else if (field.getType()==Date.class){
-                            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                            Date time = formatter.parse(objectValue.toString());
-                            field.set(classObject,time);
-                        }
-                        else {
-                            field.set(classObject,objectValue);
-                        }
-
-                    }
-                    //集合类型类型
-                    else if(objectValue instanceof List){
-                        Iterator<Object> iterator = ((List)objectValue).iterator();
-                        //这里使用的是arryList接收
-                        List list=new ArrayList<>();
-                        // 如果是List类型，得到其Generic的类型
-                        Type genericType = field.getGenericType();
-                        //如果是空的
-                        if(genericType == null) {
-                            genericType=Object.class;
-                        }
-                        // 如果是泛型参数的类型
-                        else if(genericType instanceof ParameterizedType){
-                            ParameterizedType pt = (ParameterizedType) genericType;
-                            //得到泛型里的class类型对象
-                            Class<?> genericClazz = (Class<?>)pt.getActualTypeArguments()[0];
-                            genericType=genericClazz;
-                        }
-                        while (iterator.hasNext()){
-                            Object nextObject = iterator.next();
-                            Object fieldValue =  jsonToBean(nextObject, genericType);
-                            list.add(fieldValue);
-                        }
-                        field.set(classObject,list);
-                    }
-                    //如果不是再判断是否是JSONOArray,复杂数据类型
-                    else{
-                        //如果是JSONObject需要判断是否是引用类型，如果是引用类型就还需要将值转为对应类型
-                        Object fieldValue =  jsonToBean(objectValue, field.getType());
-                        field.set(classObject,fieldValue);
-                    }
-
-                }
-
-
-            }
-
-            return classObject;
-        }catch (Exception ex){
-            throw ex;
-        }
-
-    }
-}

src/main/java/com/steerinfo/route/util/HTTPRequestUtils.java

@@ -1,136 +0,0 @@
-package com.steerinfo.route.util;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-import java.util.Map;
-
-public class HTTPRequestUtils {
-    /**
-     * 向指定URL发送GET方法的请求
-     * @param url：发送请求的URL
-     * @param param：请求参数，请求参数应该是 name1=value1&name2=value2&name3=value3 的形式。
-     * @return String[result]：所代表远程资源的响应结果
-     */
-    public static String sendGet(String url, String param) {
-        String result = "";
-        BufferedReader in = null;
-        try {
-            String urlNameString = url + "?" + param;
-            URL realUrl = new URL(urlNameString);
-
-            // 打开和URL之间的连接
-            URLConnection connection = realUrl.openConnection();
-
-            // 设置通用的请求属性
-            connection.setRequestProperty("accept", "*/*");
-            connection.setRequestProperty("connection", "Keep-Alive");
-            connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
-
-            // 建立实际的连接
-            connection.connect();
-
-            // 获取所有响应头字段
-            Map<String, List<String>> map = connection.getHeaderFields();
-
-            // 遍历所有的响应头字段
-//            for (String key : map.keySet()) {
-//                System.out.println(key + "--->" + map.get(key));
-//            }
-
-            // 定义 BufferedReader输入流来读取URL的响应
-            in = new BufferedReader(new InputStreamReader(
-                    connection.getInputStream(),"utf-8"));
-            String line;
-            while ((line = in.readLine()) != null) {
-                result += line;
-            }
-            System.out.println("result");
-            System.out.println(result);
-        } catch (Exception e) {
-            System.out.println("发送GET请求出现异常！" + e);
-            e.printStackTrace();
-        }
-
-        // 使用finally块来关闭输入流
-        finally {
-            try {
-                if (in != null) {
-                    in.close();
-                }
-            } catch (Exception e2) {
-                e2.printStackTrace();
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 向指定 URL 发送POST方法的请求
-     *
-     * @param url：发送请求的 URL
-     * @param param：请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
-     * @return String[result]：所代表远程资源的响应结果
-     */
-    public static String sendPost(String url, String param) {
-        PrintWriter out = null;
-        BufferedReader in = null;
-        String result = "";
-        try {
-            URL realUrl = new URL(url);
-
-            // 打开和URL之间的连接
-            URLConnection conn = realUrl.openConnection();
-
-            // 设置通用的请求属性
-            conn.setRequestProperty("accept", "*/*");
-            conn.setRequestProperty("connection", "Keep-Alive");
-            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
-
-            // 发送POST请求必须设置如下两行
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-
-            // 获取URLConnection对象对应的输出流
-            out = new PrintWriter(conn.getOutputStream());
-
-            // 发送请求参数
-            out.print(param);
-
-            // flush输出流的缓冲
-            out.flush();
-
-            // 定义BufferedReader输入流来读取URL的响应
-            in = new BufferedReader(
-                    new InputStreamReader(conn.getInputStream()));
-            String line;
-            while ((line = in.readLine()) != null) {
-                result += line;
-            }
-        } catch (Exception e) {
-            System.out.println("发送 POST 请求出现异常！"+e);
-            e.printStackTrace();
-        }
-
-        //使用finally块来关闭输出流、输入流
-        finally{
-            try{
-                if(out!=null){
-                    out.close();
-                }
-                if(in!=null){
-                    in.close();
-                }
-            }
-            catch(IOException ex){
-                ex.printStackTrace();
-            }
-        }
-        return result;
-    }
-
-}

src/main/java/com/steerinfo/route/util/LngLonUtil.java

@@ -1,157 +0,0 @@
-package com.steerinfo.route.util;
-
-/**
- * GPS84、高德、百度、腾讯编码互转
- */
-public class LngLonUtil {
-
-    public static double pi = 3.1415926535897932384626;
-    public static double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
-    public static double a = 6378245.0;
-    public static double ee = 0.00669342162296594323;
-
-    public static double transformLat(double x, double y) {
-        double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
-        ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
-        ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
-        ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
-        return ret;
-    }
-
-    public static double transformLon(double x, double y) {
-        double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
-        ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
-        ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
-        ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 * pi)) * 2.0 / 3.0;
-        return ret;
-    }
-    public static double[] transform(double lat, double lon) {
-        if (outOfChina(lat, lon)) {
-            return new double[]{lat,lon};
-        }
-        double dLat = transformLat(lon - 105.0, lat - 35.0);
-        double dLon = transformLon(lon - 105.0, lat - 35.0);
-        double radLat = lat / 180.0 * pi;
-        double magic = Math.sin(radLat);
-        magic = 1 - ee * magic * magic;
-        double sqrtMagic = Math.sqrt(magic);
-        dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
-        dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
-        double mgLat = lat + dLat;
-        double mgLon = lon + dLon;
-        return new double[]{mgLat,mgLon};
-    }
-    /**
-     * 判断是否在中国
-     * @param lat
-     * @param lon
-     * @return
-     */
-    public static boolean outOfChina(double lat, double lon) {
-        if (lon < 72.004 || lon > 137.8347)
-            return true;
-        if (lat < 0.8293 || lat > 55.8271)
-            return true;
-        return false;
-    }
-    /**
-     * 84 ==》 高德/腾讯
-     * @param lat
-     * @param lon
-     * @return
-     */
-    public static Double[] gps84_To_Gcj02(double lat, double lon) {
-        if (outOfChina(lat, lon)) {
-            return new Double[]{lat,lon};
-        }
-        double dLat = transformLat(lon - 105.0, lat - 35.0);
-        double dLon = transformLon(lon - 105.0, lat - 35.0);
-        double radLat = lat / 180.0 * pi;
-        double magic = Math.sin(radLat);
-        magic = 1 - ee * magic * magic;
-        double sqrtMagic = Math.sqrt(magic);
-        dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
-        dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
-        double mgLat = lat + dLat;
-        double mgLon = lon + dLon;
-        return new Double[]{mgLat, mgLon};
-    }
-
-
-    /**
-     * 高德/腾讯 ==》 84
-     * @param lon * @param lat * @return
-     * */
-    public static double[] gcj02_To_Gps84(double lat, double lon) {
-        double[] gps = transform(lat, lon);
-        double lontitude = lon * 2 - gps[1];
-        double latitude = lat * 2 - gps[0];
-        return new double[]{latitude, lontitude};
-    }
-    /**
-     * 高德/腾讯 == 》 百度
-     * @param lat
-     * @param lon
-     */
-    public static double[] gcj02_To_Bd09(double lat, double lon) {
-        double x = lon, y = lat;
-        double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
-        double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
-        double tempLon = z * Math.cos(theta) + 0.0065;
-        double tempLat = z * Math.sin(theta) + 0.006;
-        double[] gps = {tempLat,tempLon};
-        return gps;
-    }
-
-    /**
-     * 百度 == 》 高德/腾讯
-     * @param lat
-     * @param lon
-     */
-    public static double[] bd09_To_Gcj02(double lat, double lon) {
-        double x = lon - 0.0065, y = lat - 0.006;
-        double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
-        double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
-        double tempLon = z * Math.cos(theta);
-        double tempLat = z * Math.sin(theta);
-        double[] gps = {tempLat,tempLon};
-        return gps;
-    }
-
-    /**
-     * 84 == 》 百度
-     * @param lat
-     * @param lon
-     * @return
-     */
-    public static double[] gps84_To_bd09(double lat,double lon){
-        Double[] gcj02 = gps84_To_Gcj02(lat,lon);
-        double[] bd09 = gcj02_To_Bd09(gcj02[0],gcj02[1]);
-        return bd09;
-    }
-
-    /**
-     * 百度 == 》 84
-     * @param lat
-     * @param lon
-     * @return
-     */
-    public static double[] bd09_To_gps84(double lat,double lon){
-        double[] gcj02 = bd09_To_Gcj02(lat, lon);
-        double[] gps84 = gcj02_To_Gps84(gcj02[0], gcj02[1]);
-        //保留小数点后六位
-        gps84[0] = retain6(gps84[0]);
-        gps84[1] = retain6(gps84[1]);
-        return gps84;
-    }
-
-    /*
-     * 保留小数点后六位
-     * @param num
-     * @return
-     */
-    private static double retain6(double num){
-        String result = String.format("%.6f", num);
-        return Double.valueOf(result);
-    }
-}

src/main/java/com/steerinfo/route/vo/FullPathVisualizationTo/Result.java

@@ -1,154 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.FullPathVisualizationTo;
-import com.steerinfo.route.vo.Map.Point;
-import com.steerinfo.route.vo.Map.RunRoutePoint;
-
-import java.util.List;
-
-/**
- * Auto-generated: 2021-10-16 11:56:24
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class Result {
-
-    private String adr;
-    private String city;
-    private String country;
-    private String drc;
-    private String estimateArriveTime;
-    private List<Point> estimateRoute;
-    private String lat;
-    private String lon;
-    private String mil;
-    private boolean offlineState;
-    private String offlineTime;
-    private String province;
-    private String remainDistance;
-    private String runDistance;
-    private List<RunRoutePoint> runRoute;
-    private String spd;
-    private String utc;
-    public void setAdr(String adr) {
-         this.adr = adr;
-     }
-     public String getAdr() {
-         return adr;
-     }
-
-    public void setCity(String city) {
-         this.city = city;
-     }
-     public String getCity() {
-         return city;
-     }
-
-    public void setCountry(String country) {
-         this.country = country;
-     }
-     public String getCountry() {
-         return country;
-     }
-
-    public void setDrc(String drc) {
-         this.drc = drc;
-     }
-     public String getDrc() {
-         return drc;
-     }
-
-    public void setEstimateArriveTime(String estimateArriveTime) {
-         this.estimateArriveTime = estimateArriveTime;
-     }
-     public String getEstimateArriveTime() {
-         return estimateArriveTime;
-     }
-
-    public void setEstimateRoute(List<Point> estimateRoute) {
-         this.estimateRoute = estimateRoute;
-     }
-     public List<Point> getEstimateRoute() {
-         return estimateRoute;
-     }
-
-    public void setLat(String lat) {
-         this.lat = lat;
-     }
-     public String getLat() {
-         return lat;
-     }
-
-    public void setLon(String lon) {
-         this.lon = lon;
-     }
-     public String getLon() {
-         return lon;
-     }
-
-    public void setMil(String mil) {
-         this.mil = mil;
-     }
-     public String getMil() {
-         return mil;
-     }
-
-    public void setOfflineState(boolean offlineState) {
-         this.offlineState = offlineState;
-     }
-     public boolean getOfflineState() {
-         return offlineState;
-     }
-
-    public void setOfflineTime(String offlineTime) {
-         this.offlineTime = offlineTime;
-     }
-     public String getOfflineTime() {
-         return offlineTime;
-     }
-
-    public void setProvince(String province) {
-         this.province = province;
-     }
-     public String getProvince() {
-         return province;
-     }
-
-    public void setRemainDistance(String remainDistance) {
-         this.remainDistance = remainDistance;
-     }
-     public String getRemainDistance() {
-         return remainDistance;
-     }
-
-    public void setRunDistance(String runDistance) {
-         this.runDistance = runDistance;
-     }
-     public String getRunDistance() {
-         return runDistance;
-     }
-
-    public void setRunRoute(List<RunRoutePoint> runRoute) {
-         this.runRoute = runRoute;
-     }
-     public List<RunRoutePoint> getRunRoute() {
-         return runRoute;
-     }
-
-    public void setSpd(String spd) {
-         this.spd = spd;
-     }
-     public String getSpd() {
-         return spd;
-     }
-
-    public void setUtc(String utc) {
-         this.utc = utc;
-     }
-     public String getUtc() {
-         return utc;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/FullPathVisualizationTo/RunRoute.java

@@ -1,70 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.FullPathVisualizationTo;
-
-/**
- * Auto-generated: 2021-10-16 11:56:24
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class RunRoute {
-
-    private String agl;
-    private String gtm;
-    private String hgt;
-    private String lat;
-    private String lon;
-    private String mil;
-    private String spd;
-    public void setAgl(String agl) {
-         this.agl = agl;
-     }
-     public String getAgl() {
-         return agl;
-     }
-
-    public void setGtm(String gtm) {
-         this.gtm = gtm;
-     }
-     public String getGtm() {
-         return gtm;
-     }
-
-    public void setHgt(String hgt) {
-         this.hgt = hgt;
-     }
-     public String getHgt() {
-         return hgt;
-     }
-
-    public void setLat(String lat) {
-         this.lat = lat;
-     }
-     public String getLat() {
-         return lat;
-     }
-
-    public void setLon(String lon) {
-         this.lon = lon;
-     }
-     public String getLon() {
-         return lon;
-     }
-
-    public void setMil(String mil) {
-         this.mil = mil;
-     }
-     public String getMil() {
-         return mil;
-     }
-
-    public void setSpd(String spd) {
-         this.spd = spd;
-     }
-     public String getSpd() {
-         return spd;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/FullPathVisualizationTo/ViewVisualization.java

@@ -1,30 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.FullPathVisualizationTo;
-
-/**
- * Auto-generated: 2021-10-16 11:56:24
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class ViewVisualization {
-
-    private Result result;
-    private int status;
-    public void setResult(Result result) {
-         this.result = result;
-     }
-     public Result getResult() {
-         return result;
-     }
-
-    public void setStatus(int status) {
-         this.status = status;
-     }
-     public int getStatus() {
-         return status;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/Map/Point.java

@@ -1,40 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.Map;
-
-/**
- * Auto-generated: 2021-09-28 10:36:43
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class Point {
-
-    private String lat;
-    private String lon;
-
-    public String getLat() {
-        return lat;
-    }
-
-    public void setLat(String lat) {
-        this.lat = lat;
-    }
-
-    public String getLon() {
-        return lon;
-    }
-
-    public void setLon(String lon) {
-        this.lon = lon;
-    }
-
-    @Override
-    public String toString() {
-        return "Point{" +
-                "lat='" + lat + '\'' +
-                ", lon='" + lon + '\'' +
-                '}';
-    }
-}

src/main/java/com/steerinfo/route/vo/Map/RouteVo.java

@@ -1,26 +0,0 @@
-package com.steerinfo.route.vo.Map;
-
-import java.util.List;
-
-public class RouteVo {
-
-
-
-
-    private List<StartAndEndRoute> startAndEndRoutes;
-
-    public List<StartAndEndRoute> getStartAndEndRoutes() {
-        return startAndEndRoutes;
-    }
-
-    public void setStartAndEndRoutes(List<StartAndEndRoute> startAndEndRoutes) {
-        this.startAndEndRoutes = startAndEndRoutes;
-    }
-
-    @Override
-    public String toString() {
-        return "RouteVo{" +
-                "startAndEndRoutes=" + startAndEndRoutes +
-                '}';
-    }
-}

src/main/java/com/steerinfo/route/vo/Map/RunRoutePoint.java

@@ -1,82 +0,0 @@
-package com.steerinfo.route.vo.Map; /**
-  * Copyright 2021 bejson.com 
-  */
-
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-
-/**
- * Auto-generated: 2021-10-16 11:56:24
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class RunRoutePoint {
-
-    SimpleDateFormat startSimpleDateFormat=new SimpleDateFormat("yyyyMMdd/HHmmss");
-    SimpleDateFormat endSimpleDateFormat=new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
-    private String agl;
-    private String gtm;
-    private String hgt;
-    private String lat;
-    private String lon;
-    private String mil;
-    private String spd;
-    public void setAgl(String agl) {
-         this.agl = agl;
-     }
-     public String getAgl() {
-         return agl;
-     }
-
-    public void setGtm(String gtm) throws ParseException {
-        this.gtm = gtm;
-     }
-
-     public String getGtm() throws ParseException {
-         Date parse = startSimpleDateFormat.parse(this.gtm);
-        return endSimpleDateFormat.format(parse);
-     }
-
-    public void setHgt(String hgt) {
-         this.hgt = hgt;
-     }
-     public String getHgt() {
-         return hgt;
-     }
-
-    public void setLat(String lat) {
-
-         this.lat = lat;
-     }
-     public String getLat() {
-         return lat;
-     }
-
-    public void setLon(String lon) {
-         this.lon = lon;
-     }
-     public String getLon() {
-         return lon;
-     }
-
-
-
-    public void setMil(String mil) {
-         this.mil = mil;
-     }
-     public String getMil() {
-         return mil;
-     }
-
-    public void setSpd(String spd) {
-         this.spd = spd;
-     }
-     public String getSpd() {
-         return spd;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/Map/StartAndEndRoute.java

@@ -1,132 +0,0 @@
-package com.steerinfo.route.vo.Map;
-
-import java.util.List;
-
-public class StartAndEndRoute {
-    //开始点名称
-    private String startPointName;
-    //开始点
-    private Point startPoint;
-    //结束点名称
-    private String endPointName;
-    //结束点
-    private Point endPoint;
-    //当前点名称
-    private String currentPointName;
-    //当前点
-    private Point currentPoint;
-    //行驶里程数
-    private String miled;
-
-    //已经行驶点的集合，绘制已行驶路径使用的
-    private List<RunRoutePoint> runRoute;
-    //预计行驶点的集合，绘制预计行驶径使用的
-    private List<Point> estimateRoute;
-
-    private List<Double[]> estimatePath;
-
-    private List<Double[]> runPath;
-
-    public List<Double[]> getEstimatePath() {
-        return estimatePath;
-    }
-
-    public void setEstimatePath(List<Double[]> estimatePath) {
-        this.estimatePath = estimatePath;
-    }
-
-    public List<Double[]> getRunPath() {
-        return runPath;
-    }
-
-    public void setRunPath(List<Double[]> runPath) {
-        this.runPath = runPath;
-    }
-
-    public String getStartPointName() {
-        return startPointName;
-    }
-
-    public void setStartPointName(String startPointName) {
-        this.startPointName = startPointName;
-    }
-
-    public Point getStartPoint() {
-        return startPoint;
-    }
-
-    public void setStartPoint(Point startPoint) {
-        this.startPoint = startPoint;
-    }
-
-    public String getEndPointName() {
-        return endPointName;
-    }
-
-    public void setEndPointName(String endPointName) {
-        this.endPointName = endPointName;
-    }
-
-    public Point getEndPoint() {
-        return endPoint;
-    }
-
-    public void setEndPoint(Point endPoint) {
-        this.endPoint = endPoint;
-    }
-
-    public String getCurrentPointName() {
-        return currentPointName;
-    }
-
-    public void setCurrentPointName(String currentPointName) {
-        this.currentPointName = currentPointName;
-    }
-
-    public Point getCurrentPoint() {
-        return currentPoint;
-    }
-
-    public void setCurrentPoint(Point currentPoint) {
-        this.currentPoint = currentPoint;
-    }
-
-    public String getMiled() {
-        return miled;
-    }
-
-    public void setMiled(String miled) {
-        this.miled = miled;
-    }
-
-    public List<RunRoutePoint> getRunRoute() {
-        return runRoute;
-    }
-
-    public void setRunRoute(List<RunRoutePoint> runRoute) {
-        this.runRoute = runRoute;
-    }
-
-    public List<Point> getEstimateRoute() {
-        return estimateRoute;
-    }
-
-    public void setEstimateRoute(List<Point> estimateRoute) {
-        this.estimateRoute = estimateRoute;
-    }
-
-    @Override
-    public String toString() {
-        return "StartAndEndRoute{" +
-                "startPointName='" + startPointName + '\'' +
-                ", startPoint=" + startPoint +
-                ", endPointName='" + endPointName + '\'' +
-                ", endPoint=" + endPoint +
-                ", currentPointName='" + currentPointName + '\'' +
-                ", currentPoint=" + currentPoint +
-                ", miled='" + miled + '\'' +
-                ", runRoute=" + runRoute +
-                ", estimateRoute=" + estimateRoute +
-                '}';
-    }
-}

src/main/java/com/steerinfo/route/vo/ResultWarn.java

@@ -1,18 +0,0 @@
-package com.steerinfo.route.vo;
-
-import lombok.Data;
-
-@Data
-public class ResultWarn {
-    private String adr;
-    private String dLoc;
-    private String label;
-    private String rid;
-    private String sLoc;
-    private long time;
-    private String type;
-    private String userName;
-    private String vno;
-    private int warnTime;
-
-}

src/main/java/com/steerinfo/route/vo/resultJson/Ad_info.java

@@ -1,22 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.resultJson;
-
-/**
- * Auto-generated: 2021-10-10 19:26:2
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class Ad_info {
-
-    private String adcode;
-    public void setAdcode(String adcode) {
-         this.adcode = adcode;
-     }
-     public String getAdcode() {
-         return adcode;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/resultJson/Address_components.java

@@ -1,54 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.resultJson;
-
-/**
- * Auto-generated: 2021-10-10 19:26:2
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class Address_components {
-
-    private String province;
-    private String city;
-    private String district;
-    private String street;
-    private String street_number;
-    public void setProvince(String province) {
-         this.province = province;
-     }
-     public String getProvince() {
-         return province;
-     }
-
-    public void setCity(String city) {
-         this.city = city;
-     }
-     public String getCity() {
-         return city;
-     }
-
-    public void setDistrict(String district) {
-         this.district = district;
-     }
-     public String getDistrict() {
-         return district;
-     }
-
-    public void setStreet(String street) {
-         this.street = street;
-     }
-     public String getStreet() {
-         return street;
-     }
-
-    public void setStreet_number(String street_number) {
-         this.street_number = street_number;
-     }
-     public String getStreet_number() {
-         return street_number;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/resultJson/Location.java

@@ -1,32 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.resultJson;
-
-import java.math.BigDecimal;
-
-/**
- * Auto-generated: 2021-10-10 19:26:2
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class Location {
-
-    private BigDecimal lng;
-    private BigDecimal lat;
-    public void setLng(BigDecimal lng) {
-         this.lng = lng;
-     }
-     public BigDecimal getLng() {
-         return lng;
-     }
-
-    public void setLat(BigDecimal lat) {
-         this.lat = lat;
-     }
-     public BigDecimal getLat() {
-         return lat;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/resultJson/Result.java

@@ -1,80 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.resultJson;
-
-import java.math.BigDecimal;
-
-/**
- * Auto-generated: 2021-10-10 19:26:2
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class Result {
-
-    private String title;
-    private Location location;
-    private Ad_info ad_info;
-    private Address_components address_components;
-    private BigDecimal similarity;
-    private int deviation;
-    private int reliability;
-    private int level;
-    public void setTitle(String title) {
-         this.title = title;
-     }
-     public String getTitle() {
-         return title;
-     }
-
-    public void setLocation(Location location) {
-         this.location = location;
-     }
-     public Location getLocation() {
-         return location;
-     }
-
-    public void setAd_info(Ad_info ad_info) {
-         this.ad_info = ad_info;
-     }
-     public Ad_info getAd_info() {
-         return ad_info;
-     }
-
-    public void setAddress_components(Address_components address_components) {
-         this.address_components = address_components;
-     }
-     public Address_components getAddress_components() {
-         return address_components;
-     }
-
-    public void setSimilarity(BigDecimal similarity) {
-         this.similarity = similarity;
-     }
-     public BigDecimal getSimilarity() {
-         return similarity;
-     }
-
-    public void setDeviation(int deviation) {
-         this.deviation = deviation;
-     }
-     public int getDeviation() {
-         return deviation;
-     }
-
-    public void setReliability(int reliability) {
-         this.reliability = reliability;
-     }
-     public int getReliability() {
-         return reliability;
-     }
-
-    public void setLevel(int level) {
-         this.level = level;
-     }
-     public int getLevel() {
-         return level;
-     }
-
-}

src/main/java/com/steerinfo/route/vo/resultJson/SearchPoint.java

@@ -1,38 +0,0 @@
-/**
-  * Copyright 2021 bejson.com 
-  */
-package com.steerinfo.route.vo.resultJson;
-
-/**
- * Auto-generated: 2021-10-10 19:26:2
- *
- * @author bejson.com (i@bejson.com)
- * @website http://www.bejson.com/java2pojo/
- */
-public class SearchPoint {
-
-    private int status;
-    private String message;
-    private Result result;
-    public void setStatus(int status) {
-         this.status = status;
-     }
-     public int getStatus() {
-         return status;
-     }
-
-    public void setMessage(String message) {
-         this.message = message;
-     }
-     public String getMessage() {
-         return message;
-     }
-
-    public void setResult(Result result) {
-         this.result = result;
-     }
-     public Result getResult() {
-         return result;
-     }
-
-}

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -387,6 +387,9 @@
         <if test="carrierSsoId != null">
             and RC2.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
+        <if test="receivName != null">
+            and RCON.CONSIGNEE_COMPANY_NAME like #{receivName}
+        </if>
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
         </if>

src/main/resources/com/steerinfo/route/mapper/DilVersionMapper.xml

@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.route.mapper.DilVersionMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilVersion">
-    <id column="VERSION_ID" jdbcType="DECIMAL" property="versionId" />
-    <result column="VERSION_VALUE" jdbcType="VARCHAR" property="versionValue" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-    <result column="VERSION_TYPE" jdbcType="DECIMAL" property="versionType" />
-  </resultMap>
-  <sql id="columns">
-    VERSION_ID, VERSION_VALUE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK, VERSION_TYPE
-  </sql>
-  <sql id="columns_alias">
-    t.VERSION_ID, t.VERSION_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.VERSION_TYPE
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM DIL_VERSION
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM DIL_VERSION t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="versionId != null">
-        and VERSION_ID = #{versionId}
-      </if>
-      <if test="versionValue != null and versionValue != ''">
-        and VERSION_VALUE = #{versionValue}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="versionType != null">
-        and VERSION_TYPE = #{versionType}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="versionId != null">
-        and VERSION_ID = #{versionId}
-      </if>
-      <if test="versionValue != null and versionValue != ''">
-        and VERSION_VALUE LIKE '%${versionValue}%'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-      <if test="versionType != null">
-        and VERSION_TYPE = #{versionType}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from DIL_VERSION
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DIL_VERSION
-    where 1!=1 
-      <if test="versionValue != null and versionValue != ''">
-        or VERSION_VALUE = #{versionValue}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="versionType != null">
-        or VERSION_TYPE = #{versionType}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.DilVersion">
-    insert into DIL_VERSION (VERSION_ID, VERSION_VALUE, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, VERSION_TYPE)
-    values (#{versionId,jdbcType=DECIMAL}, #{versionValue,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{versionType,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilVersion">
-    insert into DIL_VERSION
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        VERSION_ID,
-      </if>
-      <if test="versionValue != null">
-        VERSION_VALUE,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-      <if test="versionType != null">
-        VERSION_TYPE,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        #{versionId,jdbcType=DECIMAL},
-      </if>
-      <if test="versionValue != null">
-        #{versionValue,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="versionType != null">
-        #{versionType,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilVersion">
-    update DIL_VERSION
-    set VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      VERSION_TYPE = #{versionType,jdbcType=DECIMAL}
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilVersion">
-    update DIL_VERSION
-    <set>
-      <if test="versionValue != null">
-        VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-      <if test="versionType != null">
-        VERSION_TYPE = #{versionType,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into DIL_VERSION 
-      (VERSION_ID, 
-      VERSION_VALUE, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      VERSION_TYPE)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.versionId,jdbcType=DECIMAL}, 
-      #{item.versionValue,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.versionType,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update DIL_VERSION
-     set
-       VERSION_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.versionId,jdbcType=DECIMAL}
-       </foreach>
-       ,VERSION_VALUE=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.versionValue,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,VERSION_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=DECIMAL} then #{item.versionType,jdbcType=DECIMAL}
-       </foreach>
-     where VERSION_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.versionId,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DIL_VERSION
-    where VERSION_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-</mapper>

src/main/resources/com/steerinfo/route/mapper/TmstruckArrivalResultMapper.xml

@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.route.mapper.TmstruckArrivalResultMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.route.model.TmstruckArrivalResult">
-    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
-    <result column="POINT_ID" jdbcType="DECIMAL" property="pointId" />
-    <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
-    <result column="RESULT_ARRIVAL_ADDRESS" jdbcType="VARCHAR" property="resultArrivalAddress" />
-    <result column="RESULT_FULL_CONTAINER_PHOTO" jdbcType="VARCHAR" property="resultFullContainerPhoto" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-  </resultMap>
-  <sql id="columns">
-    RESULT_ID, POINT_ID, RESULT_TOTAL_ID, RESULT_ARRIVAL_ADDRESS, RESULT_FULL_CONTAINER_PHOTO, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.RESULT_ID, t.POINT_ID, t.RESULT_TOTAL_ID, t.RESULT_ARRIVAL_ADDRESS, t.RESULT_FULL_CONTAINER_PHOTO, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM TMSTRUCK_ARRIVAL_RESULT
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM TMSTRUCK_ARRIVAL_RESULT t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="resultId != null">
-        and RESULT_ID = #{resultId}
-      </if>
-      <if test="pointId != null">
-        and POINT_ID = #{pointId}
-      </if>
-      <if test="resultTotalId != null">
-        and RESULT_TOTAL_ID = #{resultTotalId}
-      </if>
-      <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
-        and RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress}
-      </if>
-      <if test="resultFullContainerPhoto != null and resultFullContainerPhoto != ''">
-        and RESULT_FULL_CONTAINER_PHOTO = #{resultFullContainerPhoto}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="resultId != null">
-        and RESULT_ID = #{resultId}
-      </if>
-      <if test="pointId != null">
-        and POINT_ID = #{pointId}
-      </if>
-      <if test="resultTotalId != null">
-        and RESULT_TOTAL_ID = #{resultTotalId}
-      </if>
-      <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
-        and RESULT_ARRIVAL_ADDRESS LIKE '%${resultArrivalAddress}%'
-      </if>
-      <if test="resultFullContainerPhoto != null and resultFullContainerPhoto != ''">
-        and RESULT_FULL_CONTAINER_PHOTO LIKE '%${resultFullContainerPhoto}%'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from TMSTRUCK_ARRIVAL_RESULT
-    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from TMSTRUCK_ARRIVAL_RESULT
-    where 1!=1
-    <if test="pointId != null">
-      or POINT_ID = #{pointId}
-    </if>
-    <if test="resultTotalId != null">
-      or RESULT_TOTAL_ID = #{resultTotalId}
-    </if>
-    <if test="resultArrivalAddress != null and resultArrivalAddress != ''">
-      or RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress}
-    </if>
-    <if test="resultFullContainerPhoto != null and resultFullContainerPhoto != ''">
-      or RESULT_FULL_CONTAINER_PHOTO = #{resultFullContainerPhoto}
-    </if>
-    <if test="insertUsername != null and insertUsername != ''">
-      or INSERT_USERNAME = #{insertUsername}
-    </if>
-    <if test="insertTime != null">
-      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-    </if>
-    <if test="updateUsername != null and updateUsername != ''">
-      or UPDATE_USERNAME = #{updateUsername}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
-    insert into TMSTRUCK_ARRIVAL_RESULT (RESULT_ID, POINT_ID, RESULT_TOTAL_ID,
-                                         RESULT_ARRIVAL_ADDRESS, RESULT_FULL_CONTAINER_PHOTO,
-                                         INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                         UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{resultId,jdbcType=DECIMAL}, #{pointId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
-            #{resultArrivalAddress,jdbcType=VARCHAR}, #{resultFullContainerPhoto,jdbcType=VARCHAR},
-            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
-    insert into TMSTRUCK_ARRIVAL_RESULT
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="resultId != null">
-        RESULT_ID,
-      </if>
-      <if test="pointId != null">
-        POINT_ID,
-      </if>
-      <if test="resultTotalId != null">
-        RESULT_TOTAL_ID,
-      </if>
-      <if test="resultArrivalAddress != null">
-        RESULT_ARRIVAL_ADDRESS,
-      </if>
-      <if test="resultFullContainerPhoto != null">
-        RESULT_FULL_CONTAINER_PHOTO,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="resultId != null">
-        #{resultId,jdbcType=DECIMAL},
-      </if>
-      <if test="pointId != null">
-        #{pointId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultTotalId != null">
-        #{resultTotalId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultArrivalAddress != null">
-        #{resultArrivalAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="resultFullContainerPhoto != null">
-        #{resultFullContainerPhoto,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
-    update TMSTRUCK_ARRIVAL_RESULT
-    set POINT_ID = #{pointId,jdbcType=DECIMAL},
-        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
-        RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress,jdbcType=VARCHAR},
-        RESULT_FULL_CONTAINER_PHOTO = #{resultFullContainerPhoto,jdbcType=VARCHAR},
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
-    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.route.model.TmstruckArrivalResult">
-    update TMSTRUCK_ARRIVAL_RESULT
-    <set>
-      <if test="pointId != null">
-        POINT_ID = #{pointId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultTotalId != null">
-        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
-      </if>
-      <if test="resultArrivalAddress != null">
-        RESULT_ARRIVAL_ADDRESS = #{resultArrivalAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="resultFullContainerPhoto != null">
-        RESULT_FULL_CONTAINER_PHOTO = #{resultFullContainerPhoto,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into TMSTRUCK_ARRIVAL_RESULT
-    (RESULT_ID,
-    POINT_ID, RESULT_TOTAL_ID, RESULT_ARRIVAL_ADDRESS,
-    RESULT_FULL_CONTAINER_PHOTO, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK
-    )
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.resultId,jdbcType=DECIMAL},
-    #{item.pointId,jdbcType=DECIMAL}, #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultArrivalAddress,jdbcType=VARCHAR},
-    #{item.resultFullContainerPhoto,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
-    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update TMSTRUCK_ARRIVAL_RESULT
-    set
-    RESULT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-    </foreach>
-    ,POINT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.pointId,jdbcType=DECIMAL}
-    </foreach>
-    ,RESULT_TOTAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
-    </foreach>
-    ,RESULT_ARRIVAL_ADDRESS=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalAddress,jdbcType=VARCHAR}
-    </foreach>
-    ,RESULT_FULL_CONTAINER_PHOTO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultFullContainerPhoto,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-      when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    where RESULT_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.resultId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <update id="updateTown" parameterType="string">
-    update RMS_RECEIVE_ADDRESS set ADDRESS_TOWN='${city}'  where ADDRESS_DISTRICT ='${item}'
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from TMSTRUCK_ARRIVAL_RESULT
-    where RESULT_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-  <select id="selectMaxId"  resultType="java.math.BigDecimal">
-    select max(RESULT_ID) from TMSTRUCK_ARRIVAL_RESULT
-  </select>
-
-  <select id="getArrivalResultInfo" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-    select * from(
-    select distinct a_s_order.SALE_NUMBER "saleNumber",
-    o_torder.ORDER_NUMBER "orderNumber",
-    r_material.MATERIAL_NAME "materialName",
-    r_material.MATERIAL_MODEL "materialModel",
-    r_capacity.CAPACITY_NUMBER "capacityNumber",
-    r_shipper.SHIPPER_NAME "shipperName",
-    r_consignee.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-    t_arrival.RESULT_ARRIVAL_ADDRESS "resultArrivalAddress",
-    receive_address.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
-    t_arrival.RESULT_FULL_CONTAINER_PHOTO "resultFullContainerPhoto",
-    t_arrival.INSERT_TIME "arrivalTime",
-    r_carrier.CARRIER_NAME "carrierName",
-    r_gatepost.GATEPOST_NAME "gatepostName"
-    from TMSTRUCK_ARRIVAL_RESULT t_arrival
-    left join TMSTRUCK_TOTAL_RESULT t_total
-    on t_arrival.RESULT_TOTAL_ID=t_total.RESULT_TOTAL_ID
-    left join OMSTRUCK_ORDER o_torder
-    on t_total.ORDER_ID=o_torder.ORDER_ID
-    left join RMS_CAPACITY r_capacity
-    on o_torder.CAPACITY_ID=r_capacity.CAPACITY_ID
-    left join RMS_DRIVER_CAPACITY r_d_capacity
-    on r_capacity.CAPACITY_ID=r_d_capacity.CAPACITY_ID
-    left join RMS_CARRIER r_carrier
-    on o_torder.CARRIER_ID=r_carrier.CARRIER_ID
-    left join RMS_CAR_DRIVER r_driver
-    on r_d_capacity.DRIVER_ID=r_driver.DRIVER_ID
-    left join AMS_SALE_ORDER_MATERIAL sale_material
-    on o_torder.ORDER_PLAN_ID=sale_material.SALE_ORDER_MATERIAL_ID
-    left join RMS_RECEIVE_ADDRESS receive_address
-    on sale_material.SALE_SHIPPING_ADDRESS_ID=receive_address.ADDRESS_ID
-    left join RMS_MATERIAL r_material
-    on sale_material.MATERIAL_ID=r_material.MATERIAL_ID
-    left join AMS_SALE_ORDER a_s_order
-    on sale_material.SALE_ORDER_ID=a_s_order.SALE_ORDER_ID
-    left join RMS_SHIPPER r_shipper
-    on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
-    left join RMS_CONSIGNEE r_consignee
-    on a_s_order.CONSIGNEE_ID=r_consignee.CONSIGNEE_ID
-    left join TMSTRUCK_LEAVE_FACTORY_RESULT t_leave
-    on t_total.RESULT_TOTAL_ID=t_leave.RESULT_TOTAL_ID
-    LEFT JOIN RMS_GATEPOST r_gatepost
-    ON t_leave.GATEPOST_ID = r_gatepost.GATEPOST_ID
-    order by t_arrival.INSERT_TIME desc)
-    <where>
-      <if test="productClassification != null and productClassification != '其他' and productClassification != '螺纹钢'">
-        and  "materialName" like '%${productClassification}%'
-      </if>
-      <if test="productClassification != null and '螺纹钢' == productClassification">
-        and ("materialName" like '%螺纹钢%' or "materialName" like '%盘螺%'
-        or  "materialName" like '%盘圆%' or "materialName" like '%非定尺材%')
-      </if>
-      <if test="productClassification != null and '其他' == productClassification">
-        and  "materialName" not like '%带钢%' and "materialName" not like '%微粉%'
-        and  "materialName" not like '%螺纹钢%' and  "materialName" not like '%非定尺材%' and "materialName" not like '%钢坯%'
-        and  "materialName" not like '%盘螺%' and "materialName" not like '%盘圆%'
-      </if>
-      <if test="carrierName1 != null">
-        and "carrierName" like '%${carrierName1}%'
-      </if>
-      <if test="gatepostName1 !=null">
-        and "gatepostName" like '%${gatepostName1}%'
-      </if>
-      <if test="capacityNumber1 != null">
-        and  "capacityNumber" like '%${capacityNumber1}%'
-      </if>
-      <if test="consigneeCompanyName1 != null">
-        and  "consigneeCompanyName" like '%${consigneeCompanyName1}%'
-      </if>
-      <if test="startTime != null">
-        and "arrivalTime" &gt;= to_date('${startTime}','yyyy-mm-dd')
-      </if>
-      <if test="endTime != null">
-        and "arrivalTime" &lt;= to_date('${endTime}','yyyy-mm-dd')
-      </if>
-
-      <if test="saleNumber != null">
-        and
-        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
-          "saleNumber" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="orderNumber != null">
-        and
-        <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
-          "orderNumber" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="materialName != null">
-        and
-        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-          "materialName" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="materialModel != null">
-        and
-        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
-          "materialModel" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="capacityNumber != null">
-        and
-        <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
-          "capacityNumber" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="shipperName != null">
-        and
-        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
-          "shipperName" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="consigneeCompanyName != null">
-        and
-        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
-          "consigneeCompanyName" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="resultArrivalAddress != null">
-        and
-        <foreach collection="resultArrivalAddress" item="item" open="(" separator="or" close=")">
-          "resultArrivalAddress" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="addressDeliveryAddress != null">
-        and
-        <foreach collection="addressDeliveryAddress" item="item" open="(" separator="or" close=")">
-          "addressDeliveryAddress" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="arrivalTime != null">
-        and
-        <foreach collection="arrivalTime" item="item" open="(" separator="or" close=")">
-          "arrivalTime" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="carrierName != null">
-        and
-        <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
-          "carrierName" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="gatepostName != null">
-        and
-        <foreach collection="gatepostName" item="item" open="(" separator="or" close=")">
-          "gatepostName" like '%${item}%'
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-  </select>
-  <select id="alreadyExistsArrivalResult" parameterType="String" resultType="java.math.BigDecimal">
-   
-    select max(RESULT_ID)
-    from TMSTRUCK_ARRIVAL_RESULT t_arrival
-           left join TMSTRUCK_TOTAL_RESULT t_total
-                     on t_arrival.RESULT_TOTAL_ID=t_total.RESULT_TOTAL_ID
-           left join OMSTRUCK_ORDER o_torder
-                     on t_total.ORDER_ID=o_torder.ORDER_ID
-    where o_torder.ORDER_NUMBER = #{orderNumber}
-  </select>
-  
- 
-    <select id="getAddressDistrict" resultType="java.lang.String">
-      select receive_address.ADDRESS_TOWN "addressDistrict"
-      FROM
-       OMSTRUCK_ORDER o_torder
-       LEFT JOIN AMS_SALE_ORDER_MATERIAL sale_material ON o_torder.ORDER_PLAN_ID = sale_material.SALE_ORDER_MATERIAL_ID
-       LEFT JOIN RMS_RECEIVE_ADDRESS receive_address ON sale_material.SALE_SHIPPING_ADDRESS_ID = receive_address.ADDRESS_ID
-       WHERE
-       o_torder.ORDER_NUMBER = #{orderNumber}
-    </select>
-    <select id="getAdjustment" resultType="java.lang.String">
-      SELECT distinct ADDRESS_DISTRICT FROM RMS_RECEIVE_ADDRESS where ADDRESS_TOWN is null
-    </select>
-  <select id="getTotalIdByOrderNumber" resultType="java.math.BigDecimal">
-        select RESULT_TOTAL_ID "totalId"
-        from TMSTRUCK_TOTAL_RESULT t_total
-               left join OMSTRUCK_ORDER o_order
-                         on t_total.ORDER_ID=o_order.ORDER_ID
-        where o_order.ORDER_NUMBER = #{orderNumber}
-  </select>
-  
-  
-  <sql id="orderBy">
-    <if test="orderField != null and orderField != ''">
-      order by  "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-</mapper>

src/main/resources/com/steerinfo/route/mapper/TmstruckReceiptResultChildMapper.xml

@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.route.mapper.TmstruckReceiptResultChildMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.route.model.TmstruckReceiptResultChild">
-    <id column="CHILD_ID" jdbcType="DECIMAL" property="childId" />
-    <result column="RECEIPT_RESULT_ID" jdbcType="DECIMAL" property="receiptResultId" />
-    <result column="OTHER_PHOTO1" jdbcType="VARCHAR" property="otherPhoto1" />
-    <result column="OTHER_PHOTO2" jdbcType="VARCHAR" property="otherPhoto2" />
-    <result column="OTHER_PHOTO3" jdbcType="VARCHAR" property="otherPhoto3" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-  </resultMap>
-  <sql id="columns">
-    CHILD_ID, RECEIPT_RESULT_ID, OTHER_PHOTO1, OTHER_PHOTO2, OTHER_PHOTO3, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.CHILD_ID, t.RECEIPT_RESULT_ID, t.OTHER_PHOTO1, t.OTHER_PHOTO2, t.OTHER_PHOTO3, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM TMSTRUCK_RECEIPT_RESULT_CHILD
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM TMSTRUCK_RECEIPT_RESULT_CHILD t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="childId != null">
-        and CHILD_ID = #{childId}
-      </if>
-      <if test="receiptResultId != null">
-        and RECEIPT_RESULT_ID = #{receiptResultId}
-      </if>
-      <if test="otherPhoto1 != null and otherPhoto1 != ''">
-        and OTHER_PHOTO1 = #{otherPhoto1}
-      </if>
-      <if test="otherPhoto2 != null and otherPhoto2 != ''">
-        and OTHER_PHOTO2 = #{otherPhoto2}
-      </if>
-      <if test="otherPhoto3 != null and otherPhoto3 != ''">
-        and OTHER_PHOTO3 = #{otherPhoto3}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="childId != null">
-        and CHILD_ID = #{childId}
-      </if>
-      <if test="receiptResultId != null">
-        and RECEIPT_RESULT_ID = #{receiptResultId}
-      </if>
-      <if test="otherPhoto1 != null and otherPhoto1 != ''">
-        and OTHER_PHOTO1 LIKE '%${otherPhoto1}%'
-      </if>
-      <if test="otherPhoto2 != null and otherPhoto2 != ''">
-        and OTHER_PHOTO2 LIKE '%${otherPhoto2}%'
-      </if>
-      <if test="otherPhoto3 != null and otherPhoto3 != ''">
-        and OTHER_PHOTO3 LIKE '%${otherPhoto3}%'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from TMSTRUCK_RECEIPT_RESULT_CHILD
-    where CHILD_ID = #{childId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from TMSTRUCK_RECEIPT_RESULT_CHILD
-    where 1!=1
-    <if test="receiptResultId != null">
-      or RECEIPT_RESULT_ID = #{receiptResultId}
-    </if>
-    <if test="otherPhoto1 != null and otherPhoto1 != ''">
-      or OTHER_PHOTO1 = #{otherPhoto1}
-    </if>
-    <if test="otherPhoto2 != null and otherPhoto2 != ''">
-      or OTHER_PHOTO2 = #{otherPhoto2}
-    </if>
-    <if test="otherPhoto3 != null and otherPhoto3 != ''">
-      or OTHER_PHOTO3 = #{otherPhoto3}
-    </if>
-    <if test="insertUsername != null and insertUsername != ''">
-      or INSERT_USERNAME = #{insertUsername}
-    </if>
-    <if test="insertTime != null">
-      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-    </if>
-    <if test="updateUsername != null and updateUsername != ''">
-      or UPDATE_USERNAME = #{updateUsername}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.route.model.TmstruckReceiptResultChild">
-    insert into TMSTRUCK_RECEIPT_RESULT_CHILD (CHILD_ID, RECEIPT_RESULT_ID, OTHER_PHOTO1,
-                                               OTHER_PHOTO2, OTHER_PHOTO3, INSERT_USERNAME,
-                                               INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                               INSERT_UPDATE_REMARK)
-    values (#{childId,jdbcType=DECIMAL}, #{receiptResultId,jdbcType=DECIMAL}, #{otherPhoto1,jdbcType=VARCHAR},
-            #{otherPhoto2,jdbcType=VARCHAR}, #{otherPhoto3,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
-            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-            #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.route.model.TmstruckReceiptResultChild">
-    insert into TMSTRUCK_RECEIPT_RESULT_CHILD
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="childId != null">
-        CHILD_ID,
-      </if>
-      <if test="receiptResultId != null">
-        RECEIPT_RESULT_ID,
-      </if>
-      <if test="otherPhoto1 != null">
-        OTHER_PHOTO1,
-      </if>
-      <if test="otherPhoto2 != null">
-        OTHER_PHOTO2,
-      </if>
-      <if test="otherPhoto3 != null">
-        OTHER_PHOTO3,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="childId != null">
-        #{childId,jdbcType=DECIMAL},
-      </if>
-      <if test="receiptResultId != null">
-        #{receiptResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="otherPhoto1 != null">
-        #{otherPhoto1,jdbcType=VARCHAR},
-      </if>
-      <if test="otherPhoto2 != null">
-        #{otherPhoto2,jdbcType=VARCHAR},
-      </if>
-      <if test="otherPhoto3 != null">
-        #{otherPhoto3,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.route.model.TmstruckReceiptResultChild">
-    update TMSTRUCK_RECEIPT_RESULT_CHILD
-    set RECEIPT_RESULT_ID = #{receiptResultId,jdbcType=DECIMAL},
-        OTHER_PHOTO1 = #{otherPhoto1,jdbcType=VARCHAR},
-        OTHER_PHOTO2 = #{otherPhoto2,jdbcType=VARCHAR},
-        OTHER_PHOTO3 = #{otherPhoto3,jdbcType=VARCHAR},
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
-    where CHILD_ID = #{childId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.route.model.TmstruckReceiptResultChild">
-    update TMSTRUCK_RECEIPT_RESULT_CHILD
-    <set>
-      <if test="receiptResultId != null">
-        RECEIPT_RESULT_ID = #{receiptResultId,jdbcType=DECIMAL},
-      </if>
-      <if test="otherPhoto1 != null">
-        OTHER_PHOTO1 = #{otherPhoto1,jdbcType=VARCHAR},
-      </if>
-      <if test="otherPhoto2 != null">
-        OTHER_PHOTO2 = #{otherPhoto2,jdbcType=VARCHAR},
-      </if>
-      <if test="otherPhoto3 != null">
-        OTHER_PHOTO3 = #{otherPhoto3,jdbcType=VARCHAR},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where CHILD_ID = #{childId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where CHILD_ID = #{childId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into TMSTRUCK_RECEIPT_RESULT_CHILD
-    (CHILD_ID,
-    RECEIPT_RESULT_ID, OTHER_PHOTO1,
-    OTHER_PHOTO2, OTHER_PHOTO3, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK
-    )
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.childId,jdbcType=DECIMAL},
-    #{item.receiptResultId,jdbcType=DECIMAL}, #{item.otherPhoto1,jdbcType=VARCHAR},
-    #{item.otherPhoto2,jdbcType=VARCHAR}, #{item.otherPhoto3,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
-    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update TMSTRUCK_RECEIPT_RESULT_CHILD
-    set
-    CHILD_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.childId,jdbcType=DECIMAL}
-    </foreach>
-    ,RECEIPT_RESULT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.receiptResultId,jdbcType=DECIMAL}
-    </foreach>
-    ,OTHER_PHOTO1=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.otherPhoto1,jdbcType=VARCHAR}
-    </foreach>
-    ,OTHER_PHOTO2=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.otherPhoto2,jdbcType=VARCHAR}
-    </foreach>
-    ,OTHER_PHOTO3=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.otherPhoto3,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CHILD_ID" close="end">
-      when #{item.childId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    where CHILD_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.childId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from TMSTRUCK_RECEIPT_RESULT_CHILD
-    where CHILD_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-  <select id="selectMaxId"  resultType="java.math.BigDecimal">
-    select max(CHILD_ID) from TMSTRUCK_RECEIPT_RESULT_CHILD
-  </select>
-</mapper>