From 0d878f1d646486caf8ea0ce6aed95557f8fec69f 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 16:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Did=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/thrsys/ThrDeptController.java | 2 ++ .../glxp/api/controller/thrsys/ThrProductsController.java | 2 ++ .../java/com/glxp/api/res/thrsys/ThrProductsResponse.java | 2 +- .../api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java | 2 ++ .../resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml | 5 +++-- src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml | 3 ++- src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml | 3 ++- 7 files changed, 14 insertions(+), 5 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 9994c5cf9..fd558aa7b 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.common.enums.ResultEnum; @@ -78,6 +79,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 fedc2db8e..97310b3e4 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -179,6 +180,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 0e9b1839a..e19f9df45 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/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index 775ce7efd..3842bf90e 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 @@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.bean.BeanUtil; 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; @@ -68,6 +69,7 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl 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 0681dd883..ef296c2e9 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml @@ -83,9 +83,10 @@ 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 ( + #{id}, #{pid}, #{code}, #{name}, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index a231f6342..a82d5a01b 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -154,10 +154,11 @@ 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 ( + #{id}, #{code}, #{name}, #{measname},