!56 V1.25.0bug修复

Merge pull request !56 from 山东云则/hotfix_poster

yunze-apiCommon/src/main/java/com/yunze/apiCommon/mapper/YzCardRouteMapper.java

@@ -217,8 +217,8 @@ public interface YzCardRouteMapper {
     public List<Map<String, Object>> countId(Map map);
 
     /*
-    * 通道 id 修改 卡总数
-    */
+     * 通道 id 修改 卡总数
+     */
     public Integer upCount(Map map);
 
     /**
@@ -253,6 +253,31 @@ public interface YzCardRouteMapper {
      */
     public int updateKey(Map map);
 
+    public int updImei(Map map);
+
+
+
+    /**
+     * 修改短信发送状态
+     * @param map
+     * @return
+     */
+    public int updbusiCardSms(Map map);
+
+    /**
+     * 新增短信收发记录
+     * @param map
+     * @return
+     */
+    public int addbusiCardSms(Map map);
+
+
+    /**
+     * 查询短信编号是否存
+     * @param map
+     * @return
+     */
+    public Integer isbusiCardSms(Map map);
 
 
 }

yunze-apiCommon/src/main/resources/mapper/yunze/YzCardRouteMapper.xml

@@ -199,7 +199,8 @@
         b.sms_shared_secret,
         b.sms_code,
         a.sms_number,
-        b.sms_src_TerminalId
+        b.sms_src_TerminalId,
+        DATE_FORMAT( a.firstUseTime, "%Y-%m-%d %H:%i:%S"  ) AS firstUseTime
         FROM
         yz_card_route b,
         yz_card_info a
@@ -967,4 +968,4 @@
             )
     </insert>
 
-</mapper>
+</mapper>

yunze-iotapi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>yunze</artifactId>
         <groupId>com.yunze</groupId>
-        <version>0.8.0</version>
+        <version>1.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -161,4 +161,4 @@
     </build>
 
 
-</project>
+</project>

yunze-iotapi/src/main/java/com/yunze/iotapi/controller/Sms.java

@@ -2,7 +2,7 @@ package com.yunze.iotapi.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.yunze.apiCommon.mapper.mysql.YzCardRouteMapper;
+import com.yunze.apiCommon.mapper.YzCardRouteMapper;
 import com.yunze.iotapi.utils.ResponseJson;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;