diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java index 94abc5c7d..3512037cf 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationFailureEventHandler.java @@ -17,9 +17,6 @@ package com.pig4cloud.pigx.auth.handler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.pig4cloud.pigx.admin.api.dto.SysLogDTO; import com.pig4cloud.pigx.admin.api.feign.RemoteLogService; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; @@ -31,13 +28,15 @@ import com.pig4cloud.pigx.common.security.handler.AuthenticationFailureHandler; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; - import org.springframework.http.HttpHeaders; import org.springframework.scheduling.annotation.Async; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Component; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * @author lengleng * @date 2018/10/8 @@ -72,7 +71,7 @@ public class PigxAuthenticationFailureEventHandler implements AuthenticationFail sysLog.setException(authenticationException.getLocalizedMessage()); String header = request.getHeader(HttpHeaders.AUTHORIZATION); sysLog.setServiceId(WebUtils.extractClientId(header).orElse("N/A")); - sysLog.setTenantId(Integer.parseInt(tenantKeyStrResolver.key())); + sysLog.setTenantId(Long.parseLong(tenantKeyStrResolver.key())); logService.saveLog(sysLog, SecurityConstants.FROM_IN); diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationLogoutEventHandler.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationLogoutEventHandler.java index 86d403f6e..db8e90683 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationLogoutEventHandler.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationLogoutEventHandler.java @@ -68,7 +68,7 @@ public class PigxAuthenticationLogoutEventHandler implements AuthenticationLogou // 获取clientId 信息 OAuth2Authentication auth2Authentication = (OAuth2Authentication) authentication; sysLog.setServiceId(auth2Authentication.getOAuth2Request().getClientId()); - sysLog.setTenantId(Integer.parseInt(tenantKeyStrResolver.key())); + sysLog.setTenantId(Long.parseLong(tenantKeyStrResolver.key())); // 保存退出的token String token = request.getHeader(HttpHeaders.AUTHORIZATION); sysLog.setParams(token); diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationSuccessEventHandler.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationSuccessEventHandler.java index c53df1071..a59d44762 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationSuccessEventHandler.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/handler/PigxAuthenticationSuccessEventHandler.java @@ -64,7 +64,7 @@ public class PigxAuthenticationSuccessEventHandler implements AuthenticationSucc sysLog.setParams(username); String header = request.getHeader(HttpHeaders.AUTHORIZATION); sysLog.setServiceId(WebUtils.extractClientId(header).orElse("N/A")); - sysLog.setTenantId(Integer.parseInt(tenantKeyStrResolver.key())); + sysLog.setTenantId(Long.parseLong(tenantKeyStrResolver.key())); logService.saveLog(sysLog, SecurityConstants.FROM_IN); log.info("用户：{} 登录成功", username); diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java index a20223926..55d2aa8c2 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java @@ -38,7 +38,7 @@ public interface CommonConstants { /** * 租户ID */ - Integer TENANT_ID_1 = 1; + Long TENANT_ID_1 = 1L; /** * 删除 @@ -58,7 +58,7 @@ public interface CommonConstants { /** * 菜单树根节点 */ - Integer MENU_TREE_ROOT_ID = -1; + Long MENU_TREE_ROOT_ID = -1L; /** * 编码 diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java index 0f319ee23..3a063e5cd 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java @@ -118,7 +118,7 @@ public class WebUtils extends org.springframework.web.util.WebUtils { RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes(); return ((ServletRequestAttributes) requestAttributes).getRequest(); } - catch (IllegalStateException e) { + catch (Exception e) { return null; } } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java index 84337d27d..c5286e8cf 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java @@ -40,7 +40,7 @@ public class DataScope extends HashMap { /** * 具体的数据范围 */ - private List deptIds = new ArrayList<>(); + private List deptIds = new ArrayList<>(); /** * 是否只查询本部门 diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeHandle.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeHandle.java index 414d9058b..09f80e964 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeHandle.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeHandle.java @@ -32,6 +32,6 @@ public interface DataScopeHandle { * @param deptList 部门ID，如果为空表示没有任何数据权限。 * @return 返回true表示无需进行数据过滤处理，返回false表示需要进行数据过滤 */ - Boolean calcScope(List deptList); + Boolean calcScope(List deptList); } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java index 2f6ac3b43..5cd9d3215 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInnerInterceptor.java @@ -38,7 +38,7 @@ public class DataScopeInnerInterceptor implements InnerInterceptor { } String scopeName = dataScope.getScopeName(); - List deptIds = dataScope.getDeptIds(); + List deptIds = dataScope.getDeptIds(); // 优先获取赋值数据 if (CollUtil.isEmpty(deptIds) && dataScopeHandle.calcScope(deptIds)) { originalSql = String.format("SELECT %s FROM (%s) temp_data_scope", dataScope.getFunc().getType(), diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java index 193df63ae..c85337407 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java @@ -50,7 +50,7 @@ public class PigxDefaultDatascopeHandle implements DataScopeHandle { * @return */ @Override - public Boolean calcScope(List deptList) { + public Boolean calcScope(List deptList) { PigxUser user = SecurityUtils.getUser(); List roleIdList = user.getAuthorities().stream().map(GrantedAuthority::getAuthority) .filter(authority -> authority.startsWith(SecurityConstants.ROLE)) @@ -74,11 +74,11 @@ public class PigxDefaultDatascopeHandle implements DataScopeHandle { if (DataScopeTypeEnum.CUSTOM.getType() == dsType && StrUtil.isNotBlank(role.getDsScope())) { String dsScope = role.getDsScope(); deptList.addAll( - Arrays.stream(dsScope.split(StrUtil.COMMA)).map(Integer::parseInt).collect(Collectors.toList())); + Arrays.stream(dsScope.split(StrUtil.COMMA)).map(Long::parseLong).collect(Collectors.toList())); } // 查询本级及其下级 if (DataScopeTypeEnum.OWN_CHILD_LEVEL.getType() == dsType) { - List deptIdList = dataScopeService.getDescendantList(user.getDeptId()).getData().stream() + List deptIdList = dataScopeService.getDescendantList(user.getDeptId()).getData().stream() .map(SysDeptRelation::getDescendant).collect(Collectors.toList()); deptList.addAll(deptIdList); } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java new file mode 100644 index 000000000..0902499fe --- /dev/null +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/BaseEntity.java @@ -0,0 +1,45 @@ +package com.pig4cloud.pigx.common.data.mybatis; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 抽象实体 + * + * @author lengleng + * @date 2021/8/9 + */ +@Getter +@Setter +public class BaseEntity implements Serializable { + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + +} diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index 988b1c33b..1ed1d96b7 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.common.data.mybatis; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; @@ -123,4 +124,13 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer { return new DruidSqlLogFilter(properties); } + /** + * 审计字段自动填充 + * @return {@link MetaObjectHandler} + */ + @Bean + public MybatisPlusMetaObjectHandler mybatisPlusMetaObjectHandler() { + return new MybatisPlusMetaObjectHandler(); + } + } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java new file mode 100644 index 000000000..dc21728aa --- /dev/null +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java @@ -0,0 +1,78 @@ +package com.pig4cloud.pigx.common.data.mybatis; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.util.ClassUtils; + +import java.nio.charset.Charset; +import java.time.LocalDateTime; +import java.util.Optional; + +/** + * MybatisPlus 自动填充配置 + * + * @author L.cm + */ +@Slf4j +public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { + + @Override + public void insertFill(MetaObject metaObject) { + log.debug("mybatis plus start insert fill ...."); + LocalDateTime now = LocalDateTime.now(); + + fillValIfNullByName("createTime", now, metaObject, false); + fillValIfNullByName("updateTime", now, metaObject, false); + fillValIfNullByName("createBy", getUserName(), metaObject, false); + fillValIfNullByName("updateBy", getUserName(), metaObject, false); + } + + @Override + public void updateFill(MetaObject metaObject) { + log.debug("mybatis plus start update fill ...."); + fillValIfNullByName("updateTime", LocalDateTime.now(), metaObject, true); + fillValIfNullByName("updateBy", getUserName(), metaObject, true); + } + + /** + * 填充值，先判断是否有手动设置，优先手动设置的值，例如：job必须手动设置 + * @param fieldName 属性名 + * @param fieldVal 属性值 + * @param metaObject MetaObject + * @param isCover 是否覆盖原有值,避免更新操作手动入参 + */ + private static void fillValIfNullByName(String fieldName, Object fieldVal, MetaObject metaObject, boolean isCover) { + // 1. 没有 get 方法 + if (!metaObject.hasSetter(fieldName)) { + return; + } + // 2. 如果用户有手动设置的值 + Object userSetValue = metaObject.getValue(fieldName); + String setValueStr = StrUtil.str(userSetValue, Charset.defaultCharset()); + if (StrUtil.isNotBlank(setValueStr) && !isCover) { + return; + } + // 3. field 类型相同时设置 + Class getterType = metaObject.getGetterType(fieldName); + if (ClassUtils.isAssignableValue(getterType, fieldVal)) { + metaObject.setValue(fieldName, fieldVal); + } + } + + /** + * 获取 spring security 当前的用户名 + * @return 当前用户名 + */ + private String getUserName() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (Optional.ofNullable(authentication).isPresent()) { + return authentication.getName(); + } + return null; + } + +} diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/ParamResolver.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/ParamResolver.java index 1a5435462..eae86247c 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/ParamResolver.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/ParamResolver.java @@ -22,8 +22,8 @@ public class ParamResolver { * @param defaultVal 默认值 * @return value */ - public Integer getInt(String key, Integer... defaultVal) { - return checkAndGet(key, Integer.class, defaultVal); + public Long getLong(String key, Long... defaultVal) { + return checkAndGet(key, Long.class, defaultVal); } /** diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java index a61304931..f92f92c88 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java @@ -43,7 +43,7 @@ public class PigxTenantHandler implements TenantLineHandler { */ @Override public Expression getTenantId() { - Integer tenantId = TenantContextHolder.getTenantId(); + Long tenantId = TenantContextHolder.getTenantId(); log.debug("当前租户为 >> {}", tenantId); if (tenantId == null) { @@ -70,7 +70,7 @@ public class PigxTenantHandler implements TenantLineHandler { */ @Override public boolean ignoreTable(String tableName) { - Integer tenantId = TenantContextHolder.getTenantId(); + Long tenantId = TenantContextHolder.getTenantId(); // 租户中ID 为空，查询全部，不进行过滤 if (tenantId == null) { return Boolean.TRUE; diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantBroker.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantBroker.java index 4461abda4..443a6e5be 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantBroker.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantBroker.java @@ -73,8 +73,8 @@ public class TenantBroker { * @param tenant 租户ID * @param func */ - public void runAs(Integer tenant, RunAs func) { - final Integer pre = TenantContextHolder.getTenantId(); + public void runAs(Long tenant, RunAs func) { + final Long pre = TenantContextHolder.getTenantId(); try { log.trace("TenantBroker 切换租户{} -> {}", pre, tenant); TenantContextHolder.setTenantId(tenant); @@ -96,8 +96,8 @@ public class TenantBroker { * @param 返回数据类型 * @return */ - public T applyAs(Integer tenant, ApplyAs func) { - final Integer pre = TenantContextHolder.getTenantId(); + public T applyAs(Long tenant, ApplyAs func) { + final Long pre = TenantContextHolder.getTenantId(); try { log.trace("TenantBroker 切换租户{} -> {}", pre, tenant); TenantContextHolder.setTenantId(tenant); @@ -117,7 +117,7 @@ public class TenantBroker { * @param supplier * @param func */ - public void runAs(Supplier supplier, RunAs func) { + public void runAs(Supplier supplier, RunAs func) { runAs(supplier.get(), func); } @@ -128,7 +128,7 @@ public class TenantBroker { * @param 返回数据类型 * @return */ - public T applyAs(Supplier supplier, ApplyAs func) { + public T applyAs(Supplier supplier, ApplyAs func) { return applyAs(supplier.get(), func); } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolder.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolder.java index fe55ca771..c7363ac72 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolder.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolder.java @@ -27,7 +27,7 @@ import lombok.experimental.UtilityClass; @UtilityClass public class TenantContextHolder { - private final ThreadLocal THREAD_LOCAL_TENANT = new TransmittableThreadLocal<>(); + private final ThreadLocal THREAD_LOCAL_TENANT = new TransmittableThreadLocal<>(); /** * TTL 设置租户ID
@@ -35,7 +35,7 @@ public class TenantContextHolder { * @param tenantId * @see TenantBroker */ - public void setTenantId(Integer tenantId) { + public void setTenantId(Long tenantId) { THREAD_LOCAL_TENANT.set(tenantId); } @@ -43,7 +43,7 @@ public class TenantContextHolder { * 获取TTL中的租户ID * @return */ - public Integer getTenantId() { + public Long getTenantId() { return THREAD_LOCAL_TENANT.get(); } diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java index 544eb8440..b50eee2f0 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java @@ -53,10 +53,10 @@ public class TenantContextHolderFilter extends GenericFilterBean { log.debug("获取header中的租户ID为:{}", headerTenantId); if (StrUtil.isNotBlank(headerTenantId)) { - TenantContextHolder.setTenantId(Integer.parseInt(headerTenantId)); + TenantContextHolder.setTenantId(Long.parseLong(headerTenantId)); } else if (StrUtil.isNotBlank(paramTenantId)) { - TenantContextHolder.setTenantId(Integer.parseInt(paramTenantId)); + TenantContextHolder.setTenantId(Long.parseLong(paramTenantId)); } else { TenantContextHolder.setTenantId(CommonConstants.TENANT_ID_1); diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java index 0704df419..1ca339b89 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java @@ -31,7 +31,6 @@ import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; - import org.springframework.context.ApplicationEventPublisher; /** @@ -71,7 +70,7 @@ public class SysLogAspect { finally { Long endTime = System.currentTimeMillis(); logDTO.setTime(endTime - startTime); - logDTO.setTenantId(Integer.parseInt(tenantKeyStrResolver.key())); + logDTO.setTenantId(Long.parseLong(tenantKeyStrResolver.key())); publisher.publishEvent(new SysLogEvent(logDTO)); } return obj; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java index 49babbb70..bb4a1de38 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java @@ -91,9 +91,9 @@ public class PigxUserAuthenticationConverter implements UserAuthenticationConver String email = MapUtil.getStr(map, SecurityConstants.EMAIL); String nickname = MapUtil.getStr(map, SecurityConstants.NICKNAME); String username = MapUtil.getStr(map, SecurityConstants.DETAILS_USERNAME); - Integer id = MapUtil.getInt(map, SecurityConstants.DETAILS_USER_ID); - Integer deptId = MapUtil.getInt(map, SecurityConstants.DETAILS_DEPT_ID); - Integer tenantId = MapUtil.getInt(map, SecurityConstants.DETAILS_TENANT_ID); + Long id = MapUtil.getLong(map, SecurityConstants.DETAILS_USER_ID); + Long deptId = MapUtil.getLong(map, SecurityConstants.DETAILS_DEPT_ID); + Long tenantId = MapUtil.getLong(map, SecurityConstants.DETAILS_TENANT_ID); String phone = MapUtil.getStr(map, SecurityConstants.DETAILS_PHONE); String avatar = MapUtil.getStr(map, SecurityConstants.DETAILS_AVATAR); PigxUser user = new PigxUser(id, username, deptId, phone, avatar, nickname, name, email, tenantId, N_A, diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java index a2f268c79..14756aaac 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java @@ -39,13 +39,13 @@ public class PigxUser extends User { * 用户ID */ @Getter - private Integer id; + private Long id; /** * 部门ID */ @Getter - private Integer deptId; + private Long deptId; /** * 手机号 @@ -63,7 +63,7 @@ public class PigxUser extends User { * 租户ID */ @Getter - private Integer tenantId; + private Long tenantId; /** * 拓展字段:昵称 @@ -106,11 +106,11 @@ public class PigxUser extends User { * a parameter or as an element in the GrantedAuthority collection */ @JsonCreator - public PigxUser(@JsonProperty("id") Integer id, @JsonProperty("username") String username, - @JsonProperty("deptId") Integer deptId, @JsonProperty("phone") String phone, + public PigxUser(@JsonProperty("id") Long id, @JsonProperty("username") String username, + @JsonProperty("deptId") Long deptId, @JsonProperty("phone") String phone, @JsonProperty("avatar") String avatar, @JsonProperty("nickname") String nickname, @JsonProperty("name") String name, @JsonProperty("email") String email, - @JsonProperty("tenantId") Integer tenantId, @JsonProperty("password") String password, + @JsonProperty("tenantId") Long tenantId, @JsonProperty("password") String password, @JsonProperty("enabled") boolean enabled, @JsonProperty("accountNonExpired") boolean accountNonExpired, @JsonProperty("credentialsNonExpired") boolean credentialsNonExpired, @JsonProperty("accountNonLocked") boolean accountNonLocked, diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java index 5c19f084e..02188a3ad 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java @@ -70,15 +70,15 @@ public class SecurityUtils { * 获取用户角色信息 * @return 角色集合 */ - public List getRoles() { + public List getRoles() { Authentication authentication = getAuthentication(); Collection authorities = authentication.getAuthorities(); - List roleIds = new ArrayList<>(); + List roleIds = new ArrayList<>(); authorities.stream().filter(granted -> StrUtil.startWith(granted.getAuthority(), SecurityConstants.ROLE)) .forEach(granted -> { String id = StrUtil.removePrefix(granted.getAuthority(), SecurityConstants.ROLE); - roleIds.add(Integer.parseInt(id)); + roleIds.add(Long.parseLong(id)); }); return roleIds; } diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java index 3385e97e2..c710adbe6 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java @@ -1,5 +1,6 @@ package com.pig4cloud.pigx.common.sequence.range.impl.db; +import cn.hutool.core.util.RandomUtil; import com.pig4cloud.pigx.common.sequence.exception.SeqException; import javax.sql.DataSource; @@ -19,8 +20,8 @@ abstract class BaseDbHelper { + "gmt_create DATETIME NOT NULL," + "gmt_modified DATETIME NOT NULL," + "PRIMARY KEY (`id`),UNIQUE uk_name (`name`)" + ")"; - private final static String SQL_INSERT_RANGE = "INSERT IGNORE INTO #tableName(name,value,gmt_create,gmt_modified)" - + " VALUE(?,?,?,?)"; + private final static String SQL_INSERT_RANGE = "INSERT IGNORE INTO #tableName(id,name,value,gmt_create,gmt_modified)" + + " VALUE(?,?,?,?,?)"; private final static String SQL_UPDATE_RANGE = "UPDATE #tableName SET value=?,gmt_modified=? WHERE name=? AND " + "value=?"; @@ -66,10 +67,11 @@ abstract class BaseDbHelper { try { conn = dataSource.getConnection(); stmt = conn.prepareStatement(SQL_INSERT_RANGE.replace("#tableName", tableName)); - stmt.setString(1, name); - stmt.setLong(2, stepStart); - stmt.setTimestamp(3, new Timestamp(System.currentTimeMillis())); + stmt.setLong(1, RandomUtil.randomLong()); + stmt.setString(2, name); + stmt.setLong(3, stepStart); stmt.setTimestamp(4, new Timestamp(System.currentTimeMillis())); + stmt.setTimestamp(5, new Timestamp(System.currentTimeMillis())); stmt.executeUpdate(); } catch (SQLException e) { diff --git a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java index 911c6d1ed..43256bb90 100644 --- a/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java +++ b/pigx-common/pigx-common-test/src/main/java/com/pig4cloud/pigx/test/annotation/WithMockOAuth2User.java @@ -1,12 +1,11 @@ package com.pig4cloud.pigx.test.annotation; +import com.pig4cloud.pigx.test.WithMockSecurityContextFactory; +import org.springframework.security.test.context.support.WithSecurityContext; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import com.pig4cloud.pigx.test.WithMockSecurityContextFactory; - -import org.springframework.security.test.context.support.WithSecurityContext; - /** * @author lengleng * @date 2020/9/22 @@ -30,6 +29,6 @@ public @interface WithMockOAuth2User { /** * 租户编号 默认租户编号1 */ - int tenant() default 1; + long tenant() default 1L; -} \ No newline at end of file +} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java index 06047e698..504c4f675 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/SysLogDTO.java @@ -91,6 +91,6 @@ public class SysLogDTO { /** * 租户编号 */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java index 14881baee..ad89c754a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java @@ -40,13 +40,13 @@ public class UserDTO extends SysUser { * 角色ID */ @ApiModelProperty(value = "角色id集合") - private List role; + private List role; /** * 部门id */ @ApiModelProperty(value = "部门id") - private Integer deptId; + private Long deptId; /** * 新密码 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java index a05cc1269..da9886a90 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java @@ -50,6 +50,6 @@ public class UserInfo implements Serializable { * 角色集合 */ @ApiModelProperty(value = "角色标识集合") - private Integer[] roles; + private Long[] roles; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index 11618928a..fbc31ef77 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -47,9 +47,9 @@ public class SysDept extends Model { private static final long serialVersionUID = 1L; - @TableId(value = "dept_id", type = IdType.AUTO) + @TableId(value = "dept_id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "部门id") - private Integer deptId; + private Long deptId; /** * 部门名称 @@ -81,7 +81,7 @@ public class SysDept extends Model { * 父级部门id */ @ApiModelProperty(value = "父级部门id") - private Integer parentId; + private Long parentId; /** * 是否删除 1：已删除 0：正常 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java index 63b3ab8a9..728060a8d 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java @@ -44,12 +44,12 @@ public class SysDeptRelation extends Model { * 祖先节点 */ @ApiModelProperty(value = "祖先节点") - private Integer ancestor; + private Long ancestor; /** * 后代节点 */ @ApiModelProperty(value = "后代节点") - private Integer descendant; + private Long descendant; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index dfd84649c..fdf04a60f 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -16,6 +16,7 @@ */ package com.pig4cloud.pigx.admin.api.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -43,9 +44,9 @@ public class SysDict extends Model { /** * 编号 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "字典编号") - private Integer id; + private Long id; /** * 类型 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java index 397b87625..29115bc59 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java @@ -16,6 +16,7 @@ */ package com.pig4cloud.pigx.admin.api.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -42,15 +43,15 @@ public class SysDictItem extends Model { /** * 编号 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "字典项id") - private Integer id; + private Long id; /** * 所属字典类id */ @ApiModelProperty(value = "所属字典类id") - private Integer dictId; + private Long dictId; /** * 数据值 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java index 975842522..74315adfd 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java @@ -44,7 +44,7 @@ public class SysFile extends Model { /** * 编号 */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "文件编号") private Long id; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java index 46698c286..47034cee2 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java @@ -49,7 +49,7 @@ public class SysLog implements Serializable { /** * 编号 */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ExcelProperty("日志编号") @ApiModelProperty(value = "日志编号") private Long id; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index 51f8149cc..b53f4a5bf 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -50,9 +50,9 @@ public class SysMenu extends Model { /** * 菜单ID */ - @TableId(value = "menu_id", type = IdType.AUTO) + @TableId(value = "menu_id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "菜单id") - private Integer menuId; + private Long menuId; /** * 菜单名称 @@ -72,7 +72,7 @@ public class SysMenu extends Model { */ @NotNull(message = "菜单父ID不能为空") @ApiModelProperty(value = "菜单父id") - private Integer parentId; + private Long parentId; /** * 图标 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java index 42acda534..bb33f201d 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java @@ -45,9 +45,9 @@ public class SysOauthClientDetails extends Model { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") - private Integer id; + private Long id; /** * 客户端ID diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java index f0e9e6983..5574b87c4 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.admin.api.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -44,7 +45,7 @@ public class SysPublicParam extends Model { /** * 编号 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "公共参数编号") private Long publicId; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java index 49dfdb09c..46c6b4ccc 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java @@ -47,9 +47,9 @@ public class SysRole extends Model { private static final long serialVersionUID = 1L; - @TableId(value = "role_id", type = IdType.AUTO) + @TableId(value = "role_id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "角色编号") - private Integer roleId; + private Long roleId; @NotBlank(message = "角色名称不能为空") @ApiModelProperty(value = "角色名称") diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java index 5a9cefdf6..617f75d75 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java @@ -44,12 +44,12 @@ public class SysRoleMenu extends Model { * 角色ID */ @ApiModelProperty(value = "角色id") - private Integer roleId; + private Long roleId; /** * 菜单ID */ @ApiModelProperty(value = "菜单id") - private Integer menuId; + private Long menuId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java index 3c73d1ca0..559665dc6 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java @@ -44,9 +44,9 @@ public class SysRouteConf extends Model { private static final long serialVersionUID = 1L; @JsonIgnore - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") - private Integer id; + private Long id; /** * 路由ID diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index a9a7263f2..e526a010e 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.admin.api.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -44,9 +45,9 @@ public class SysSocialDetails extends Model { /** * 主鍵 */ - @TableId + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") - private Integer id; + private Long id; /** * 类型 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java index d142357f6..35bab3c46 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.admin.api.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -43,9 +44,9 @@ public class SysTenant extends Model { /** * 租户id */ - @TableId + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "租户id") - private Integer id; + private Long id; /** * 租户名称 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index 7353649b5..197beb1cf 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -49,7 +49,7 @@ public class SysUser implements Serializable { */ @TableId(value = "user_id", type = IdType.AUTO) @ApiModelProperty(value = "主键id") - private Integer userId; + private Long userId; /** * 用户名 @@ -111,13 +111,13 @@ public class SysUser implements Serializable { * 部门ID */ @ApiModelProperty(value = "用户所属部门id") - private Integer deptId; + private Long deptId; /** * 租户ID */ @ApiModelProperty(value = "用户所属租户id") - private Integer tenantId; + private Long tenantId; /** * 微信openid diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java index 83f7b6c78..a3d6d1a99 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java @@ -44,12 +44,12 @@ public class SysUserRole extends Model { * 用户ID */ @ApiModelProperty(value = "用户id") - private Integer userId; + private Long userId; /** * 角色ID */ @ApiModelProperty(value = "角色id") - private Integer roleId; + private Long roleId; } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java index b0d745428..1a6d5ea1a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDataScopeService.java @@ -52,6 +52,6 @@ public interface RemoteDataScopeService { * @return */ @GetMapping("/dept/getDescendantList/{deptId}") - R> getDescendantList(@PathVariable("deptId") Integer deptId); + R> getDescendantList(@PathVariable("deptId") Long deptId); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java index 565fa8cc9..bb450814c 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/RoleVO.java @@ -31,7 +31,7 @@ public class RoleVO { /** * 角色id */ - private Integer roleId; + private Long roleId; /** * 菜单列表 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java index 771597691..fabdfa96a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java @@ -44,7 +44,7 @@ public class UserVO implements Serializable { * 主键ID */ @ApiModelProperty(value = "主键") - private Integer userId; + private Long userId; /** * 用户名 @@ -117,13 +117,13 @@ public class UserVO implements Serializable { * 部门ID */ @ApiModelProperty(value = "所属部门") - private Integer deptId; + private Long deptId; /** * 租户ID */ @ApiModelProperty(value = "所属租户") - private Integer tenantId; + private Long tenantId; /** * 部门名称 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java index 98c2ef075..3e5ffb64f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java @@ -58,7 +58,7 @@ public class SysDeptController { * @return SysDept */ @GetMapping("/{id}") - public R getById(@PathVariable Integer id) { + public R getById(@PathVariable Long id) { return R.ok(sysDeptService.getById(id)); } @@ -91,7 +91,7 @@ public class SysDeptController { @SysLog("删除部门") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_dept_del')") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return R.ok(sysDeptService.removeDeptById(id)); } @@ -113,7 +113,7 @@ public class SysDeptController { * @return 返回子级 */ @GetMapping(value = "/getDescendantList/{deptId}") - public R getDescendantList(@PathVariable Integer deptId) { + public R getDescendantList(@PathVariable Long deptId) { return R.ok( relationService.list(Wrappers.lambdaQuery().eq(SysDeptRelation::getAncestor, deptId))); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java index 9d264cac1..8cf62469e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java @@ -62,7 +62,7 @@ public class SysDictController { * @return 字典信息 */ @GetMapping("/{id}") - public R getById(@PathVariable Integer id) { + public R getById(@PathVariable Long id) { return R.ok(sysDictService.getById(id)); } @@ -107,7 +107,7 @@ public class SysDictController { @SysLog("删除字典") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_dict_del')") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return sysDictService.removeDict(id); } @@ -140,7 +140,7 @@ public class SysDictController { * @return R */ @GetMapping("/item/{id}") - public R getDictItemById(@PathVariable("id") Integer id) { + public R getDictItemById(@PathVariable("id") Long id) { return R.ok(sysDictItemService.getById(id)); } @@ -174,7 +174,7 @@ public class SysDictController { */ @SysLog("删除字典项") @DeleteMapping("/item/{id}") - public R removeDictItemById(@PathVariable Integer id) { + public R removeDictItemById(@PathVariable Long id) { return sysDictItemService.removeDictItem(id); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java index 24887bbea..154ded204 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java @@ -53,7 +53,7 @@ public class SysMenuController { * @return 当前用户的树形菜单 */ @GetMapping - public R getUserMenu(String type, Integer parentId) { + public R getUserMenu(String type, Long parentId) { // 获取符合条件的菜单 Set all = new HashSet<>(); @@ -68,7 +68,7 @@ public class SysMenuController { * @return 树形菜单 */ @GetMapping(value = "/tree") - public R getTree(boolean lazy, Integer parentId) { + public R getTree(boolean lazy, Long parentId) { return R.ok(sysMenuService.treeMenu(lazy, parentId)); } @@ -78,7 +78,7 @@ public class SysMenuController { * @return 属性集合 */ @GetMapping("/tree/{roleId}") - public R getRoleTree(@PathVariable Integer roleId) { + public R getRoleTree(@PathVariable Long roleId) { return R.ok( sysMenuService.findMenuByRoleId(roleId).stream().map(SysMenu::getMenuId).collect(Collectors.toList())); } @@ -89,7 +89,7 @@ public class SysMenuController { * @return 菜单详细信息 */ @GetMapping("/{id}") - public R getById(@PathVariable Integer id) { + public R getById(@PathVariable Long id) { return R.ok(sysMenuService.getById(id)); } @@ -114,7 +114,7 @@ public class SysMenuController { @SysLog("删除菜单") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_menu_del')") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return sysMenuService.removeMenuById(id); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java index 878cc39cf..bfcaad7e2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java @@ -56,7 +56,7 @@ public class SysRoleController { * @return 角色信息 */ @GetMapping("/{id}") - public R getById(@PathVariable Integer id) { + public R getById(@PathVariable Long id) { return R.ok(sysRoleService.getById(id)); } @@ -95,7 +95,7 @@ public class SysRoleController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_role_del')") @CacheEvict(value = CacheConstants.ROLE_DETAILS, allEntries = true) - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return R.ok(sysRoleService.removeRoleById(id)); } @@ -137,7 +137,7 @@ public class SysRoleController { * @return */ @PostMapping("/getRoleList") - public R getRoleList(@RequestBody List roleIdList) { + public R getRoleList(@RequestBody List roleIdList) { return R.ok(sysRoleService.findRolesByRoleIds(roleIdList, CollUtil.join(roleIdList, StrUtil.UNDERLINE))); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java index 0b94a8dc7..010f34a67 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java @@ -100,7 +100,7 @@ public class SysSocialDetailsController { @SysLog("删除三方信息") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_social_details_del')") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return R.ok(sysSocialDetailsService.removeById(id)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java index be01c6d21..1423f6502 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java @@ -66,7 +66,7 @@ public class SysTenantController { * @return R */ @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Long id) { return R.ok(sysTenantService.getById(id)); } @@ -105,7 +105,7 @@ public class SysTenantController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('admin_systenant_del')") @CacheEvict(value = CacheConstants.TENANT_DETAILS, allEntries = true) - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return R.ok(sysTenantService.removeById(id)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java index 91b2f77ea..9a21a871e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.admin.controller; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -29,8 +28,6 @@ import com.pig4cloud.pigx.admin.api.vo.UserExcelVO; import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.SysUserService; import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.common.data.datascope.DataScope; -import com.pig4cloud.pigx.common.data.datascope.DataScopeFuncEnum; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; @@ -95,7 +92,7 @@ public class SysUserController { * @return 用户信息 */ @GetMapping("/{id}") - public R user(@PathVariable Integer id) { + public R user(@PathVariable Long id) { return R.ok(userService.selectUserVoById(id)); } @@ -121,7 +118,7 @@ public class SysUserController { @PreAuthorize("@pms.hasPermission('sys_user_del')") @ApiOperation(value = "删除用户", notes = "根据ID删除用户") @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "int", paramType = "path") - public R userDel(@PathVariable Integer id) { + public R userDel(@PathVariable Long id) { SysUser sysUser = userService.getById(id); return R.ok(userService.deleteUserById(sysUser)); } @@ -205,13 +202,4 @@ public class SysUserController { return userService.importUser(excelVOList, bindingResult); } - @Inner(value = false) - @GetMapping("/count") - public R get() { - DataScope dataScope = new DataScope(); - dataScope.setFunc(DataScopeFuncEnum.COUNT); - dataScope.setDeptIds(CollUtil.newArrayList(14, 15, 16)); - return R.ok(userMapper.selectCountByScope(Wrappers.emptyWrapper(), dataScope)); - } - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java index 4b7a6f956..85637841f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java @@ -38,7 +38,7 @@ public interface SysDeptRelationMapper extends PigxBaseMapper { * 删除部门关系表数据 * @param id 部门ID */ - void deleteDeptRelationsById(Integer id); + void deleteDeptRelationsById(Long id); /** * 更改部分关系表数据 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java index c7c9cdf05..e27f676e0 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java @@ -41,7 +41,7 @@ public interface SysMenuMapper extends PigxBaseMapper { * @param roleId 角色ID * @return */ - List listMenusByRoleId(Integer roleId); + List listMenusByRoleId(Long roleId); /** * 通过角色ID查询权限 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java index 4989814a6..7752f8b6e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java @@ -41,6 +41,6 @@ public interface SysRoleMapper extends PigxBaseMapper { * @param userId * @return */ - List listRolesByUserId(Integer userId); + List listRolesByUserId(Long userId); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java index 98562c5b8..2b5ffec8b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java @@ -63,7 +63,7 @@ public interface SysUserMapper extends PigxBaseMapper { * @param id 用户ID * @return userVo */ - UserVO getUserVoById(Integer id); + UserVO getUserVoById(Long id); /** * 查询用户列表 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java index 794387d65..4080595c1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java @@ -42,6 +42,6 @@ public interface SysUserRoleMapper extends PigxBaseMapper { * @author 寻欢·李 * @date 2017年12月7日 16:31:38 */ - Boolean deleteByUserId(@Param("userId") Integer userId); + Boolean deleteByUserId(@Param("userId") Long userId); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java index 5623a9788..4b65ea593 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java @@ -43,7 +43,7 @@ public interface SysDeptRelationService extends IService { * 通过ID删除部门关系 * @param id */ - void deleteAllDeptRealtion(Integer id); + void deleteAllDeptRealtion(Long id); /** * 更新部门关系 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java index c2de05ea8..3c7f94fab 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java @@ -39,7 +39,7 @@ public interface SysDeptService extends IService { * 查询部门树菜单 * @return 树 */ - List> selectTree(); + List> selectTree(); /** * 添加信息部门 @@ -53,7 +53,7 @@ public interface SysDeptService extends IService { * @param id 部门 ID * @return 成功、失败 */ - Boolean removeDeptById(Integer id); + Boolean removeDeptById(Long id); /** * 更新部门 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictItemService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictItemService.java index 96989135f..dc2f37f2d 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictItemService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictItemService.java @@ -33,7 +33,7 @@ public interface SysDictItemService extends IService { * @param id 字典项ID * @return */ - R removeDictItem(Integer id); + R removeDictItem(Long id); /** * 更新字典项 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java index 9347b0beb..654ed33af 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java @@ -33,7 +33,7 @@ public interface SysDictService extends IService { * @param id * @return */ - R removeDict(Integer id); + R removeDict(Long id); /** * 更新字典 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java index 4311757ad..a244c3538 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java @@ -42,14 +42,14 @@ public interface SysMenuService extends IService { * @param roleId 角色ID * @return 菜单列表 */ - List findMenuByRoleId(Integer roleId); + List findMenuByRoleId(Long roleId); /** * 级联删除菜单 * @param id 菜单ID * @return 成功、失败 */ - R removeMenuById(Integer id); + R removeMenuById(Long id); /** * 更新菜单信息 @@ -64,7 +64,7 @@ public interface SysMenuService extends IService { * @param parentId 父节点ID * @return */ - List> treeMenu(boolean lazy, Integer parentId); + List> treeMenu(boolean lazy, Long parentId); /** * 查询菜单 @@ -72,6 +72,6 @@ public interface SysMenuService extends IService { * @param parentId * @return */ - List> filterMenu(Set voSet, String type, Integer parentId); + List> filterMenu(Set voSet, String type, Long parentId); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java index af2a190c1..636a91c0d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java @@ -39,6 +39,6 @@ public interface SysRoleMenuService extends IService { * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔 * @return */ - Boolean saveRoleMenus(String role, Integer roleId, String menuIds); + Boolean saveRoleMenus(String role, Long roleId, String menuIds); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java index 82b40202e..16c26d60d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java @@ -40,7 +40,7 @@ public interface SysRoleService extends IService { * @param userId * @return */ - List findRolesByUserId(Integer userId); + List findRolesByUserId(Long userId); /** * 根据角色ID 查询角色列表 @@ -48,14 +48,14 @@ public interface SysRoleService extends IService { * @param key 缓存key * @return */ - List findRolesByRoleIds(List roleIdList, String key); + List findRolesByRoleIds(List roleIdList, String key); /** * 通过角色ID，删除角色 * @param id * @return */ - Boolean removeRoleById(Integer id); + Boolean removeRoleById(Long id); /** * 根据角色菜单列表 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java index 1b0362282..3f932419e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java @@ -39,6 +39,6 @@ public interface SysUserRoleService extends IService { * @author 寻欢·李 * @date 2017年12月7日 16:31:38 */ - Boolean deleteByUserId(Integer userId); + Boolean deleteByUserId(Long userId); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java index 3133e71ad..4bcbcc1ff 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java @@ -79,7 +79,7 @@ public interface SysUserService extends IService { * @param id 用户ID * @return 用户信息 */ - UserVO selectUserVoById(Integer id); + UserVO selectUserVoById(Long id); /** * 查询上级部门的用户信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java index d109ff911..70209d9a8 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java @@ -78,7 +78,7 @@ public class SysDeptRelationServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean removeDeptById(Integer id) { + public Boolean removeDeptById(Long id) { // 级联删除部门 - List idList = sysDeptRelationService + List idList = sysDeptRelationService .list(Wrappers.query().lambda().eq(SysDeptRelation::getAncestor, id)).stream() .map(SysDeptRelation::getDescendant).collect(Collectors.toList()); @@ -118,18 +118,18 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @return 树 */ @Override - public List> selectTree() { + public List> selectTree() { // 查询全部部门 List deptAllList = deptMapper.selectList(Wrappers.emptyWrapper()); // 查询数据权限内部门 - List deptOwnIdList = deptMapper.selectListByScope(Wrappers.emptyWrapper(), new DataScope()).stream() + List deptOwnIdList = deptMapper.selectListByScope(Wrappers.emptyWrapper(), new DataScope()).stream() .map(SysDept::getDeptId).collect(Collectors.toList()); // 权限内部门 - List> collect = deptAllList.stream() + List> collect = deptAllList.stream() .filter(dept -> dept.getDeptId().intValue() != dept.getParentId()) .sorted(Comparator.comparingInt(SysDept::getSort)).map(dept -> { - TreeNode treeNode = new TreeNode(); + TreeNode treeNode = new TreeNode(); treeNode.setId(dept.getDeptId()); treeNode.setParentId(dept.getParentId()); treeNode.setName(dept.getName()); @@ -142,7 +142,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl return treeNode; }).collect(Collectors.toList()); - return TreeUtil.build(collect, 0); + return TreeUtil.build(collect, 0L); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java index 729ff17bf..484d8c541 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictItemServiceImpl.java @@ -48,7 +48,7 @@ public class SysDictItemServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true) - public R removeDict(Integer id) { + public R removeDict(Long id) { SysDict dict = this.getById(id); // 系统内置 if (DictTypeEnum.SYSTEM.getType().equals(dict.getSystem())) { diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index 33212bfe8..a1c45e1f9 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -65,14 +65,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId", unless = "#result.isEmpty()") - public List findMenuByRoleId(Integer roleId) { + public List findMenuByRoleId(Long roleId) { return baseMapper.listMenusByRoleId(roleId); } @Override @Transactional(rollbackFor = Exception.class) @CacheEvict(value = CacheConstants.MENU_DETAILS, allEntries = true) - public R removeMenuById(Integer id) { + public R removeMenuById(Long id) { // 查询父节点为当前节点的节点 List menuList = this.list(Wrappers.query().lambda().eq(SysMenu::getParentId, id)); if (CollUtil.isNotEmpty(menuList)) { @@ -97,18 +97,18 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @return */ @Override - public List> treeMenu(boolean lazy, Integer parentId) { + public List> treeMenu(boolean lazy, Long parentId) { if (!lazy) { - List> collect = baseMapper + List> collect = baseMapper .selectList(Wrappers.lambdaQuery().orderByAsc(SysMenu::getSort)).stream() .map(getNodeFunction()).collect(Collectors.toList()); return TreeUtil.build(collect, CommonConstants.MENU_TREE_ROOT_ID); } - Integer parent = parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId; + Long parent = parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId; - List> collect = baseMapper + List> collect = baseMapper .selectList( Wrappers.lambdaQuery().eq(SysMenu::getParentId, parent).orderByAsc(SysMenu::getSort)) .stream().map(getNodeFunction()).collect(Collectors.toList()); @@ -124,17 +124,17 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @return */ @Override - public List> filterMenu(Set all, String type, Integer parentId) { - List> collect = all.stream().filter(menuTypePredicate(type)).map(getNodeFunction()) + public List> filterMenu(Set all, String type, Long parentId) { + List> collect = all.stream().filter(menuTypePredicate(type)).map(getNodeFunction()) .collect(Collectors.toList()); - Integer parent = parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId; + Long parent = parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId; return TreeUtil.build(collect, parent); } @NotNull - private Function> getNodeFunction() { + private Function> getNodeFunction() { return menu -> { - TreeNode node = new TreeNode<>(); + TreeNode node = new TreeNode<>(); node.setId(menu.getMenuId()); node.setName(menu.getName()); node.setParentId(menu.getParentId()); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index aaa90ebb9..42ef38b19 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -59,7 +59,7 @@ public class SysRoleMenuServiceImpl extends ServiceImplquery().lambda().eq(SysRoleMenu::getRoleId, roleId)); if (StrUtil.isBlank(menuIds)) { @@ -68,7 +68,7 @@ public class SysRoleMenuServiceImpl extends ServiceImpl roleMenuList = Arrays.stream(menuIds.split(",")).map(menuId -> { SysRoleMenu roleMenu = new SysRoleMenu(); roleMenu.setRoleId(roleId); - roleMenu.setMenuId(Integer.valueOf(menuId)); + roleMenu.setMenuId(Long.valueOf(menuId)); return roleMenu; }).collect(Collectors.toList()); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java index a2d2ef1da..abda10e42 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java @@ -55,7 +55,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return */ @Override - public List findRolesByUserId(Integer userId) { + public List findRolesByUserId(Long userId) { return baseMapper.listRolesByUserId(userId); } @@ -67,7 +67,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override @Cacheable(value = CacheConstants.ROLE_DETAILS, key = "#key") - public List findRolesByRoleIds(List roleIdList, String key) { + public List findRolesByRoleIds(List roleIdList, String key) { return baseMapper.selectBatchIds(roleIdList); } @@ -78,7 +78,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean removeRoleById(Integer id) { + public Boolean removeRoleById(Long id) { roleMenuService.remove(Wrappers.update().lambda().eq(SysRoleMenu::getRoleId, id)); return this.removeById(id); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index d0d42c95c..7ed1f526d 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -101,7 +101,7 @@ public class SysTenantServiceImpl extends ServiceImpl dictList = new ArrayList<>(32); - List dictIdList = new ArrayList<>(32); + List dictIdList = new ArrayList<>(32); List dictItemList = new ArrayList<>(64); List menuList = new ArrayList<>(128); List clientDetailsList = new ArrayList<>(16); @@ -136,7 +136,7 @@ public class SysTenantServiceImpl extends ServiceImpl menuList, Integer originParentId, Integer targetParentId) { + private void saveTenantMenu(List menuList, Long originParentId, Long targetParentId) { menuList.stream().filter(menu -> menu.getParentId().equals(originParentId)).forEach(menu -> { // 保存菜单原始menuId， 方便查询子节点使用 - Integer originMenuId = menu.getMenuId(); + Long originMenuId = menu.getMenuId(); menu.setMenuId(null); menu.setParentId(targetParentId); menuService.save(menu); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java index d7fb253a5..88252c76b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java @@ -44,7 +44,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl impl UserInfo userInfo = new UserInfo(); userInfo.setSysUser(sysUser); // 设置角色列表 （ID） - List roleIds = sysRoleService.findRolesByUserId(sysUser.getUserId()).stream().map(SysRole::getRoleId) + List roleIds = sysRoleService.findRolesByUserId(sysUser.getUserId()).stream().map(SysRole::getRoleId) .collect(Collectors.toList()); - userInfo.setRoles(ArrayUtil.toArray(roleIds, Integer.class)); + userInfo.setRoles(ArrayUtil.toArray(roleIds, Long.class)); // 设置权限列表（menu.permission） Set permissions = new HashSet<>(); @@ -139,7 +139,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return 用户信息 */ @Override - public UserVO selectUserVoById(Integer id) { + public UserVO selectUserVoById(Long id) { return baseMapper.getUserVoById(id); } @@ -216,7 +216,7 @@ public class SysUserServiceImpl extends ServiceImpl impl return null; } - Integer parentId = sysDept.getParentId(); + Long parentId = sysDept.getParentId(); return this.list(Wrappers.query().lambda().eq(SysUser::getDeptId, parentId)); } @@ -318,7 +318,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 根据部门名称查询部门ID userDTO.setDeptId(deptOptional.get().getDeptId()); // 根据角色名称查询角色ID - List roleIdList = roleCollList.stream().map(SysRole::getRoleId).collect(Collectors.toList()); + List roleIdList = roleCollList.stream().map(SysRole::getRoleId).collect(Collectors.toList()); userDTO.setRole(roleIdList); // 插入用户 this.saveUser(userDTO); diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java index c8aa7ae2e..8c6b15514 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java @@ -65,7 +65,7 @@ public class GenDsConfController { * @return R */ @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Long id) { return R.ok(datasourceConfService.getById(id)); } @@ -100,7 +100,7 @@ public class GenDsConfController { */ @SysLog("删除数据源表") @DeleteMapping("/{id}") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return R.ok(datasourceConfService.removeByDsId(id)); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java index e8e9c7a36..7f1a23c9c 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenFormConfController.java @@ -62,7 +62,7 @@ public class GenFormConfController { */ @ApiOperation(value = "通过id查询", notes = "通过id查询") @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Long id) { return R.ok(genRecordService.getById(id)); } @@ -113,7 +113,7 @@ public class GenFormConfController { @SysLog("通过id删除生成记录") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('gen_form_del')") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return R.ok(genRecordService.removeById(id)); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java index c60caf818..c85100a71 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java @@ -16,6 +16,7 @@ */ package com.pig4cloud.pigx.codegen.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -41,8 +42,8 @@ public class GenDatasourceConf extends Model { /** * 主键 */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 名称 diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java index 219aaa8a3..d611d8e17 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.codegen.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -44,9 +45,9 @@ public class GenFormConf extends Model { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "ID") - private Integer id; + private Long id; /** * 表名称 @@ -82,6 +83,6 @@ public class GenFormConf extends Model { * 所属租户 */ @ApiModelProperty(value = "所属租户", hidden = true) - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenDatasourceConfService.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenDatasourceConfService.java index 91e6a5482..0d4cbf7de 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenDatasourceConfService.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenDatasourceConfService.java @@ -60,6 +60,6 @@ public interface GenDatasourceConfService extends IService { * @param dsId 数据源ID * @return */ - Boolean removeByDsId(Integer dsId); + Boolean removeByDsId(Long dsId); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java index e01235948..898688d38 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java @@ -105,7 +105,7 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl { /** * 任务id */ - @TableId(value = "job_id", type = IdType.AUTO) - private Integer jobId; + @TableId(value = "job_id", type = IdType.ASSIGN_ID) + private Long jobId; /** * 任务名称 @@ -151,7 +151,7 @@ public class SysJob extends Model { /** * 租户id */ - private Integer tenantId; + private Long tenantId; /** * 备注信息 diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java index e30146c83..7f93269a2 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java @@ -46,13 +46,13 @@ public class SysJobLog extends Model { /** * 任务日志ID */ - @TableId(value = "job_log_id", type = IdType.AUTO) - private Integer jobLogId; + @TableId(value = "job_log_id", type = IdType.ASSIGN_ID) + private Long jobLogId; /** * 任务id */ - private Integer jobId; + private Long jobId; /** * 任务名称 @@ -127,6 +127,6 @@ public class SysJobLog extends Model { /** * 租户id */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java index ee27396fe..840769970 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInitConfigRunner.java @@ -53,7 +53,7 @@ public class WxMpInitConfigRunner { /** * 保存 appid-tenantId 的对应关系 */ - private static Map tenants = Maps.newHashMap(); + private static final Map tenants = Maps.newHashMap(); private final RemoteTenantService tenantService; @@ -169,7 +169,7 @@ public class WxMpInitConfigRunner { return container; } - public static Map getTenants() { + public static Map getTenants() { return tenants; } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java index 08b7fadf5..a66c6af8f 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java @@ -60,7 +60,7 @@ public class WxAccountController { * @return R */ @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Long id) { return R.ok(wxAccountService.getById(id)); } @@ -100,7 +100,7 @@ public class WxAccountController { @SysLog("删除公众号账户") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('mp_wxaccount_del')") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { wxAccountService.removeById(id); redisTemplate.convertAndSend(CacheConstants.MP_REDIS_RELOAD_TOPIC, "重新加载公众号配置"); return R.ok(); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java index f6ea79e42..5ab7d8793 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java @@ -56,7 +56,7 @@ public class WxAccountFansController { * @return R */ @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Long id) { return R.ok(wxAccountFansService.getById(id)); } @@ -92,7 +92,7 @@ public class WxAccountFansController { @SysLog("删除微信公众号粉丝") @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('mp_wxaccountfans_del')") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { return R.ok(wxAccountFansService.removeById(id)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java index 3738ceae5..e22fc177c 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java @@ -43,7 +43,7 @@ public class WxAutoReplyController { * @return R */ @GetMapping("/{id}") - public R getById(@PathVariable("id") String id) { + public R getById(@PathVariable("id") Long id) { return R.ok(wxAutoReplyService.getById(id)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java index a99854704..864f428d7 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java @@ -56,7 +56,7 @@ public class WxFansMsgController { * @return R */ @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Long id) { return R.ok(wxMsgService.getById(id)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java index 4463bebd4..6f8302f5c 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java @@ -16,8 +16,7 @@ */ package com.pig4cloud.pigx.mp.entity; -import java.time.LocalDateTime; - +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -26,6 +25,8 @@ import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; + /** * 公众号账户 * @@ -41,8 +42,8 @@ public class WxAccount extends Model { /** * 主键 */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 公众号名称 @@ -104,6 +105,6 @@ public class WxAccount extends Model { /** * 租户 */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java index 2360203a4..a5343a3c8 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java @@ -16,6 +16,7 @@ */ package com.pig4cloud.pigx.mp.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -39,8 +40,8 @@ public class WxAccountFans extends Model { /** * 主键 */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 用户标识 @@ -100,7 +101,7 @@ public class WxAccountFans extends Model { /** * 微信公众号ID */ - private Integer wxAccountId; + private Long wxAccountId; /** * 微信公众号appid diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java index 6163efbc1..58eca6e6f 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java @@ -1,5 +1,6 @@ package com.pig4cloud.pigx.mp.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -25,8 +26,8 @@ public class WxAutoReply extends Model { /** * 主键 */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 公众号ID diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java index 9993114b1..719c84fbb 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxFansMsgRes.java @@ -16,6 +16,7 @@ */ package com.pig4cloud.pigx.mp.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; @@ -38,13 +39,13 @@ public class WxFansMsgRes extends Model { /** * 主键 */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 粉丝消息ID */ - private Integer fansMsgId; + private Long fansMsgId; /** * 回复内容 @@ -54,7 +55,7 @@ public class WxFansMsgRes extends Model { /** * 用户ID */ - private Integer userId; + private Long userId; /** * 用户名 diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java index d565a81d0..6f66401d0 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java @@ -16,6 +16,7 @@ */ package com.pig4cloud.pigx.mp.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -39,8 +40,8 @@ public class WxMpMenu extends Model { /** * 主键 */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 菜单 @@ -50,7 +51,7 @@ public class WxMpMenu extends Model { /** * 微信公众号ID */ - private Integer wxAccountId; + private Long wxAccountId; /** * 微信公众号appid diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java index 16318de0c..73ec30ec9 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java @@ -1,5 +1,6 @@ package com.pig4cloud.pigx.mp.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -26,8 +27,8 @@ public class WxMsg extends Model { /** * 主键 */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 创建时间 @@ -67,7 +68,7 @@ public class WxMsg extends Model { /** * 微信用户ID */ - private Integer wxUserId; + private Long wxUserId; /** * 昵称 diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java index 7541d0c9a..c78e0da13 100755 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java @@ -61,7 +61,7 @@ public class LeaveBillController { * @return R */ @GetMapping("/{leaveId}") - public R getById(@PathVariable("leaveId") Integer leaveId) { + public R getById(@PathVariable("leaveId") Long leaveId) { return R.ok(leaveBillService.getById(leaveId)); } @@ -95,7 +95,7 @@ public class LeaveBillController { * @return R */ @DeleteMapping("/{leaveId}") - public R removeById(@PathVariable Integer leaveId) { + public R removeById(@PathVariable Long leaveId) { return R.ok(leaveBillService.removeById(leaveId)); } @@ -105,7 +105,7 @@ public class LeaveBillController { * @return R */ @GetMapping("/submit/{leaveId}") - public R submit(@PathVariable("leaveId") Integer leaveId) { + public R submit(@PathVariable("leaveId") Long leaveId) { return R.ok(processService.saveStartProcess(leaveId)); } diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java index 659f4add5..234f455d0 100755 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java @@ -44,8 +44,8 @@ public class LeaveBill extends Model { /** * ID */ - @TableId(type = IdType.AUTO) - private Integer leaveId; + @TableId(type = IdType.ASSIGN_ID) + private Long leaveId; /** * 申请人 diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java index c0b3977fb..d552dd9ae 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/listener/LeaveProcessTaskListener.java @@ -59,7 +59,7 @@ public class LeaveProcessTaskListener implements TaskListener { } else { List userList = result.getData().stream().map(SysUser::getUsername).collect(Collectors.toList()); - List userIdList = result.getData().stream().map(SysUser::getUserId).collect(Collectors.toList()); + List userIdList = result.getData().stream().map(SysUser::getUserId).collect(Collectors.toList()); log.info("当前任务 {}，由 {}处理", delegateTask.getId(), userList); delegateTask.addCandidateUsers(userList); remindUserList.addAll(userIdList); diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java index a714d3262..9d1305670 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java @@ -65,6 +65,6 @@ public interface ProcessService { * @param leaveId * @return */ - Boolean saveStartProcess(Integer leaveId); + Boolean saveStartProcess(Long leaveId); } diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java index eaf92d7c5..a7310c021 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java @@ -140,7 +140,7 @@ public class ActTaskServiceImpl implements ActTaskService { public Boolean submitTask(LeaveBillDto leaveBillDto) { String taskId = leaveBillDto.getTaskId(); String message = leaveBillDto.getComment(); - Integer id = leaveBillDto.getLeaveId(); + Long id = leaveBillDto.getLeaveId(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java index d9f116c1c..eae32931f 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java @@ -156,7 +156,7 @@ public class ProcessServiceImpl implements ProcessService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean saveStartProcess(Integer leaveId) { + public Boolean saveStartProcess(Long leaveId) { LeaveBill leaveBill = leaveBillMapper.selectById(leaveId); leaveBill.setState(TaskStatusEnum.CHECK.getStatus()); diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java index 80ad7e9d8..e1522ae4b 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java @@ -17,8 +17,7 @@ package com.pig4cloud.pigx.pay.entity; -import java.time.LocalDateTime; - +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -28,6 +27,8 @@ import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; + /** * 渠道 * @@ -45,8 +46,8 @@ public class PayChannel extends Model { /** * 渠道主键ID */ - @TableId - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 应用ID @@ -114,6 +115,6 @@ public class PayChannel extends Model { /** * 租户ID */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java index 451af19ab..e07fde08c 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.pay.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -44,8 +45,8 @@ public class PayGoodsOrder extends Model { /** * 商品订单ID */ - @TableId - private String goodsOrderId; + @TableId(type = IdType.ASSIGN_ID) + private Long goodsOrderId; /** * 商品ID @@ -96,6 +97,6 @@ public class PayGoodsOrder extends Model { /** * 租户ID */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java index ca75c202c..17418d3bd 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.pay.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -44,7 +45,7 @@ public class PayNotifyRecord extends Model { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** @@ -91,6 +92,6 @@ public class PayNotifyRecord extends Model { /** * 租户ID */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java index 54c7f3369..f1f48853a 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.pay.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -44,13 +45,13 @@ public class PayRefundOrder extends Model { /** * 退款订单号 */ - @TableId - private String refundOrderId; + @TableId(type = IdType.ASSIGN_ID) + private Long refundOrderId; /** * 支付订单号 */ - private String payOrderId; + private Long payOrderId; /** * 渠道支付单号 @@ -191,6 +192,6 @@ public class PayRefundOrder extends Model { /** * 租户ID */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java index 31fd13587..5af0013c4 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java @@ -45,7 +45,7 @@ public class PayTradeOrder extends Model { /** * 支付订单号 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_ID) private String orderId; /** @@ -167,6 +167,6 @@ public class PayTradeOrder extends Model { /** * 租户ID */ - private Integer tenantId; + private Long tenantId; } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java index 3d6962b9e..3ada1db0f 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java @@ -17,8 +17,6 @@ package com.pig4cloud.pigx.pay.handler.impl; -import java.util.Map; - import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.EnumUtil; import cn.hutool.core.util.StrUtil; @@ -37,6 +35,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Map; + /** * @author lengleng * @date 2019-06-27 @@ -62,7 +62,7 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand */ @Override public void before(Map params) { - Integer tenant = MapUtil.getInt(params, "passback_params"); + Long tenant = MapUtil.getLong(params, "passback_params"); TenantContextHolder.setTenantId(tenant); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java index 993b5c791..ebc74bee2 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java @@ -17,9 +17,6 @@ package com.pig4cloud.pigx.pay.handler.impl; -import java.util.HashMap; -import java.util.Map; - import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.EnumUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -38,6 +35,9 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; + /** * @author lengleng * @date 2019-06-27 @@ -63,7 +63,7 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand */ @Override public void before(Map params) { - Integer tenant = MapUtil.getInt(params, "attach"); + Long tenant = MapUtil.getLong(params, "attach"); TenantContextHolder.setTenantId(tenant); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java index 3d18aeecf..2df8ab91e 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java @@ -1,7 +1,5 @@ package com.pig4cloud.pigx.pay.handler.impl; -import java.util.Map; - import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; @@ -21,6 +19,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Map; + /** * @author lengleng * @date 2021/1/4 @@ -46,8 +46,10 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb */ @Override public void before(Map params) { - Integer tenant = MapUtil.getInt(params, "attach"); + Long tenant = MapUtil.getLong(params, "attach"); TenantContextHolder.setTenantId(tenant); + + } /**