tijiao

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

@@ -42,7 +42,7 @@ public class TmstruckSmsRusultController extends BaseRESTfulController{
     ColumnDataUtil columnDataUtil;
     @ApiOperation(value = "新增短信实绩", notes = "通过人工稽核判断点击新增短信实绩")
     @PostMapping(value = "/insertSmsResult")//BigDecimal
-    public RESTfulResult insertSmsResult(@RequestBody(required = false) Map<String, Object> map) {
+    public RESTfulResult insertSmsResult(@RequestBody(required = false) Map<String, Object> map) throws Exception {
         int i = tmstruckSmsRusultService.addSmsResult(map);
         return success(i);
     }

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

@@ -22,7 +22,7 @@ import java.util.Map;
  */
 public interface ITmstruckSmsRusultService extends IBaseService<TmstruckSmsRusult, BigDecimal>{
   //新增短信
- int addSmsResult(Map<String ,Object> map);
+ int addSmsResult(Map<String ,Object> map) throws Exception;
  //查询短信实绩
  List<Map<String,Object>> getSmsResult(Map<String,Object> map);
 }

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

@@ -244,7 +244,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
                 //查询是否为一车多趟采购订单类型
-                Integer isMoreTripsStatus = tmstruckLeaveFactoryResultMapper.getIsMoreTripsStatus(DataChange.dataToBigDecimal(selectMap.get("orderId")));
+                Integer isMoreTripsStatus = tmstruckLeaveFactoryResultMapper.getIsMoreTripsStatus(DataChange.dataToBigDecimal(map.get("orderId")));
                 if(isMoreTripsStatus != null && isMoreTripsStatus == 1){
                     //如果是一车多趟 则重新下一个运输订单
                     omsFeign.addNewTransportOrder(orderId.intValue());

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

@@ -1,18 +1,26 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
 import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckSmsRusultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckSmsRusult;
 import com.steerinfo.dil.service.ITmstruckSmsRusultService;
+import com.steerinfo.dil.util.HTTPRequestUtils;
 import com.steerinfo.dil.util.MD5Util;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import okio.Utf8;
+import org.apache.http.ParseException;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -41,8 +49,7 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
     private UtilsMapper utilsMapper;
     @Autowired
     JoinFeign joinFeign;
-//    @Autowired
-//    private OmstruckOrderMapper omstruckOrderMapper;
+
 
     @Override
     protected IBaseMapper<TmstruckSmsRusult, BigDecimal> getMapper() {
@@ -55,10 +62,8 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
      * @return
      */
     @Override
-    public int addSmsResult(Map<String,Object> map) {
-        //获取用户名
-//        Integer personnelId=(Integer) map.get("personnelId");
-//        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
+    public int addSmsResult(Map<String,Object> map) throws Exception {
+
         //获取订单号
         String orderNumber = map.get("orderNumber").toString();
         //新增短信实绩
@@ -67,44 +72,40 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
         //新增总实绩id
         BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderNumber(orderNumber);
         tmstruckSmsRusult.setTotalResultId(resultTotalId);
-        Integer shipperId = tmstruckSmsRusultMapper.selectShipperIdByOrderNumber(orderNumber);
-        //设置发送方id
-        tmstruckSmsRusult.setSenderId(new BigDecimal(shipperId));
-        //通过发送方ID查询appId和秘钥
-        Map<String,Object>map5=tmstruckSmsRusultMapper.selectIdApp(new BigDecimal(shipperId));
-        String AppId= (String) map5.get("AppId");
-        String secretKey=(String) map5.get("secretKey");
-
         tmstruckSmsRusult.setResultSendingTime(new Date());
-        //根据运输订单号查找司机电话号码
-        String driverPhone=tmstruckSmsRusultMapper.selectCarDriverByOrderNumber(orderNumber);
-        String content="您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流";
-        tmstruckSmsRusult.setResultSmsContent("您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流");
-
         //新增短信实绩
         tmstruckSmsRusult.setInsertTime(new Date());
-        //调用接口发送短信
-        Map<String, Object> map2 = new HashMap<>();
-        String timestamp=String.valueOf(new Date().getTime());
-        String sign=AppId+secretKey+timestamp;
-        try {
-            String signMd5=MD5Util.md5Encode(sign);
-            map2.put("sign",signMd5);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-      	map2.put("AppId",AppId);
-        map2.put("timestamp",timestamp);
-        map2.put("content",content);
-        map2.put("mobiles",driverPhone);
-        if (joinFeign.push(map2)){
-            int i=tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
-            return i;
-        }
-        else return 0;
+        tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
+        return 1;
+
 
 
+    }
 
+    public int generaSendMessage(String mobile,String capacityNum) throws Exception {
+        String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-10QNI&";
+        String tmpTmp = MD5Util.formatTimeTmp();
+        String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
+        String mobile1 = mobile;
+        String content = "【达州钢铁】您好，您在达钢购买的钢材已发车，司机车牌号:" + capacityNum + "。退订";
+        String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
+        String jsonData = null;
+        JSONObject jsonObject = new JSONObject();
+        jsonData = HTTPRequestUtils.send(sendUrl,jsonObject,"utf-8");
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("code"));
+            if("SUCCESS".equals(code)){
+                return 1;
+            }else{
+                return 0;
+            }
+        }else{
+            System.out.println("短信发送失败：" + jsonData);
+            return 0;
+        }
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.util;
 
+import sun.applet.Main;
+
 import java.security.MessageDigest;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -59,8 +61,12 @@ import java.util.SimpleTimeZone;
          */
         public static void main(String[] args) throws Exception {
             String str = "123456";
-            System.out.println(MD5Util.md5Encode(str));
+            String ApiId = "EUCP-EMY-SMS1-10QNI";
+            String sererct = "EE20B0B28B75E567";
+            System.out.println(formatTimeTmp());
+            System.out.println(sign(ApiId,sererct));
         }
 
+
     }