luobang 2 jaren geleden
bovenliggende
commit
ec37441e61

+ 1 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -246,6 +246,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 //更新路段顺序号
                 mesMap.put("orderLineSequence", sqe);
                 utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+
                 //推送消息到websocket
                 utilsService.pushMesToWebsocket(capacityNumber, "装货");
             }else {

+ 25 - 1
src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -5,11 +5,14 @@ import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.TmstruckUnloadResult;
 import com.steerinfo.dil.service.ITmstruckUnloadResultService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.HTTPRequestUtils;
+import org.apache.http.ParseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.xml.crypto.Data;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -163,7 +166,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         //卸货时查询是否含有净重
         BigDecimal totalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);
-
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //判断是不是内转
         if(orderType == 11 || orderType == 15 || orderType == 16 || orderType == 25){
@@ -214,6 +216,15 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                  map.put("inwardTypes",3);
                  tmstruckTimeTaskResultService.addTimeTaskResult(map);
             }
+            //
+            try {
+                String url = "https://jl.dasteel.cn:44326/api/logistics/LoadAndUnloadFlag?orderNumber=" + orderNumber;
+                HTTPRequestUtils.sendGet(url,"utf-8");
+            } catch (ParseException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
             return 1;
         }
         //如果是零星多拼订单 需要查询这个物资是否已经卸过了
@@ -268,6 +279,14 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 break;
         }
         //卸货成功后推送消息给websocket
+        try {
+            String url = "https://jl.dasteel.cn:44326/api/logistics/LoadAndUnloadFlag?orderNumber=" + orderNumber;
+            HTTPRequestUtils.sendGet(url,"utf-8");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
         return 1;
     }
@@ -430,5 +449,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         return i;
     }
 
+    public int toSendUnloadFlagToJl(String orderNumber) {
+
+        return 1;
+    }
+
 
 }

+ 37 - 0
src/main/java/com/steerinfo/dil/util/HTTPRequestUtils.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;
 import org.apache.http.ParseException;
 import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -129,5 +130,41 @@ public class HTTPRequestUtils {
 
     }
 
+    public static String sendGet(String url, String encoding) throws ParseException, IOException {
+        String body = "";
+        //创建httpclient对象
+        CloseableHttpClient client = HttpClients.createDefault();
+        //创建post方式请求对象
+        HttpGet httpGet = new HttpGet(url);
+        //装填参数
+        //StringEntity s = new StringEntity(json.toString(), "utf-8");
+        //s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,"application/json"));
+        //设置参数到请求对象中
+        //httpGet.setEntity(s);
+        System.out.println("请求地址:" + url);
+        //System.out.println(json);
+//        System.out.println("请求参数:"+nvps.toString());
+        //设置header信息
+        //指定报文头【Content-type】、【User-Agent】
+//        httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
+        httpGet.setHeader("Content-type", "application/json");
+        httpGet.setHeader("-UserAgent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+
+        //执行请求操作,并拿到结果(同步阻塞)
+        CloseableHttpResponse response = client.execute(httpGet);
+        System.out.println(response);
+        //获取结果实体
+        HttpEntity entity = response.getEntity();
+        System.out.println(entity);
+        if (entity != null) {
+            //按指定编码转换结果实体为String类型
+            body = EntityUtils.toString(entity, encoding);
+        }
+        EntityUtils.consume(entity);
+        //释放链接
+        response.close();
+        return body;
+    }
+
 
 }

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -214,7 +214,7 @@
             on TTR.ORDER_ID = OO.ORDER_ID
         left join RMS_CAPACITY RC
             on OO.CAPACITY_ID = RC.CAPACITY_ID
-        where  OO.order_Number=#{orderNumber} AND OO.ORDER_STATUS=5
+        where  OO.order_Number=#{orderNumber}
     </select>
 
     <select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">