From d252711651a4b6057078439b5996d5b8bad07d5d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 28 Apr 2023 16:08:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=20=E5=AE=A1=E6=A0=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/RegisterController.java | 2 ++ .../com/glxp/api/entity/basic/BasicUnitMaintainEntity.java | 2 +- .../resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/RegisterController.java b/src/main/java/com/glxp/api/controller/auth/RegisterController.java index 71db3a7f..f83f1f9e 100644 --- a/src/main/java/com/glxp/api/controller/auth/RegisterController.java +++ b/src/main/java/com/glxp/api/controller/auth/RegisterController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -351,6 +352,7 @@ public class RegisterController { if (registerCheckRequest.getCheckType() == 1) { //注册时新增到往来单位字典 BasicUnitMaintainEntity basicUnitMaintainEntity1 = new BasicUnitMaintainEntity(); + basicUnitMaintainEntity1.setId(IdUtil.getSnowflakeNextId()); basicUnitMaintainEntity1.setName(userRegisterEntity.getCompanyName()); basicUnitMaintainEntity1.setErpId(generateUserId() + ""); basicUnitMaintainEntity1.setCorpType(2); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java index d81c6f49..203e5f70 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java @@ -8,7 +8,7 @@ import java.util.Date; @Data public class BasicUnitMaintainEntity { - private Integer id; + private Long id; private String erpId; @NotBlank(message = "往来单位名称不能为空！") diff --git a/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index eba53e4c..5d762e85 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -72,11 +72,11 @@ parameterType="com.glxp.api.entity.basic.BasicUnitMaintainEntity"> REPLACE INTO basic_corp - (thirdId,erpId,`name`,spell, + (id,thirdId,erpId,`name`,spell, addr,status,`type`,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType) values - ( + (#{id}, #{thirdId}, #{erpId}, #{name}, From cefbeb5af8171360e58f5950f45a0e6730ec8a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 17:35:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86id?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/thrsys/ThrDeptController.java | 2 ++ .../thrsys/ThrProductsController.java | 2 ++ .../api/res/thrsys/ThrProductsResponse.java | 2 +- .../api/service/basic/UdiContrastService.java | 4 ++++ .../impl/ThrBusTypeOriginServiceImpl.java | 2 ++ .../mybatis/mapper/basic/UdiProductDao.xml | 5 ++-- .../mapper/thrsys/ThrBusTypeOriginDao.xml | 5 ++-- .../mybatis/mapper/thrsys/ThrDeptDao.xml | 24 +++++++++++-------- .../mybatis/mapper/thrsys/ThrProductsDao.xml | 5 ++-- 9 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index b14edca2..b4c8c139 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; @@ -81,6 +82,7 @@ public class ThrDeptController { thrDeptEntity.setPcode(pEntity.getPcode()); } thrDeptEntity.setUpdateTime(new Date()); + thrDeptEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = thrDeptService.insertInvWarehouse(thrDeptEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 2e745c61..2a79e1d1 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -138,6 +139,7 @@ public class ThrProductsController { thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId())); thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setCreateTime(new Date()); + thrProductsEntity.setId(IdUtil.getSnowflakeNextId()); thrProductsService.insertThrProducts(thrProductsEntity); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java index 0e9b1839..e19f9df4 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java @@ -8,7 +8,7 @@ import java.util.Date; @Data public class ThrProductsResponse { - private Integer id; + private Long id; private String code; //产品编码 private String name; private String measname; //计量单位 diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 82b835cc..fce18fc2 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.UdiRelevanceDao; @@ -214,6 +215,9 @@ public class UdiContrastService { if (CollUtil.isNotEmpty(udiInfoEntities)) { UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid()); if (udiProductEntity == null) { + for (UdiProductEntity udiInfoEntity : udiInfoEntities) { + udiInfoEntity.setId(IdUtil.getSnowflakeNextId()); + } udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index d08724dd..27e7401d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -59,6 +60,7 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl replace INTO basic_products - (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + (id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, @@ -240,7 +240,8 @@ - (#{item.uuid}, + ( #{item.id}, + #{item.uuid}, #{item.originUuid}, #{item.nameCode}, #{item.deviceRecordKey}, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml index dde42bce..74101465 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml @@ -75,9 +75,10 @@ replace into thr_bustype_origin - (`name`, `action`, thirdSys, `enable`, inoutType, updateTime, remark, createUser, updateUser, + (id,`name`, `action`, thirdSys, `enable`, inoutType, updateTime, remark, createUser, updateUser, createTime) - values (#{name}, + values (#{id}, + #{name}, #{action}, #{thirdSys}, #{enable}, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml index fd787d30..1304adf2 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml @@ -83,19 +83,23 @@ parameterType="com.glxp.api.entity.thrsys.ThrDeptEntity"> replace INTO thr_dept - (pid, code, name, advanceType, isDefault, + (id,pid, code, name, advanceType, isDefault, status, updateTime, remark, thirdSysFk) - values (#{pid}, - #{code}, - #{name}, - #{advanceType}, - #{isDefault}, - #{status}, - #{updateTime}, - #{remark}, - #{thirdSysFk}) + values ( + #{id}, + #{pid}, + #{code}, + #{name}, + #{advanceType}, + #{isDefault}, + #{status}, + #{updateTime}, + #{remark}, + #{thirdSysFk} + ) + replace INTO thr_dept (pid, code, name, advanceType, isDefault, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index 2d4dd1e2..d36cae57 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -167,11 +167,12 @@ parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity"> replace INTO thr_products - (code, `name`, measname, spec, registerNo, manufactory, + (id,code, `name`, measname, spec, registerNo, manufactory, cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, price, createUser, createTime, updateUser) - values (#{code}, + values ( #{id}, + #{code}, #{name}, #{measname}, #{spec},