最新版本541200007

jiangping

2024-12-13 6ef74724e5da3271b77c8953df3c556439eed13d

最新版本541200007

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -141,9 +141,6 @@
    public static final String WMS_GET_INVENTORYLIST_URL ="WMS_GET_INVENTORYLIST_URL" ;
    public static final String WMS_OUTBOUND_PLATFROM_URL ="WMS_OUTBOUND_PLATFROM_URL" ;
    public static final String TSM_PARAM ="TSM_PARAM" ;
    public static final String TMS_ORDER_LIST_URL ="TMS_ORDER_LIST_URL" ;
    public static final String TMS_ORDER_DETAIL_URL ="TMS_ORDER_DETAIL_URL" ;
    public static final String TMS_LOCK_STATUS_URL ="TMS_LOCK_STATUS_URL" ;
    public static final String TMS_INTERFACE_URL_PREFIX ="TMS_INTERFACE_URL_PREFIX" ;
    public static final String MYSQL_BACKUP_CDOE ="MYSQL_BACKUP_CDOE" ;
    public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ;

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,181 @@
package com.doumee.core.tms.model;

import com.doumee.core.utils.Constants;
import org.apache.commons.lang3.StringUtils;

import java.util.List;

public class TMSContants {

    public interface InterfacePath {
        String[] getSevenArrivalStatus = new String[]{"/tms/zhyt/getSevenArrivalStatus",  "【TMS】近7日到货情况"};//TMS近7日到货情况接口地址
        String[] getCurrentTransportationTask = new String[]{ "【TMS】/zhyt/getCurrentTransportationTask",  "【TMS】当前运输任务"};//TMS当前运输任务接口地址
        String[] getDistributionOfDeliveryLocations = new String[]{"/tms/zhyt/getDistributionOfDeliveryLocations",  "【TMS】全国到货地分布查询查询"};//TMS全国到货地分布查询查询接口地址
        String[] getRealTimeInventory = new String[]{"/tms/zhyt/getRealTimeInventory",  "【TMS】实时库存查询"};//TMS实时库存查询接口地址
        String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound",  "【TMS】出入库记录查询"};//TMS出入库记录查询接口地址
        String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails",  "【TMS】在途明细列表"};//TMS在途明细列表接口地址
        String[] getOrderList = new String[]{"/tms/zhyt/getIntransitDetails",  "【TMS】合同列表查询"};//TMS合同列表查询接口地址
        String[] getElecByContractNumberList = new String[]{"/tms/zhyt/getElecByContractNumberList",  "【TMS】合同上锁状态"};//TMS合同上锁状态接口地址
        String[] getOrderDetailByContractNumber = new String[]{"/tms/zhyt/getOrderDetailByContractNumber",  "【TMS】合同详情"};//TMS合同详情接口地址
        String[] getGis = new String[]{"/tms/zhyt/getGis",  "【TMS】根据运输单号查询gis轨"};//TMS根据运输单号查询gis轨接口地址
        String[] getOrderStatusByContractNumber = new String[]{";//",  "【TMS】单生命周期"};//3.8订单生命周期
    }

    public  enum TopStatusLevel {
        /**
         * è®¢å•ç”Ÿæˆ
         * è¿å•é…è½½ä¸­
         * ä»“库出库中
         * è½¦è¾†è¿è¾“中
         * å·²åˆ°è´§
         * å·²å…¥åº“
         */
        ddsc(0,"订单生成",new Integer[]{ChildStatusLevel.create.getKey()}),
        ydpzz (1,"运单配载中",new Integer[]{ChildStatusLevel.ysdxc.getKey()
                ,ChildStatusLevel.ysdcx.getKey()
                ,ChildStatusLevel.shtg.getKey()
                ,ChildStatusLevel.shwtg.getKey()
                ,ChildStatusLevel.ysdcx.getKey()}),
        ckckz (2,"仓库出库中",new Integer[]{ChildStatusLevel.ddzhddzs.getKey()
                ,ChildStatusLevel.clqddzs.getKey()}),
        clysz(3, "车辆运输中",new Integer[]{ChildStatusLevel.clqdapp.getKey()}),
        ydh(4,"已到货",new Integer[]{ChildStatusLevel.ddzhd.getKey()}),
        yrk (5,"已入库",new Integer[]{ChildStatusLevel.ddxhd.getKey()});

        // æˆå‘˜å˜é‡
        private int key;
        private  Integer[] chileIndexList  ;
        private String name;

        // æž„造方法
        TopStatusLevel(int key, String name,  Integer[] chileIndexList) {
            this.key = key;
            this.chileIndexList = chileIndexList;
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public Integer[] getChileIndexList() {
            return chileIndexList;
        }

        public void setChileIndexList(Integer[] chileIndexList) {
            this.chileIndexList = chileIndexList;
        }
    }
    public  enum ChildStatusLevel {
        /**
         è®¢å•ç”Ÿæˆï¼ˆå‘货仓库联系电话：0551-63451234）    0    è®¢å•ç”Ÿæˆï¼ˆå‘货仓库联系电话：0551-63451234）

         è¿è¾“单形成    1    è¿è¾“单形成
         è¿è¾“单撤销（原因：XXX）    -2    è¿è¾“单撤销（原因：XXX）
         è¿è¾“单审核未通过    -1    è¿è¾“单审核未通过
         è¿è¾“单审核通过    2    è¿è¾“单审核通过
         è¿è¾“单确认        è¿è¾“单确认
         åˆ°è¾¾è£…货地-电子锁汽运    3    è½¦è¾†å·²åˆ°è¾¾è£…货地
         è½¦è¾†å¯è¿-电子锁汽运    4    è½¦è¾†è£…货完成，电子锁已上锁
         è½¦è¾†å¯è¿-APP    4    è½¦è¾†è¿è¾“中
         åˆ°è¾¾å¸è´§åœ°-APP    5    è½¦è¾†å·²åˆ°è¾¾å¸è´§åœ°
         åˆ°è¾¾å¸è´§åœ°-电子锁汽运    5    ç”µå­é”å·²è§£é”ï¼Œè¿è¾“任务已完成
         */
        create(0,0, 0,"订单生成",null),
        ysdxc(1,1,1, "运输单形成",null),
        ysdcx(2, -2,1,"运输单撤销",null ),
        shtg(3,-1, 1,"运输单审核未通过",null ),
        shwtg(4, 2,1,"运输单审核通过",null),
        ysdqr(5,6, 1,"运输单确认",null ),
        ddzhddzs(6,3,2,"到达装货地-电子锁汽运","车辆已到达装货地" ),
        clqddzs(7, null,2,"车辆启运-电子锁汽运","车辆装货完成，电子锁已上锁" ),
        clqdapp(8, 4,3,"车辆启运-APP","车辆运输中" ),
        ddzhd(9, 5,4,"到达卸货地-APP","车辆已到达卸货地" ),
        ddxhd(10, 5,5,"到达卸货地-电子锁汽运","电子锁已解锁，运输任务已完成" ),
        ;

        // æˆå‘˜å˜é‡
        private Integer key;
        private Integer orderStatus;
        private Integer parentIndex;
        private String name;
        private String info;

        // æž„造方法
        ChildStatusLevel(Integer key,Integer orderStatus,Integer parentIndex, String name,String info ) {
            this.key = key;
            this.info = info;
            this.name = name;
            this.orderStatus = orderStatus;
            this.parentIndex = parentIndex;
        }
        public static Integer getParentIndexByStatus(int orderStatus) {
            for (ChildStatusLevel c : ChildStatusLevel.values()) {
                if (c.getOrderStatus() == orderStatus) {
                    return c.parentIndex;
                }
            }
            return null;
        }
        public static String getInfo(int key,String defualt) {
            for (ChildStatusLevel c : ChildStatusLevel.values()) {
                if (c.getKey() == key) {
                    return StringUtils.defaultString(c.getInfo(),StringUtils.defaultString(defualt,c.getName()));
                }
            }
            return null;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public String getInfo() {
            return info;
        }

        public void setInfo(String info) {
            this.info = info;
        }

        public int getOrderStatus() {
            return orderStatus;
        }

        public void setOrderStatus(int orderStatus) {
            this.orderStatus = orderStatus;
        }

        public int getParentIndex() {
            return parentIndex;
        }

        public void setParentIndex(int parentIndex) {
            this.parentIndex = parentIndex;
        }
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms合同号查询订单生命周期请求参数")
public class TmsCircleStatusListRequest {

    private String contractNumber    ;//是 åˆåŒå·

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms查询GIS集合请求参数")
public class TmsGisListRequest {

    private String transportCode;//    å­—符串    è¿è¾“单号

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms根据合同号查询订单生命周期返回参数")
public class TmsCircleStatusListResponse {
   /**
    */

   private String  recordDate    ;//字符串    çŠ¶æ€è®°å½•æ—¶é—´
   private String   orderStatus    ;//字符串    è®¢å•çŠ¶æ€ç 
   private String orderStatusDes    ;//字符串    è®¢å•çŠ¶æ€æè¿°

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms根据合同号查询订单生命周期返回参数")
public class TmsCircleStatusResultListResponse {
   /**
    */

   private Integer  key    ;//字符串    çŠ¶æ€è®°å½•æ—¶é—´
   private String   name    ;//字符串    è®¢å•çŠ¶æ€ç 
   private List<TmsCircleStatusListResponse> secondList    ;//二級数据集合

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms查询GIS返回参数")
public class TmsGisListResponse {
   /**
    */

   private List<TmsGisStartEndInfoResponse> startAndEndPoint;//集合    èµ·ç‚¹ç»ˆç‚¹ä¿¡æ¯
   private List<TmsGisStatusInfoResponse>  gisList    ;//集合    è®¢å•çŠ¶æ€ç 

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms查询GIS èµ·ç‚¹ç»ˆç‚¹ä¿¡æ¯è¿”回参数")
public class TmsGisStartEndInfoResponse {
   /**
    */

   private String startRepertotyName;//    å­—符串    èµ·ç‚¹åç§°
   private String   endRepertotyName;//    å­—符串    ç»ˆç‚¹åç§°
   private String    startLon    ;//字符串    èµ·ç‚¹ç»åº¦
   private String  startLat;//    å­—符串    èµ·ç‚¹çº¬åº¦
   private String endLon    ;//字符串    ç»ˆç‚¹ç»åº¦
   private String  endLat    ;//字符串    ç»ˆç‚¹çº¬åº¦
   private String  plateNumber;//    å­—符串    è½¦ç‰Œå·

   private String   id;//1698530035827830786,
   private String          transportCode;//18451,
   private String          startRepertotyCode;//02001,
   private String         endRepertotyCode;//1134030101,
   private String          volume;//70,
   private String          loadPercent;//0.5385,
   private String         stopNumbers;//0,
   private String           transportDate;//2023-09-04 10:54:52,
   private String          transportMethod;//4,
   private String          generateType;//1,

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms查询GIS è®¢å•çŠ¶æ€ç è¿”回参数")
public class TmsGisStatusInfoResponse {
   /**
    */

   private String startRepertotyName;//    å­—符串    èµ·ç‚¹åç§°
   private String   endRepertotyName;//    å­—符串    ç»ˆç‚¹åç§°
   private String    startLon    ;//字符串    èµ·ç‚¹ç»åº¦
   private String  startLat;//    å­—符串    èµ·ç‚¹çº¬åº¦
   private String endLon    ;//字符串    ç»ˆç‚¹ç»åº¦
   private String  endLat    ;//字符串    ç»ˆç‚¹çº¬åº¦
   private String  plateNumber;//    å­—符串    è½¦ç‰Œå·

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
@@ -10,26 +12,7 @@
@Data
@ApiModel("tms合同详情返回参数")
public class TmsOrderInfoResponse {
    /**
     {
         "code": 0,
         "data": {
             "contractNumber": "112718591",
             "ncCreateDate": "2024-06-20 09:08:01",
             "deliveryEnterprise": "蚌埠成品库",
             "receiveEnterprise": "宿州市卷烟配送中心",
             "transportCode": "39828",
             "transportDate": "2024-06-20 09:04:46.0",
             "driverName": "王付兰",
             "driverTel": "19955211695",
             "plateName": "皖CC2585",
             "orderStatus": "5",
             "orderStatusDesc": "到达卸货地-电子锁汽运"
         },
         "message": "操作成功"
     }
     */
 

    private String   contractNumber    ; //合同号
    private String   deliveryEnterprise    ; //发货地
    private String    receiveEnterprise    ; //到货地
@@ -42,5 +25,11 @@
    private String   driverTel; //
    private String   orderStatusDesc; //
    private String    plateName; //": "皖CC2585",
    private String    deliveryLon    ; //    å‘货仓库经度
    private String    deliveryLat    ; //    å‘货仓库纬度
    private String    receiveLon    ; //    å¸è´§ä»“库经度
    private String   receiveLat; //        å¸è´§ä»“库纬度

    List<TmsCircleStatusResultListResponse> cicleStatusList;//生命周期数据
    List<TmsGisListResponse> gisList;//经纬度集合
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -1174,7 +1174,7 @@
        3) è‡ªæ¥æ°´äºŒæ°§åŒ–碳排放量(kg)=自来水使用量(m3)×0.91；*/
        data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
                .add(carbonGas.multiply(new BigDecimal(0.19)))
                .add(carbonWater.multiply(new BigDecimal(0.91)))));
                .add(carbonWater.multiply(new BigDecimal(0.91)))).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP));
        return data;

    }
@@ -1258,8 +1258,21 @@
            data.setRingPercent("0");
            data.setSecondRegionDataList(new ArrayList<>());
        }
        return data;
        if(data.getSecondRegionDataList()!=null && data.getSecondRegionDataList().size()>1){
            int index =-1;
            for (int i = 0; i <data.getSecondRegionDataList().size() ; i++) {
                RegionTopPowerResponse t=data.getSecondRegionDataList().get(i);
                if(Constants.formatBigdecimal(t.getPercent()).compareTo(new BigDecimal(1)) == 0){
                    index =i;
                    break;
                }
            }
            if(index>-1){
                data.getSecondRegionDataList().remove(index);//删除根节点数据
            }
        }

        return  data;
    }
    /**
     * è¿‘12个水电气油耗数据统计

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java

@@ -5,13 +5,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
import com.doumee.core.tms.model.response.TmsBaseResponse;
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wms.model.request.*;
@@ -25,6 +21,7 @@
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,11 +69,109 @@
    @Override
    public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param){
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_LOCK_STATUS_URL).getCode();
                + TMSContants.InterfacePath.getElecByContractNumberList[0];

        TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"【TMS】电子锁上锁时间接口",JSONObject.toJSONString(param)
        TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getElecByContractNumberList[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){});
        return  response;
    }

    /**
     * è¿è¾“单gis轨迹
     * æ ¹æ®åŒºåŸŸID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示；
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    @Override
    public   List<TmsGisListResponse>  gisList(TmsGisListRequest param){

       if(param.getTransportCode()==null  ){
          return  new ArrayList<>();
       }
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getGis[0];
        TmsBaseResponse<List<TmsGisListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getGis[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<List<TmsGisListResponse>>>(){});
        if(response ==null){
            return  new ArrayList<>();
        }else{
            return response.getData()==null?new ArrayList<>():response.getData();
        }
    }
    /**
     * è®¢å•ç”Ÿå‘½å‘¨æœŸ
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    @Override
    public   List<TmsCircleStatusResultListResponse>  getCicleStatusList(TmsCircleStatusListRequest param){
        List<TmsCircleStatusResultListResponse> list =new ArrayList<>();
       if(param.getContractNumber()==null  ){
          return  new ArrayList<>();
       }
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getOrderStatusByContractNumber[0];
        TmsBaseResponse<List<TmsCircleStatusListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderStatusByContractNumber[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<List<TmsCircleStatusListResponse>>>(){});

        if(response ==null){
            return  new ArrayList<>();
        }else{
            /**
             *  ddsc(0,"订单生成",new Integer[]{ChildStatusLevel.create.getKey()}),
             *         ydpzz (1,"运单配载中",new Integer[]{ChildStatusLevel.ysdxc.getKey()
             *                 ,ChildStatusLevel.ysdcx.getKey()
             *                 ,ChildStatusLevel.shtg.getKey()
             *                 ,ChildStatusLevel.shwtg.getKey()
             *                 ,ChildStatusLevel.ysdcx.getKey()}),
             *         ckckz (2,"仓库出库中",new Integer[]{ChildStatusLevel.ddzhddzs.getKey()
             *                 ,ChildStatusLevel.clqddzs.getKey()}),
             *         clysz(3, "车辆运输中",new Integer[]{ChildStatusLevel.clqdapp.getKey()}),
             *         ydh(4,"已到货",new Integer[]{ChildStatusLevel.ddzhd.getKey()}),
             *         yrk
             */
            for (int i = 0; i < 6; i++) {
                TmsCircleStatusResultListResponse t = new TmsCircleStatusResultListResponse();
                TMSContants.TopStatusLevel tem = TMSContants.TopStatusLevel.ddsc;
                if(i == 0){
                    tem=TMSContants.TopStatusLevel.ddsc;
                } if(i == 1){
                    tem=TMSContants.TopStatusLevel.ydpzz;
                } if(i == 2){
                    tem=TMSContants.TopStatusLevel.ckckz;
                } if(i == 3){
                    tem=TMSContants.TopStatusLevel.clysz;
                } if(i == 4){
                    tem=TMSContants.TopStatusLevel.ydh;
                } if(i == 5){
                    tem=TMSContants.TopStatusLevel.yrk;
                }
                t.setName(tem.getName());
                t.setKey(tem.getKey());
                t.setSecondList(getSecondCircleStatusList(tem,response.getData()));
                list.add(t);
            }
        }

        return list;
    }

    private List<TmsCircleStatusListResponse> getSecondCircleStatusList(TMSContants.TopStatusLevel tem, List<TmsCircleStatusListResponse> data) {
        if(data ==null ||data.size()==0){
            return  new ArrayList<>();
        }
        List<TmsCircleStatusListResponse> list = new ArrayList<>();
        Integer[] statusList = tem.getChileIndexList();
        if(statusList!=null){
            for(Integer t :statusList){
                for(TmsCircleStatusListResponse status :data){
                    if(StringUtils.equals(status.getOrderStatus(),t.toString())){
                        list.add(status);
                    }
                }
            }
        }
        return list;
    }

    /**
@@ -94,8 +189,8 @@
           param.setContractNumbers(null);
       }
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_LIST_URL).getCode();
        TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"【TMS】合同列表接口",JSONObject.toJSONString(param)
                    +TMSContants.InterfacePath.getOrderList[0];
        TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
        if(response ==null){
            return  new ArrayList<>();
@@ -110,15 +205,26 @@
     */
    @Override
    public  TmsOrderInfoResponse orderInfo(TmsOrderInfoRequest param){
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_DETAIL_URL).getCode();
        TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,"【TMS】合同详情接口",JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
        if(response ==null){
            return new TmsOrderInfoResponse();
        }else{
            return response.getData()==null?new TmsOrderInfoResponse():response.getData();
        TmsOrderInfoResponse result = new TmsOrderInfoResponse();
        if(StringUtils.isBlank(param.getContractNumber())){
            return  result;
        }
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getOrderDetailByContractNumber[0];
        TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
        if(response!=null && response.getData()!=null){
              result =response.getData();
        }
        if(result.getTransportCode()!=null){
            TmsGisListRequest p = new TmsGisListRequest();
            p.setTransportCode(result.getTransportCode());
            result.setGisList(gisList(p));
        }
        TmsCircleStatusListRequest p1 = new TmsCircleStatusListRequest();
        p1.setContractNumber(param.getContractNumber());
        result.setCicleStatusList(getCicleStatusList(p1));
        return result;
    }

    /**

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java

@@ -1,12 +1,7 @@
package com.doumee.service.business.third;

import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
import com.doumee.core.tms.model.response.TmsBaseResponse;
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
import com.doumee.core.tms.model.response.TmsOrderListResponse;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
import com.doumee.core.wms.model.request.WmsBaseRequest;
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
@@ -40,7 +35,8 @@
     * @return TmsBaseResponse
     */
    List<TmsOrderListResponse> orderList(TmsOrderListRequest param);

    List<TmsGisListResponse>  gisList(TmsGisListRequest param);
    List<TmsCircleStatusResultListResponse>  getCicleStatusList(TmsCircleStatusListRequest param);
    /**
     * åˆåŒè¯¦æƒ…接口
     * @param param å‚æ•°