bug修复

adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.java

@@ -45,7 +45,7 @@ public class DeviceController extends BaseController<Device> {
         }
     }
 
-    @GetMapping("/ ")
+    @GetMapping("/getListByPhoneNumber")
     public ResponseEntity<List<Device>> getListByPhoneNumber(String phoneNumber) {
         List<Device> list = deviceService.listByPhoneNumber(phoneNumber);
         return GenResponse.success("1", "查询成功", list);

adc-da-main/src/main/java/com/adc/da/znks/util/AppPushUtils.java

@@ -75,4 +75,12 @@ public class AppPushUtils {
         return template;
     }
 
+    public static void main(String[] args) {
+        try {
+            push("提示", "测试推送", "59f02635c46d1b6d047fa051ad5db9fc");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
 }

adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml

@@ -11,7 +11,7 @@
         <result column="user_password" property="userPassword"/>
         <result column="uid" property="uid"/>
     </resultMap>
-    <select id="listByPhoneNumber" resultType="com.adc.da.znks.entity.Device">
+    <select id="listByPhoneNumber" resultMap="BaseResultMap">
         select * from tb_device,tb_user
         where tb_device.user_id = tb_user.id
         and tb_user.temphone = #{phoneNumber}
@@ -28,6 +28,7 @@
             <if test="userName != null">user_name,</if>
             <if test="userPassword != null">user_password,</if>
             <if test="uid != null">uid,</if>
+            <if test="userId != null">user_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id, jdbcType=VARCHAR},</if>
@@ -37,6 +38,7 @@
             <if test="userName != null">#{userName, jdbcType=VARCHAR},</if>
             <if test="userPassword != null">#{userPassword, jdbcType=VARCHAR},</if>
             <if test="uid != null">#{uid, jdbcType=VARCHAR},</if>
+            <if test="userId != null">#{userId, jdbcType=VARCHAR},</if>
         </trim>
     </insert>