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

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

@@ -141,4 +141,11 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         return success(mapList);
     }
 
+    @ApiOperation(value="更新进厂实绩")
+    @PostMapping("/updateEnSge")
+    public int updateEnSge() {
+        int i = tmstruckEnfactoryResultService.updateEnSge();
+        return i;
+    }
+
 }

src/main/java/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.java

@@ -70,4 +70,7 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     //辅料查询 有几次进厂 并进了几次厂
     Integer selectEnFactoryNumber(BigDecimal resultTotalId);
     Integer selectAllEnFactoryNum(BigDecimal resultTotalId);
+
+    List<Map<String, Object>> getEnResult();
+
 }

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

@@ -40,4 +40,7 @@ public interface ITmstruckEnfactoryResultService{
     List<Map<String, Object>> getEnfactoryResultList();
     // APP通过运输订单id查询进厂实绩
     List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber);
+
+    int updateEnSge();
+
 }

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

@@ -74,6 +74,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostId));
         // 添加路段顺序号
         tmstruckEnfactoryResult.setSegmenSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
+        System.out.println(DataChange.dataToBigDecimal(map.get("segmentSqe")));
         return tmstruckEnfactoryResultMapper.insertSelective(tmstruckEnfactoryResult);
     }
 
@@ -176,6 +177,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         }
         map.putAll(mesMap);
         map.putAll(selectMap);
+        map.remove("Sqe");
         //判断委托是否发送成功
         int checkMeasureCommission = 0;
         switch (orderType){
@@ -347,6 +349,21 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         return tmstruckEnfactoryResultMapper.getEnfactoryMessageByOrderId(orderNumber);
     }
 
+    @Override
+    public int updateEnSge() {
+        List<Map<String,Object>>maplist = tmstruckEnfactoryResultMapper.getEnResult();
+        int i = 0;
+        for (Map<String,Object>map:maplist
+             ) {
+            BigDecimal resultId = DataChange.dataToBigDecimal(map.get("resultId"));
+            TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
+            tmstruckEnfactoryResult.setResultId(resultId);
+            tmstruckEnfactoryResult.setSegmenSqe(new BigDecimal(6));
+            i = tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
+        }
+        return i;
+    }
+
     /**
      * 生成进厂实绩
      * @param map

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

@@ -202,6 +202,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         }
         map.putAll(mesMap);
         map.putAll(selectMap);
+        map.remove("Sqe");
         map.put("orderNumber", orderNumber);
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩

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

@@ -55,6 +55,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderId(orderId);
         tmstruckSmsRusult.setTotalResultId(resultTotalId);
         tmstruckSmsRusult.setResultSendingTime(new Date());
+        tmstruckSmsRusult.setResultSmsContent("【达州钢铁】您好!您在达钢购买的钢材已发车.欲知详情，请前往https://wl.dasteel.cn:32322/views/#/地址，浏览车辆实时运输状态。退订");
         //新增短信实绩
         tmstruckSmsRusult.setInsertTime(new Date());
         tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
@@ -66,7 +67,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String tmpTmp = MD5Util.formatTimeTmp();
         String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
         String mobile1 = mobile;
-        String content = "【达州钢铁】您好，您在达钢购买的钢材已发车，司机车牌号:" + capacityNum + "。退订";
+        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车.欲知详情，请前往https://wl.dasteel.cn:32322/views/#/地址，浏览车辆实时运输状态。退订";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();

src/main/java/com/steerinfo/dil/util/MD5Util.java

@@ -66,6 +66,5 @@ import java.util.SimpleTimeZone;
             System.out.println(sign(ApiId,sererct));
         }
 
-
     }
 

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

@@ -75,6 +75,7 @@ public class ZhongJiaoXingLu {
 
             // 通过 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();
@@ -150,6 +151,7 @@ public class ZhongJiaoXingLu {
 
             // 通过 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();
@@ -184,6 +186,7 @@ public class ZhongJiaoXingLu {
 
             // 通过 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();
@@ -206,6 +209,7 @@ public class ZhongJiaoXingLu {
             DataExchangeService des = new DataExchangeService(5000, 8000);
             // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
             String res = des.postHttps(url, map);
+            System.out.println("login"+res);
             JSONObject jsonObject = JSONObject.parseObject(res);
             this.token=jsonObject.get("result").toString();
             //System.out.println("返回:"+ res);

src/main/resources/application-dev.yml

@@ -20,8 +20,8 @@ spring:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  path: C:\Users\24390\Desktop\work\a
-#  path: /shared
+  #path: C:\Users\24390\Desktop\work\a
+  path: /shared
 
 #feign设置
 openfeign:

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

@@ -1473,5 +1473,15 @@
         where TER.RESULT_TOTAL_ID = #{resultTotalId}
         and TER.RESULT_ENTRY_GATE_TIME is null
     </select>
+    <select id="getEnResult" resultType="java.util.Map">
+        SELECT TER.RESULT_ID "resultId", TER.SEGMEN_SQE,TER.INSERT_TIME,oo.ORDER_TYPE
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_TYPE = 20
+        AND TER.SEGMEN_SQE = 5
+    </select>
 
 </mapper>

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

@@ -361,12 +361,16 @@
   </select>
 <!-- 查询短信实绩 -->
   <select id="selectSmsResult" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT  RS.SHIPPER_NAME "shipperName",
-            TSR.RESULT_SENDING_TIME "sendIngTime",
-            TSR.RESULT_SMS_CONTENT "content"
-    from TMSTRUCK_SMS_RUSULT TSR
-    left join RMS_SHIPPER RS
-    on TSR.SENDER_ID=RS.SHIPPER_ID
+    SELECT TSR.RESULT_SENDING_TIME "sendIngTime",
+           TSR.RESULT_SMS_CONTENT  "content",
+           rc.capacity_number      "capacityNo"
+    FROM TMSTRUCK_SMS_RUSULT TSR
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                     ON TTR.RESULT_TOTAL_ID = TSR.TOTAL_RESULT_ID
+           left join omstruck_order oo
+                     on oo.order_id = ttr.order_id
+           left join rms_capacity rc
+                     on rc.capacity_id = oo.capacity_id
   </select>
     <select id="selectIdApp" resultType="java.util.Map">
       select rs.SHIPPER_APPID "AppId",