From 1517d71b78025512a0ac5f527739212efb2c5de5 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Sun, 23 Apr 2023 16:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/config/MasterDataSourceConfig.java | 17 +- .../constant/BasicExportStatusTimeEnum.java | 15 ++ .../api/constant/BasicExportTypeEnum.java | 5 + .../com/glxp/api/dao/auth/AuthAdminDao.java | 5 +- .../java/com/glxp/api/dao/auth/DeptDao.java | 3 +- .../com/glxp/api/dao/auth/DeptUserDao.java | 3 +- .../com/glxp/api/dao/auth/InvSpaceDao.java | 5 +- .../dao/auth/WarehouseBussinessTypeDao.java | 5 +- .../glxp/api/dao/auth/WarehouseUserDao.java | 7 +- .../com/glxp/api/entity/auth/AuthAdmin.java | 17 ++ .../com/glxp/api/entity/auth/DeptEntity.java | 2 + .../glxp/api/entity/auth/DeptUserEntity.java | 9 + .../api/entity/auth/InvBusUserEntity.java | 15 ++ .../com/glxp/api/entity/auth/InvSpace.java | 9 + .../auth/WarehouseBussinessTypeEntity.java | 9 + .../api/entity/auth/WarehouseUserEntity.java | 10 ++ .../api/entity/system/SyncDataSetEntity.java | 4 + .../api/service/auth/AuthAdminService.java | 3 +- .../glxp/api/service/auth/DeptService.java | 3 +- .../api/service/auth/DeptUserService.java | 3 +- .../api/service/auth/InvBusUserService.java | 3 +- .../api/service/auth/InvSpaceService.java | 3 +- .../api/service/auth/InvWarehouseService.java | 3 +- .../auth/WarehouseBussinessTypeService.java | 3 +- .../service/auth/WarehouseUserService.java | 3 +- .../auth/impl/AuthAdminServiceImpl.java | 5 +- .../service/auth/impl/DeptServiceImpl.java | 3 +- .../auth/impl/DeptUserServiceImpl.java | 3 +- .../auth/impl/InvBusUserServiceImpl.java | 3 +- .../auth/impl/InvSpaceServiceImpl.java | 5 +- .../auth/impl/InvWarehouseServiceImpl.java | 3 +- .../WarehouseBussinessTypeServiceImpl.java | 3 +- .../auth/impl/WarehouseUserServiceImpl.java | 5 +- .../glxp/api/service/sync/HeartService.java | 156 +++++++++++++++++- .../java/com/glxp/api/task/SyncHeartTask.java | 2 +- .../mybatis/mapper/auth/InvBusUserDao.xml | 5 +- .../mybatis/mapper/auth/InvSpaceDao.xml | 2 +- .../mapper/auth/WarehouseBussinessTypeDao.xml | 2 +- .../mybatis/mapper/auth/WarehouseUserDao.xml | 4 +- src/main/resources/schemas/schema_v2.1.sql | 10 ++ 40 files changed, 335 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java b/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java index 121a14828..a0c48d97e 100644 --- a/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java +++ b/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java @@ -1,5 +1,9 @@ package com.glxp.api.config; +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.config.GlobalConfig; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; @@ -36,12 +40,23 @@ public class MasterDataSourceConfig { return new DataSourceTransactionManager(masterDataSource()); } + @Configuration + @ConfigurationProperties(prefix = "mybatis-plus.configuration") + public class CusMybatisConfiguration extends MybatisConfiguration{ + } + @Configuration + @ConfigurationProperties(prefix = "mybatis-plus.global-config") + public class CusGlobalConfig extends GlobalConfig { + } + @Bean(name = "masterSqlSessionFactory") @Primary - public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource) + public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource, CusMybatisConfiguration configuration, CusGlobalConfig globalConfig) throws Exception { final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean(); sessionFactory.setDataSource(masterDataSource); + sessionFactory.setConfiguration(configuration); + sessionFactory.setGlobalConfig(globalConfig); sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver() .getResources(MasterDataSourceConfig.MAPPER_LOCATION)); return sessionFactory.getObject(); diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java index 93438257d..9e66a71bc 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java @@ -52,6 +52,21 @@ public enum BasicExportStatusTimeEnum { * 业务单据类型 */ THR_BUSTYPE_ORIGIN("thr_bustype_origin","第三方单据类型"), + + /** + * 部门数据 + */ + DEPARTMENT("department","部门数据"), + + /** + * 仓库数据 + */ + WAREHOUSE_DICT("warehouse_dict","仓库数据"), + + /** + * 用户数据 + */ + USER_DATA("user_data","用户数据"), ; @EnumValue private String key; diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 19f95213c..2d3b97deb 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -26,6 +26,11 @@ public enum BasicExportTypeEnum { * 其他数据 */ OTHER_DATA("other_data", "其他数据"), + + /** + * 用户数据 + */ + USER_DATA("user_data", "用户数据"), ; private String key; diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index 020ead7d3..4f2ca48f3 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.req.auth.FilterAuthUserRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface AuthAdminDao { +public interface AuthAdminDao extends BaseMapperPlus { /** * 后台业务查询列表 @@ -74,7 +75,7 @@ public interface AuthAdminDao { */ List selectHospitalUser(); - List selectNotSelectUser(@Param("userIds") List userIds,@Param("deptId") Integer deptId); + List selectNotSelectUser(@Param("userIds") List userIds, @Param("deptId") Integer deptId); List selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest); diff --git a/src/main/java/com/glxp/api/dao/auth/DeptDao.java b/src/main/java/com/glxp/api/dao/auth/DeptDao.java index 0f72e36ce..748cbf303 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.req.auth.FilterInvWarehouseRequest; import org.apache.ibatis.annotations.Param; @@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; -public interface DeptDao { +public interface DeptDao extends BaseMapperPlus { List filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); diff --git a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index b43f8987f..80054e875 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.auth.DeptUserResponse; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface DeptUserDao { +public interface DeptUserDao extends BaseMapperPlus { List selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index a18eb6367..e8ff6ea6d 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.req.auth.FilterInvSpaceRequest; import com.glxp.api.res.auth.InvSpaceResponse; @@ -9,11 +10,11 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface InvSpaceDao { +public interface InvSpaceDao extends BaseMapperPlus { int deleteByPrimaryKey(Integer id); - int insert(InvSpace record); + int insertEntity(InvSpace record); int insertSelective(InvSpace record); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java index a55e75fc2..298178a5f 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,14 +9,14 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseBussinessTypeDao { +public interface WarehouseBussinessTypeDao extends BaseMapperPlus { WarehouseBussinessTypeEntity selectById(Integer id); int deleteByPrimaryKey(Integer id); int insert(WarehouseBussinessTypeEntity record); - int insertOrUpdate(WarehouseBussinessTypeEntity record); + int insertOrUpdateEntity(WarehouseBussinessTypeEntity record); int insertOrUpdateSelective(WarehouseBussinessTypeEntity record); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index f1ead4405..e6fe3084f 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.FilterInvUserRequest; @@ -9,16 +10,16 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseUserDao { +public interface WarehouseUserDao extends BaseMapperPlus { int deleteByPrimaryKey(Integer id); int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code); List filterList(FilterInvUserRequest filterInvUserRequest); - int insert(WarehouseUserEntity record); + int insertEntity(WarehouseUserEntity record); - int insertOrUpdate(WarehouseUserEntity record); + int insertOrUpdateEntity(WarehouseUserEntity record); int insertOrUpdateSelective(WarehouseUserEntity record); diff --git a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java index 147874e80..e9bec27d3 100644 --- a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java @@ -1,5 +1,7 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.constant.Constant; import lombok.Data; @@ -7,35 +9,50 @@ import java.util.Date; import java.util.List; @Data +@TableName("auth_user") public class AuthAdmin { // 主键 private Long id; // 昵称 + @TableField("userName") private String userName; // 登录密码 + @TableField("passWord") private String passWord; // 最后登录ip + @TableField("lastLoginIp") private String lastLoginIp; // 最后登录时间 + @TableField("lastLoginTime") private Date lastLoginTime; // 创建时间 + @TableField("createTime") private Date createTime; // 状态 + @TableField("userFlag") private Integer userFlag; + @TableField("lastModifyTime") private Date lastModifyTime; private String comments; + @TableField("employeeName") private String employeeName; + @TableField("CustomerId") private Long CustomerId; + @TableField("locDeptCode") private String locDeptCode; + @TableField("locInvCode") private String locInvCode; + @TableField(exist = false) private String deptName; + @TableField(exist = false) private List roles; + @TableField(exist = false) private Long[] roleIds; diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java index bfd382a09..cbd8f8889 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -1,10 +1,12 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("auth_dept") public class DeptEntity { private Integer id; private Integer pid; diff --git a/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java index ffd1cf6f3..313a80f41 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptUserEntity.java @@ -1,10 +1,19 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + @Data +@TableName("auth_dept_user") public class DeptUserEntity { + @TableField("deptId") private Long deptId; + @TableField("userId") private Long userId; + @TableField("updateTime") + private Date updateTime; } diff --git a/src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java b/src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java index 64fe937c9..03b3357f4 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java @@ -1,13 +1,28 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + + @Data +@TableName(value = "auth_user_bustype") public class InvBusUserEntity { + @TableId(value = "id", type = IdType.AUTO) private Integer id; + @TableField(value = "userId") private String userId; + @TableField(value = "subInvCode") private String subInvCode; + @TableField(value = "scAction") private String scAction; + @TableField(value = "remark") private String remark; + @TableField(value = "updateTime") + private Date updateTime; } diff --git a/src/main/java/com/glxp/api/entity/auth/InvSpace.java b/src/main/java/com/glxp/api/entity/auth/InvSpace.java index a0e8f8f79..95b4e12ba 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvSpace.java +++ b/src/main/java/com/glxp/api/entity/auth/InvSpace.java @@ -1,5 +1,7 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @@ -8,6 +10,7 @@ import java.util.Date; * 货位字典表 */ @Data +@TableName("auth_space") public class InvSpace { private Integer id; @@ -30,11 +33,13 @@ public class InvSpace { /** * 所属仓库 */ + @TableField("invStorageCode") private String invStorageCode; /** * 所属分库 */ + @TableField("invWarehouseCode") private String invWarehouseCode; /** @@ -45,21 +50,25 @@ public class InvSpace { /** * 创建时间 */ + @TableField("createTime") private Date createTime; /** * 更新时间 */ + @TableField("updateTime") private Date updateTime; /** * 创建人 */ + @TableField("createUser") private String createUser; /** * 更新人 */ + @TableField("updateUser") private String updateUser; /** diff --git a/src/main/java/com/glxp/api/entity/auth/WarehouseBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/auth/WarehouseBussinessTypeEntity.java index a3d35858c..79f435d57 100644 --- a/src/main/java/com/glxp/api/entity/auth/WarehouseBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/WarehouseBussinessTypeEntity.java @@ -1,11 +1,16 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * 仓库字典-单据类型关联表 */ @Data +@TableName("auth_warehouse_bustype") public class WarehouseBussinessTypeEntity { /** * id @@ -27,5 +32,9 @@ public class WarehouseBussinessTypeEntity { */ private String name; + @TableField("updateTime") + private Date updateTime; + + @TableField(exist = false) private boolean select; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java b/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java index 7fb18e6b7..f65391f7c 100644 --- a/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java @@ -1,11 +1,16 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * 仓库字典-用户关联表 */ @Data +@TableName("auth_warehouse_user") public class WarehouseUserEntity { /** * id @@ -30,8 +35,13 @@ public class WarehouseUserEntity { /** * 是否是仓库主管 */ + @TableField("isDirector") private boolean isDirector; + @TableField("employeeName") private String employeeName; + @TableField("updateTime") + private Date updateTime; + } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java index 4b26458c6..e32b04574 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java @@ -23,6 +23,10 @@ public class SyncDataSetEntity { private int dbDiProducts; //DI产品信息 private int dbDiCompany; //DI企业信息 + private int department; //部门信息 + private int warehouseDict; //仓库字典 + private int userData; //用户信息 + private int udiCodeLost; // UDI码补齐 private int udiCodeRel; //UDI码关联关系 diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index 603951e11..9ecd12eff 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -1,13 +1,14 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.FilterNoSelectUserRequest; import java.util.List; -public interface AuthAdminService { +public interface AuthAdminService extends IService { List listAdminPage(FilterAuthUserRequest filterAuthUserRequest); diff --git a/src/main/java/com/glxp/api/service/auth/DeptService.java b/src/main/java/com/glxp/api/service/auth/DeptService.java index b58dafd23..38f3f3be7 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.req.auth.FilterInvWarehouseRequest; import org.apache.ibatis.annotations.Param; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; -public interface DeptService { +public interface DeptService extends IService { List selectByIdCode(List list); DeptEntity findDefault(Boolean advaceType, Boolean isDefault); diff --git a/src/main/java/com/glxp/api/service/auth/DeptUserService.java b/src/main/java/com/glxp/api/service/auth/DeptUserService.java index 977f4b2a7..e955777ec 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptUserService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptUserService.java @@ -1,12 +1,13 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.auth.DeptUserResponse; import java.util.List; -public interface DeptUserService { +public interface DeptUserService extends IService { List selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); diff --git a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java index a4b36c819..8820f474d 100644 --- a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java +++ b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; @@ -8,7 +9,7 @@ import com.glxp.api.res.auth.InvBusUserResponse; import java.util.List; -public interface InvBusUserService { +public interface InvBusUserService extends IService { List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); diff --git a/src/main/java/com/glxp/api/service/auth/InvSpaceService.java b/src/main/java/com/glxp/api/service/auth/InvSpaceService.java index 52893e700..2f2ba8bc4 100644 --- a/src/main/java/com/glxp/api/service/auth/InvSpaceService.java +++ b/src/main/java/com/glxp/api/service/auth/InvSpaceService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.req.auth.FilterInvSpaceRequest; @@ -7,7 +8,7 @@ import com.glxp.api.res.auth.InvSpaceResponse; import java.util.List; -public interface InvSpaceService { +public interface InvSpaceService extends IService { /** * 查询货位字典列表 diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java index 7dfe6e0e3..f57e0fb80 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; @@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; -public interface InvWarehouseService { +public interface InvWarehouseService extends IService { InvWarehouseEntity getByWareId( String id); diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java index 20341e8f5..0ee6e363b 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; import com.glxp.api.req.auth.FilterInvLinkDataRequest; @@ -8,7 +9,7 @@ import com.glxp.api.res.basic.BasicBussinessTypeResponse; import java.util.List; -public interface WarehouseBussinessTypeService { +public interface WarehouseBussinessTypeService extends IService { WarehouseBussinessTypeEntity selectById(Integer id); /** diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 522964bc2..9b77eeeda 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.req.auth.FilterInvLinkDataRequest; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface WarehouseUserService { +public interface WarehouseUserService extends IService { /** * 查询仓库信息关联的用户数据 diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 45023f50f..14057b69a 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.AuthAdminDao; import com.glxp.api.dao.auth.SysUserRoleMapper; @@ -24,7 +25,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class AuthAdminServiceImpl implements AuthAdminService { +public class AuthAdminServiceImpl extends ServiceImpl implements AuthAdminService { @Resource private AuthAdminDao authAdminDao; @@ -142,7 +143,7 @@ public class AuthAdminServiceImpl implements AuthAdminService { int offset = (filterNoSelectUserRequest.getPage() - 1) * filterNoSelectUserRequest.getLimit(); PageHelper.offsetPage(offset, filterNoSelectUserRequest.getLimit()); } - return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(),filterNoSelectUserRequest.getDeptId()); + return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(), filterNoSelectUserRequest.getDeptId()); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index d469f034e..04b8f014d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.DeptDao; import com.glxp.api.entity.auth.DeptEntity; @@ -17,7 +18,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class DeptServiceImpl implements DeptService { +public class DeptServiceImpl extends ServiceImpl implements DeptService { @Resource DeptDao deptDao; diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index 4d2b3f7a3..a90443d12 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.DeptUserDao; import com.glxp.api.entity.auth.DeptUserEntity; @@ -15,7 +16,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class DeptUserServiceImpl implements DeptUserService { +public class DeptUserServiceImpl extends ServiceImpl implements DeptUserService { @Resource DeptUserDao deptUserDao; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java index f04a7dd8d..11ce1facd 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvBusUserDao; import com.glxp.api.entity.auth.InvBusUserEntity; @@ -19,7 +20,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class InvBusUserServiceImpl implements InvBusUserService { +public class InvBusUserServiceImpl extends ServiceImpl implements InvBusUserService { @Resource InvBusUserDao invBusUserDao; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index c5c558f71..827709062 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -25,7 +26,7 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class InvSpaceServiceImpl implements InvSpaceService { +public class InvSpaceServiceImpl extends ServiceImpl implements InvSpaceService { @Resource private InvSpaceDao invSpaceDao; @@ -59,7 +60,7 @@ public class InvSpaceServiceImpl implements InvSpaceService { invSpace.setUpdateTime(date); invSpace.setCreateUser(user.getUserName()); invSpace.setUpdateUser(user.getUserName()); - invSpaceDao.insert(invSpace); + invSpaceDao.insertEntity(invSpace); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index f9a0b38dc..c2b616865 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.thrsys.ThrSystemDao; @@ -27,7 +28,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class InvWarehouseServiceImpl implements InvWarehouseService { +public class InvWarehouseServiceImpl extends ServiceImpl implements InvWarehouseService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java index 2ca38493f..e79f2dc24 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseBussinessTypeDao; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; @@ -20,7 +21,7 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessTypeService { +public class WarehouseBussinessTypeServiceImpl extends ServiceImpl implements WarehouseBussinessTypeService { @Resource private WarehouseBussinessTypeDao warehouseBussinessTypeDao; diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index bc048ba2e..1e6eb018d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseUserDao; import com.glxp.api.entity.auth.AuthAdmin; @@ -20,7 +21,7 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class WarehouseUserServiceImpl implements WarehouseUserService { +public class WarehouseUserServiceImpl extends ServiceImpl implements WarehouseUserService { @Resource @@ -141,6 +142,6 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { @Override public boolean insert(WarehouseUserEntity warehouseUserEntity) { - return warehouseUserDao.insert(warehouseUserEntity)>0; + return warehouseUserDao.insertEntity(warehouseUserEntity) > 0; } } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index c7be86aad..0be2e20c5 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -17,6 +17,7 @@ import com.glxp.api.dao.inout.IoCodeRelMapper; import com.glxp.api.dao.purchase.*; import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao; import com.glxp.api.dto.RelaySyncDto; +import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.*; @@ -27,7 +28,9 @@ import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; +import com.glxp.api.res.auth.InvSpaceResponse; import com.glxp.api.res.sync.*; +import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.IBasicBusTypeChangeService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; @@ -41,7 +44,6 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; -import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeanUtils; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; @@ -210,7 +212,7 @@ public class HeartService { @Transactional(rollbackFor = Exception.class) - public void chooseData(SyncDataSetEntity info, Date syncTime, BasicExportTypeEnum exportType) { + public void pushData(SyncDataSetEntity info, Date syncTime, BasicExportTypeEnum exportType) { Date now = new Date(); String taskId = CustomUtil.getId(); @@ -230,6 +232,11 @@ public class HeartService { uploadData(exportType, taskId, x -> x.getDocumentTypeData(info, taskId, now, syncTime)); } break; + case USER_DATA: + if (needExec(info.getDepartment(), info.getWarehouseDict(), info.getUserData())) { + uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime)); + } + break; case COUNTRY_DI_DATA: } } @@ -537,6 +544,151 @@ public class HeartService { return dataResponse; } + private final DeptService deptService; + private final DeptUserService deptUserService; + private final InvWarehouseService warehouseService; + private final WarehouseUserService warehouseUserService; + private final WarehouseBussinessTypeService warehouseBussinessTypeService; + private final InvSpaceService invSpaceService; + private final AuthAdminService adminService; + private final InvBusUserService invBusUserService; + + /** + * 获取单据类型数据 + * + * @param info 同步设置 + * @param now 当前时间 + * @param syncTime 同步时间 -- 传入时不操作exportTime表 + * @return + */ + public SpsSyncDataResponse getUserData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) { + SpsSyncDataResponse dataResponse = null; + Map syncTimeMap = new WeakHashMap<>(3); + syncTimeMap.put("isNew", true); + syncTimeMap.put("oldDate", syncTime); + + //确认有开启部门信息同步 + if (needExec(info.getDepartment())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPARTMENT); + } else { + map = syncTimeMap; + } + List deptEntityList = deptService.list(Wrappers.lambdaQuery(DeptEntity.class) + .le((boolean) map.get("isNew"), DeptEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), DeptEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(deptEntityList)) { + dataResponse = new SpsSyncDataResponse(); + dataResponse.setDeptEntityList(deptEntityList); + } + List deptUserEntityList = deptUserService.list(Wrappers.lambdaQuery(DeptUserEntity.class) + .le((boolean) map.get("isNew"), DeptUserEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), DeptUserEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(deptUserEntityList)) { + if (dataResponse == null) { + dataResponse = new SpsSyncDataResponse(); + } + dataResponse.setDeptUserEntities(deptUserEntityList); + } + } + + //确认有开启仓库字典同步 + if (needExec(info.getWarehouseDict())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT); + } else { + map = syncTimeMap; + } + List warehouseEntityList = warehouseService.list(Wrappers.lambdaQuery(InvWarehouseEntity.class) + .le((boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(warehouseEntityList)) { + if (dataResponse == null) { + dataResponse = new SpsSyncDataResponse(); + } + dataResponse.setInvWarehouseEntities(warehouseEntityList); + } + List warehouseUserEntities = warehouseUserService.list(Wrappers.lambdaQuery(WarehouseUserEntity.class) + .le((boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(warehouseUserEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncDataResponse(); + } + dataResponse.setWarehouseUserEntities(warehouseUserEntities); + } + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.list(Wrappers.lambdaQuery(WarehouseBussinessTypeEntity.class) + .le((boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(warehouseBussinessTypeEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncDataResponse(); + } + dataResponse.setWarehouseBussinessTypeEntities(warehouseBussinessTypeEntities); + } + List invSpaceList = invSpaceService.list(Wrappers.lambdaQuery(InvSpace.class) + .le((boolean) map.get("isNew"), InvSpace::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), InvSpace::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(invSpaceList)) { + if (dataResponse == null) { + dataResponse = new SpsSyncDataResponse(); + } + dataResponse.setInvSpaces(invSpaceList); + } + } + + //确认有开启用户信息同步 + if (needExec(info.getUserData())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA); + } else { + map = syncTimeMap; + } + List adminList = adminService.list(Wrappers.lambdaQuery(AuthAdmin.class) + .le((boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now) + .between(!(boolean) map.get("isNew"), AuthAdmin::getLastModifyTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(adminList)) { + if (dataResponse == null) { + dataResponse = new SpsSyncDataResponse(); + } + dataResponse.setAuthAdminList(adminList); + } + List busUserEntities = invBusUserService.list(Wrappers.lambdaQuery(InvBusUserEntity.class) + .le((boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(busUserEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncDataResponse(); + } + dataResponse.setInvBusUserEntities(busUserEntities); + } + } + + if (dataResponse != null) { + dataResponse.setTaskId(taskId); + } + return dataResponse; + } + /** * 判断是否需要执行 由内向外 * diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index d0ca80459..5c4d5f943 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -76,7 +76,7 @@ public class SyncHeartTask implements SchedulingConfigurer { heartService.uploadThrProducts(null); heartService.uploadSysSetting(null); Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> { - heartService.chooseData(syncDataSetEntity, null, i); + heartService.pushData(syncDataSetEntity, null, i); }); redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); } diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 897eb5cf7..ffa8dc563 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -78,12 +78,12 @@ parameterType="com.glxp.api.entity.auth.InvBusUserEntity"> replace INTO auth_user_bustype - (userId, `subInvCode`, scAction, remark) + (userId, `subInvCode`, scAction, remark,updateTime) values ( #{userId}, #{subInvCode}, #{scAction}, - #{remark} + #{remark},now() ) @@ -118,6 +118,7 @@ UPDATE auth_user_bustype + updateTime=now() userId=#{userId}, subInvCode=#{subInvCode}, scAction=#{scAction}, diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index 9687c240d..c0872f737 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -44,7 +44,7 @@ where id = #{id,jdbcType=INTEGER} - insert into auth_space (code, `name`, type, invStorageCode, invWarehouseCode, `status`, createTime, diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index f081c5ddc..83df162d9 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -152,7 +152,7 @@ ) - insert into auth_warehouse_bustype diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index 350a23b39..0edf07bb3 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -51,7 +51,7 @@ where userid = #{id} and code = #{code} - insert into auth_warehouse_user (code, userId, userName, isDirector) @@ -177,7 +177,7 @@ #{item.isDirector}) - insert into auth_warehouse_user diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 15f356d77..480db8aea 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,4 +1,14 @@ # 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） + +CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); +CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); +CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); +CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime', 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + +CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'userData', 'tinyint ', 1); + CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1);