id自增长问题修改，bug修改

src/main/java/com/glxp/udidl/admin/controller/device/DownloadDeviceHelper.java

@@ -54,6 +54,7 @@ public class DownloadDeviceHelper {
         TokenRequest tokenRequest = new TokenRequest();
         tokenRequest.setAppId(appId);
         tokenRequest.setAppSecret(appSecret);
+        tokenRequest.setTyshxydm(companyEntity.getTyshxydm());
         String response = HttpClient.post("token/get", tokenRequest);
         TokenEntity tokenEntity = (TokenEntity) JSONObject.parseObject(response, TokenEntity.class);
         return tokenEntity;

src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java

@@ -1,6 +1,7 @@
 package com.glxp.udidl.admin.service.dataSync;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.glxp.udidl.admin.entity.info.CompanyEntity;
@@ -46,6 +47,7 @@ public class DeviceDownloadService {
 
     CompanyEntity companyEntity;
 
+
     String url = "sharing/get";
 
     @Autowired
@@ -69,7 +71,7 @@ public class DeviceDownloadService {
      * @return
      */
     public String getToken() {
-        if (token.isEmpty()) {
+        if (StrUtil.isEmpty(token)) {
             companyEntity = companyService.findCompany();
             TokenRequest tokenRequest = new TokenRequest();
             tokenRequest.setAppId(companyEntity.getAppId());

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ spring:
       matching-strategy: ant_path_matcher
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    url: jdbc:p6spy:mysql://192.168.235.137:33306/udidl?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:p6spy:mysql://127.0.0.1:3306/udidl_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: root
   servlet:

src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/udidl_test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
     username: root
-    password: mysql@2020
+    password: 123456
   servlet:
     multipart:
       max-file-size: 100MB

src/main/resources/mybatis/mapper/udid/ContactlistMapper.xml

@@ -104,10 +104,10 @@
         </if>
     </delete>
     <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udid.Contactlist">
-    insert into contactlist (id, deviceRecordKey, qylxrcz, 
+    insert into contactlist ( deviceRecordKey, qylxrcz,
       qylxrdh, qylxryx, uuid
       )
-    values (#{id,jdbcType=INTEGER}, #{devicerecordkey,jdbcType=VARCHAR}, #{qylxrcz,jdbcType=VARCHAR}, 
+    values ( #{devicerecordkey,jdbcType=VARCHAR}, #{qylxrcz,jdbcType=VARCHAR},
       #{qylxrdh,jdbcType=VARCHAR}, #{qylxryx,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}
       )
   </insert>

src/main/resources/mybatis/mapper/udid/DeviceclinicalMapper.xml

@@ -101,9 +101,9 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udid.Deviceclinical">
-    insert into deviceclinical (id, deviceRecordKey, lcsycclx, 
+    insert into deviceclinical ( deviceRecordKey, lcsycclx,
       ccz, ccdw, uuid)
-    values (#{id,jdbcType=INTEGER}, #{devicerecordkey,jdbcType=VARCHAR}, #{lcsycclx,jdbcType=VARCHAR}, 
+    values ( #{devicerecordkey,jdbcType=VARCHAR}, #{lcsycclx,jdbcType=VARCHAR},
       #{ccz,jdbcType=VARCHAR}, #{ccdw,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.glxp.udidl.admin.entity.udid.Deviceclinical">

src/main/resources/mybatis/mapper/udid/DevicedownloadMapper.xml

@@ -107,11 +107,11 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udid.Devicedownload">
-    insert into devicedownload (id, updateday, updatemonth, 
+    insert into devicedownload (updateday, updatemonth,
       dayindex, monthindex, daytotal, 
       monthtotal, alltotal, allindex, 
       isdownload, startTime)
-    values (#{id,jdbcType=VARCHAR}, #{updateday,jdbcType=VARCHAR}, #{updatemonth,jdbcType=VARCHAR}, 
+    values ( #{updateday,jdbcType=VARCHAR}, #{updatemonth,jdbcType=VARCHAR},
       #{dayindex,jdbcType=INTEGER}, #{monthindex,jdbcType=INTEGER}, #{daytotal,jdbcType=INTEGER}, 
       #{monthtotal,jdbcType=INTEGER}, #{alltotal,jdbcType=INTEGER}, #{allindex,jdbcType=INTEGER}, 
       #{isdownload,jdbcType=INTEGER}, #{starttime,jdbcType=VARCHAR})

src/main/resources/mybatis/mapper/udid/DevicepackageMapper.xml

@@ -102,10 +102,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udid.Devicepackage">
-    insert into devicepackage (id, bzcpbs, bznhxyjbzcpbs, 
+    insert into devicepackage (bzcpbs, bznhxyjbzcpbs,
       cpbzjb, bznhxyjcpbssl, deviceRecordKey, 
       uuid)
-    values (#{id,jdbcType=INTEGER}, #{bzcpbs,jdbcType=VARCHAR}, #{bznhxyjbzcpbs,jdbcType=VARCHAR}, 
+    values ( #{bzcpbs,jdbcType=VARCHAR}, #{bznhxyjbzcpbs,jdbcType=VARCHAR},
       #{cpbzjb,jdbcType=VARCHAR}, #{bznhxyjcpbssl,jdbcType=INTEGER}, #{devicerecordkey,jdbcType=VARCHAR}, 
       #{uuid,jdbcType=VARCHAR})
   </insert>

src/main/resources/mybatis/mapper/udid/DevicestorageMapper.xml

@@ -102,10 +102,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udid.Devicestorage">
-    insert into devicestorage (id, deviceRecordKey, cchcztj, 
+    insert into devicestorage ( deviceRecordKey, cchcztj,
       jldw, zdz, zgz, uuid
       )
-    values (#{id,jdbcType=INTEGER}, #{devicerecordkey,jdbcType=VARCHAR}, #{cchcztj,jdbcType=VARCHAR}, 
+    values ( #{devicerecordkey,jdbcType=VARCHAR}, #{cchcztj,jdbcType=VARCHAR},
       #{jldw,jdbcType=VARCHAR}, #{zdz,jdbcType=VARCHAR}, #{zgz,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}
       )
   </insert>

src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml

@@ -15,9 +15,9 @@
         where id = #{id,jdbcType=INTEGER}
     </delete>
     <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch">
-        insert into udplat_goods_match (id, deviceRecordKey, deliveryGoodsId,
+        insert into udplat_goods_match ( deviceRecordKey, deliveryGoodsId,
                                         medicalCode, createTime)
-        values (#{id,jdbcType=INTEGER}, #{deviceRecordKey,jdbcType=VARCHAR}, #{deliveryGoodsId,jdbcType=VARCHAR},
+        values ( #{deviceRecordKey,jdbcType=VARCHAR}, #{deliveryGoodsId,jdbcType=VARCHAR},
                 #{medicalCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch">

src/main/resources/mybatis/mapper/udplat/UdplatLogMapper.xml

@@ -17,11 +17,11 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.glxp.udidl.admin.entity.udplat.UdplatLog">
-    insert into udplat_log (id, type, downloadType, 
+    insert into udplat_log ( type, downloadType,
       tbName, actionDate, totalCount, 
       msg, createTime, content
       )
-    values (#{id,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{downloadType,jdbcType=VARCHAR}, 
+    values ( #{type,jdbcType=VARCHAR}, #{downloadType,jdbcType=VARCHAR},
       #{tbName,jdbcType=VARCHAR}, #{actionDate,jdbcType=TIMESTAMP}, #{totalCount,jdbcType=INTEGER}, 
       #{msg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{content,jdbcType=LONGVARCHAR}
       )