合并git 分支

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
@@ -123,7 +124,8 @@ public class BasicCorpController {
         basicUnitMaintainEntity.setErpId(CustomUtil.getId());
         basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
         basicUnitMaintainEntity.setUpdateTime(new Date());
-        boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
+        basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());
+        boolean b = basicUnitMaintainService.insert(basicUnitMaintainEntity);
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
@@ -239,7 +241,8 @@ public class BasicCorpController {
                 basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
                 basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP);
                 basicUnitMaintainEntity.setUpdateTime(new Date());
-                basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
+                basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());
+                basicUnitMaintainService.insert(basicUnitMaintainEntity);
             }
         }
         return ResultVOUtils.success("选入成功");
@@ -275,7 +278,7 @@ public class BasicCorpController {
         }
         BasicErpUnitsResponse basicErpUnitsResponse = combineRequest.getBasicErpUnitsResponse();
         BasicCorpEntity basicCorpEntity = new BasicCorpEntity();
-        basicCorpEntity.setId(Integer.parseInt(combineRequest.getKey()));
+        basicCorpEntity.setId(Long.parseLong(combineRequest.getKey()));
         if (combineRequest.getThirdSys() != null) {
             if ("thirdId".equals(combineRequest.getThirdSys())) {
                 basicCorpEntity.setThirdId(basicErpUnitsResponse.getId());

src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java

@@ -18,7 +18,6 @@ public interface BasicCorpDao extends BaseMapperPlus<BasicCorpDao, BasicCorpEnti
 
     boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse);
 
-    int insert(BasicCorpEntity basicUnitMaintainEntity);
 
     int customUpdateById(BasicCorpEntity basicUnitMaintainSaveRequest);
 
@@ -26,7 +25,6 @@ public interface BasicCorpDao extends BaseMapperPlus<BasicCorpDao, BasicCorpEnti
 
     boolean deleteById(@Param("id") String id);
 
-    BasicCorpEntity selectById(@Param("id") String id);
 
     List<BasicCorpEntity> batchSelectByIds(@Param("ids") List<Integer> id);
 

src/main/java/com/glxp/api/entity/basic/BasicCorpEntity.java

@@ -11,8 +11,8 @@ import java.util.Date;
 @Data
 @TableName(value = "basic_corp")
 public class BasicCorpEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 往来单位编码

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -1273,7 +1273,7 @@ public class HeartService {
         }
         if (CollectionUtil.isNotEmpty(corpList)) {
             for (BasicCorpEntity basicCorpEntity : corpList)
-                corpDao.importBasicUnitMaintain(basicCorpEntity);
+                corpDao.insertOrUpdate(basicCorpEntity);
         }
         if (CollectionUtil.isNotEmpty(supCertList)) {
             supCertDao.insertOrUpdateBatch(supCertList);

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -145,29 +145,6 @@
                 #{remark})
     </insert>
 
-    <insert id="insert" parameterType="com.glxp.api.entity.basic.BasicCorpEntity">
-        insert INTO basic_corp(thirdId, erpId, name, spell, addr,
-                               status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,
-                               thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType,
-                               createUser, createTime, updateUser, remark)
-        values (#{thirdId},
-                #{erpId},
-                #{name},
-                #{spell},
-                #{addr},
-                #{status},
-                #{type},
-                #{creditNo},
-                #{contact},
-                #{mobile},
-                #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4},
-                #{thirdName}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{updateTime}, #{corpType},
-                #{outType}, #{createUser},
-                #{createTime},
-                #{updateUser},
-                #{remark})
-    </insert>
-
 
     <update id="customUpdateById" parameterType="com.glxp.api.entity.basic.BasicCorpEntity">
         UPDATE basic_corp
@@ -261,12 +238,6 @@
     </delete>
 
 
-    <select id="selectById" parameterType="Map" resultType="com.glxp.api.entity.basic.BasicCorpEntity">
-        select *
-        FROM basic_corp
-        WHERE id = #{id}
-    </select>
-
     <select id="batchSelectByIds" resultType="com.glxp.api.entity.basic.BasicCorpEntity">
         select *
         from basic_corp where id in