功能提交，修改未全局唯一编号

common/fire-dto/src/main/java/com/fire/dto/AdditionalPayment.java

@@ -28,9 +28,9 @@ public class AdditionalPayment {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    private Long id;
     /**
      * 银行卡
      */

common/fire-dto/src/main/java/com/fire/dto/CustomerInfo.java

@@ -23,7 +23,7 @@ import java.math.BigDecimal;
 public class CustomerInfo {
 
     @ApiModelProperty(value = "客户ID")
-    @TableId(value = "customer_id", type = IdType.AUTO)
+    @TableId(value = "customer_id", type = IdType.INPUT)
     private Long customerId;
 
     @ApiModelProperty(value = "合作伙伴[中间人]ID")

common/fire-dto/src/main/java/com/fire/dto/FireProductInfo.java

@@ -35,7 +35,7 @@ public class FireProductInfo extends Model<FireProductInfo> {
      */
     @ApiModelProperty(value = "产品编号（主键）")
     @TableId(value = "product_id", type = IdType.AUTO)
-    private Integer productId;
+    private Long productId;
 
     /**
      * 流量包ID

common/fire-dto/src/main/java/com/fire/dto/FlowAppInfo.java

@@ -23,7 +23,7 @@ import java.util.Map;
 public class FlowAppInfo {
 
     @ApiModelProperty(value = "接入ID号")
-    @TableId(value = "flow_app_id",type = IdType.AUTO)
+    @TableId(value = "flow_app_id",type = IdType.INPUT)
     private Long flowAppId;
 
     @ApiModelProperty(value = "客户ID")

common/fire-dto/src/main/java/com/fire/dto/system/District.java

@@ -20,7 +20,7 @@ public class District {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysDept.java

@@ -30,7 +30,7 @@ public class SysDept extends Model<SysDept> {
     /**
      * 部门主键ID
      */
-    @TableId(value = "dept_id", type = IdType.AUTO)
+    @TableId(value = "dept_id", type = IdType.INPUT)
     private Integer deptId;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysDict.java

@@ -25,7 +25,7 @@ public class SysDict implements Serializable {
     /**
      * 编号
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysDictItem.java

@@ -27,7 +27,7 @@ public class SysDictItem implements Serializable {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.INPUT)
     private String id;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysJob.java

@@ -27,7 +27,7 @@ private static final long serialVersionUID=1L;
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysMenu.java

@@ -30,7 +30,7 @@ public class SysMenu extends Model<SysMenu> {
     /**
      * 菜单ID
      */
-    @TableId(value = "menu_id", type = IdType.AUTO)
+    @TableId(value = "menu_id", type = IdType.INPUT)
     private Integer menuId;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysRole.java

@@ -31,7 +31,7 @@ public class SysRole extends Model<SysRole> {
     /**
      * 角色主键
      */
-    @TableId(value = "role_id", type = IdType.AUTO)
+    @TableId(value = "role_id", type = IdType.INPUT)
     private Integer roleId;
 
 

common/fire-dto/src/main/java/com/fire/dto/system/SysRoleDept.java

@@ -26,7 +26,7 @@ public class SysRoleDept extends Model<SysRoleDept> {
     /**
      * 部门主键ID
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysRoleMenu.java

@@ -26,7 +26,7 @@ public class SysRoleMenu extends Model<SysRoleMenu> {
     /**
      * 主键ID
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysUser.java

@@ -29,7 +29,7 @@ public class SysUser extends Model<SysUser> {
     /**
      * 主键ID
      */
-    @TableId(value = "user_id", type = IdType.AUTO)
+    @TableId(value = "user_id", type = IdType.INPUT)
     private Integer userId;
 
     /**

common/fire-dto/src/main/java/com/fire/dto/system/SysUserRole.java

@@ -27,7 +27,7 @@ public class SysUserRole extends Model<SysUserRole> {
     /**
      * 主键ID
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**

modules/admin/src/main/java/com/fire/admin/dto/AdditionalPaymentDto.java

@@ -15,7 +15,7 @@ import java.math.BigInteger;
 @Data
 public class AdditionalPaymentDto  {
 
-    private Integer id;
+    private Long id;
 
     /**
      * 银行卡

modules/admin/src/main/java/com/fire/admin/dto/FireProductInfoDto.java

@@ -26,7 +26,7 @@ public class FireProductInfoDto {
 
 
     @ApiModelProperty(value = "产品编号（主键）")
-    private Integer productId;
+    private Long productId;
 
     /**
      * 产品编码

modules/admin/src/main/java/com/fire/admin/rest/CustomerController.java

@@ -59,7 +59,7 @@ public class CustomerController {
 
     @ApiOperation("获取所有的客户信息{用于各种对客户条件的查询}")
     @GetMapping("/{customerName}")
-    public  BaseRestResponse getCustomerInfo(@PathVariable String customerName){
+    public  BaseRestResponse getCustomerInfo(  @RequestParam(value = "customerName",required = false)  String customerName){
     return  new BaseRestResponse<>(customerService.queryCustomerInfo(customerName));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/FireProductController.java

@@ -66,7 +66,7 @@ public class FireProductController {
      */
     @ApiOperation(value = "获取产品详情")
     @GetMapping("/{productId}")
-    public BaseRestResponse getProductInfoDetail(@PathVariable("productId") Integer productId) {
+    public BaseRestResponse getProductInfoDetail(@PathVariable("productId") Long productId) {
         return new BaseRestResponse<>(fireProductService.getProductInfoDetail(productId));
     }
 
@@ -88,7 +88,7 @@ public class FireProductController {
 
     @ApiOperation(value = "删除产品")
     @PutMapping("/del/{productId}")
-    public BaseResponse delProductInfo(@PathVariable Integer productId){
+    public BaseResponse delProductInfo(@PathVariable Long productId){
         fireProductService.deleteProductByProductId(productId);
         return new BaseResponse();
     }
@@ -102,7 +102,7 @@ public class FireProductController {
      */
     @ApiOperation(value = "获取所有产品，用于通道和客户产品的添加")
     @GetMapping("/all/{customerId}")
-    public BaseRestResponse makeProductAll( @PathVariable("customerId") Integer customerId ) {
+    public BaseRestResponse makeProductAll( @PathVariable("customerId") Long customerId ) {
         return new BaseRestResponse<>(fireProductService.getProductAll(customerId));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/SysDeptController.java

@@ -8,6 +8,11 @@ import com.fire.dto.system.SysDept;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import redis.clients.jedis.JedisCluster;
+
+import javax.annotation.Resource;
+
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
 
 /**
  * @classname: SysDeptController
@@ -22,6 +27,9 @@ public class SysDeptController {
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private JedisCluster jedisCluster;
+
     /**
       *@Description: TODO 保存部门信息
       *@Param:
@@ -32,6 +40,7 @@ public class SysDeptController {
     @PostMapping
     @PreAuthorize("hasAuthority('sys:dept:add')")
     public BaseRestResponse save(@RequestBody SysDept sysDept) {
+        sysDept.setDeptId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
         return new BaseRestResponse(deptService.save(sysDept));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/SysDictController.java

@@ -10,6 +10,9 @@ import com.fire.dto.system.SysDict;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import redis.clients.jedis.JedisCluster;
+
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
 
 /**
  * @author: liuliu
@@ -24,6 +27,9 @@ public class SysDictController {
     @Autowired
     private ISysDictService dictService;
 
+    @Autowired
+    private JedisCluster jedisCluster;
+
     /**
     * @Description:  TODO  添加字典信息
     * @Param: [sysDict]
@@ -34,6 +40,7 @@ public class SysDictController {
     @PreAuthorize("hasAuthority('sys:dict:add')")
     @PostMapping
     public BaseRestResponse add(@RequestBody SysDict sysDict) {
+        sysDict.setId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
         return new BaseRestResponse(dictService.save(sysDict));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/SysDictItemController.java

@@ -8,6 +8,9 @@ import com.fire.dto.system.SysDictItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import redis.clients.jedis.JedisCluster;
+
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
 
 
 /**
@@ -24,6 +27,9 @@ public class SysDictItemController {
     @Autowired
     private ISysDictItemService dictItemService;
 
+    @Autowired
+    private JedisCluster jedisCluster;
+
     /**
      * @Description: TODO 分页查询字典详情内容
      * @Param:
@@ -33,7 +39,7 @@ public class SysDictItemController {
      */
     @GetMapping
     public BaseRestResponse getDictItemPage(Page page, SysDictItem sysDictItem) {
-        return new  BaseRestResponse(dictItemService.page(page, Wrappers.query(sysDictItem)));
+        return new BaseRestResponse(dictItemService.page(page, Wrappers.query(sysDictItem)));
     }
 
     /**
@@ -46,7 +52,8 @@ public class SysDictItemController {
     @PreAuthorize("hasAuthority('sys:dictItem:add')")
     @PostMapping
     public BaseRestResponse add(@RequestBody SysDictItem sysDictItem) {
-        return new  BaseRestResponse(dictItemService.save(sysDictItem));
+        sysDictItem.setId(jedisCluster.incr(GLOBAL_ID_INCR.key()).toString());
+        return new BaseRestResponse(dictItemService.save(sysDictItem));
     }
 
     /**
@@ -59,7 +66,7 @@ public class SysDictItemController {
     @PreAuthorize("hasAuthority('sys:dictItem:edit')")
     @PutMapping
     public BaseRestResponse update(@RequestBody SysDictItem sysDictItem) {
-        return new  BaseRestResponse(dictItemService.updateById(sysDictItem));
+        return new BaseRestResponse(dictItemService.updateById(sysDictItem));
     }
 
     /**
@@ -72,7 +79,7 @@ public class SysDictItemController {
     @PreAuthorize("hasAuthority('sys:dictItem:del')")
     @DeleteMapping("/{id}")
     public BaseRestResponse delete(@PathVariable("id") String id) {
-        return new  BaseRestResponse(dictItemService.removeById(id));
+        return new BaseRestResponse(dictItemService.removeById(id));
     }
 
 

modules/admin/src/main/java/com/fire/admin/rest/SysMenuController.java

@@ -10,6 +10,9 @@ import com.fire.dto.system.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import redis.clients.jedis.JedisCluster;
+
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
 
 
 /**
@@ -25,6 +28,9 @@ public class SysMenuController {
     @Autowired
     private ISysMenuService menuService;
 
+    @Autowired
+    private JedisCluster jedisCluster;
+
     /**
      * @Description: TODO 添加菜单
      * @Param:
@@ -35,6 +41,7 @@ public class SysMenuController {
     @PreAuthorize("hasAuthority('sys:menu:add')")
     @PostMapping
     public BaseRestResponse save(@RequestBody SysMenu menu) {
+        menu.setMenuId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
         return new BaseRestResponse(menuService.save(menu));
     }
 

modules/admin/src/main/java/com/fire/admin/service/CustomerProductInfoService.java

@@ -62,6 +62,6 @@ public interface CustomerProductInfoService extends IService<CustomerProduct> {
     * @Author: liuliu
     * @Date: 2021/6/1 14:57
     */
-    List<String> getCuProByCustomerId(Integer customerId);
+    List<String> getCuProByCustomerId(Long customerId);
 
 }

modules/admin/src/main/java/com/fire/admin/service/FireProductService.java

@@ -42,7 +42,7 @@ public interface FireProductService extends IService<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/18 16:34
     */
-    FireProductInfoVo getProductInfoDetail(Integer productId);
+    FireProductInfoVo getProductInfoDetail(Long productId);
     
     
     /**
@@ -63,7 +63,7 @@ public interface FireProductService extends IService<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/28 17:48
     */
-    List<FireProductInfoVo> getProductAll(Integer customerId);
+    List<FireProductInfoVo> getProductAll(Long customerId);
     
     /**
     * @Description:  TODO 逻辑删除产品
@@ -72,6 +72,6 @@ public interface FireProductService extends IService<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/31 11:29
     */
-    void deleteProductByProductId(Integer productId);
+    void deleteProductByProductId(Long productId);
     
 }

modules/admin/src/main/java/com/fire/admin/service/impl/AdditionalPaymentServiceImpl.java

@@ -21,11 +21,13 @@ import com.fire.utils.date.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import redis.clients.jedis.JedisCluster;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.fire.dto.enums.RedisKey.CUSTOMER_AMOUNT;
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
 
 /**
  * @author: liuliu
@@ -40,12 +42,14 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
     private AliyunOSSUtil aliyunOSSUtil;
     private RedisAmountScript redisAmountScript;
     private CustomerService customerService;
+    private JedisCluster jedisCluster;
 
     @Autowired
-    public AdditionalPaymentServiceImpl(AliyunOSSUtil aliyunOSSUtil, RedisAmountScript redisAmountScript,CustomerService customerService) {
+    public AdditionalPaymentServiceImpl(AliyunOSSUtil aliyunOSSUtil, RedisAmountScript redisAmountScript,CustomerService customerService,JedisCluster jedisCluster) {
         this.aliyunOSSUtil = aliyunOSSUtil;
         this.redisAmountScript = redisAmountScript;
         this.customerService=customerService;
+        this.jedisCluster=jedisCluster;
     }
 
     /**
@@ -83,7 +87,9 @@ public class AdditionalPaymentServiceImpl extends ServiceImpl<AdditionalPaymentM
     private int additionalPayment(AdditionalPaymentDto additionalPaymentDto) {
 
         if (ObjectUtil.isNotEmpty(additionalPaymentDto.getType()) && ObjectUtil.isNotEmpty(additionalPaymentDto.getRelationId())) {
-            AdditionalPayment payment = AdditionalPayment.builder().cardNo(additionalPaymentDto.getCardNo())
+            AdditionalPayment payment = AdditionalPayment.builder()
+                    .id( jedisCluster.incr(GLOBAL_ID_INCR.key()))
+                    .cardNo(additionalPaymentDto.getCardNo())
                     .bankDeposit(additionalPaymentDto.getBankDeposit())
                     .account(additionalPaymentDto.getAccount())
                     .payer(SecurityUtil.getUser().getUsername())

modules/admin/src/main/java/com/fire/admin/service/impl/CustomerProductInfoServiceImpl.java

@@ -108,7 +108,7 @@ public class CustomerProductInfoServiceImpl extends ServiceImpl<CustomerProductI
     }
 
     @Override
-    public List<String> getCuProByCustomerId(Integer customerId) {
+    public List<String> getCuProByCustomerId(Long customerId) {
 
         LambdaQueryWrapper<CustomerProduct> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(CustomerProduct::getCustomerProductId,CustomerProduct::getPackageId)

modules/admin/src/main/java/com/fire/admin/service/impl/CustomerServiceImpl.java

@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.fire.dto.enums.RedisKey.CUSTOMER_AMOUNT;
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
 
 /**
  * @author: liuliu
@@ -85,7 +86,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
     @Override
     public void insertCustomer(CustomerDto customerDto) {
         // TODO   新增客户
-        CustomerInfo customerInfo = CustomerInfo.builder().partnerId(customerDto.getPartnerId())
+        CustomerInfo customerInfo = CustomerInfo.builder()
+                .customerId( jedisCluster.incr(GLOBAL_ID_INCR.key()))
+                .partnerId(customerDto.getPartnerId())
                 .customerName(customerDto.getCustomerName().trim())
                 .shorterName(customerDto.getShorterName().trim())
                 .linkmanName(customerDto.getLinkmanName())
@@ -102,7 +105,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
                 .priceCheck(customerDto.getPriceCheck()).build();
         int count1 = baseMapper.insert(customerInfo);
         // TODO 新增客户接入
-        FlowAppInfo appInfo = FlowAppInfo.builder().customerId(customerInfo.getCustomerId())
+        FlowAppInfo appInfo = FlowAppInfo.builder()
+                .flowAppId(  jedisCluster.incr(GLOBAL_ID_INCR.key()))
+                .customerId(customerInfo.getCustomerId())
                 .appId(RandomUtil.randomString(8))
                 .appKey(RandomUtil.randomString(32))
                 .startDate(DateUtils.strformatDatetime(LocalDateTime.now()))
@@ -192,7 +197,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
     public List<CustomerInfo> queryCustomerInfo(String customerName) {
         LambdaQueryWrapper<CustomerInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(CustomerInfo::getCustomerId, CustomerInfo::getCustomerName)
-                .like(CustomerInfo::getCustomerName, customerName);
+                .like(customerName!=null,CustomerInfo::getCustomerName, customerName);
 
         return baseMapper.selectList(queryWrapper);
 

modules/admin/src/main/java/com/fire/admin/service/impl/FireProductServiceImpl.java

@@ -21,11 +21,14 @@ import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import redis.clients.jedis.JedisCluster;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
+
 /**
  * @author: liuliu
  * @ClassName: FireProductServiceImpl
@@ -40,6 +43,8 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
     @Autowired
     private CustomerProductInfoService customerProductInfoService;
 
+    private JedisCluster jedisCluster;
+
     /***
      * @Description: TODO 分页获取产品对象
      * @Param: [page, fireProductInfoDto]
@@ -75,6 +80,7 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
 
         if (ObjectUtil.hasEmpty(productInfos)) {
             FireProductInfo productInfo = FireProductInfo.builder().packageId(packageId)
+                    .productId(  jedisCluster.incr(GLOBAL_ID_INCR.key()))
                     .productName(fireProductInfoDto.getProductName())
                     .productType(fireProductInfoDto.getProductType())
                     .productPrice(fireProductInfoDto.getProductPrice())
@@ -104,7 +110,7 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
      * @Date: 2021/5/18 16:33
      */
     @Override
-    public FireProductInfoVo getProductInfoDetail(Integer productId) {
+    public FireProductInfoVo getProductInfoDetail(Long productId) {
 
         FireProductInfo fireProductInfo = baseMapper.selectById(productId);
         FireProductInfoVo productInfoVo = FireProductInfoVo.builder()
@@ -181,7 +187,7 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
      * @Date: 2021/5/28 17:49
      */
     @Override
-    public List<FireProductInfoVo> getProductAll( Integer customerId) {
+    public List<FireProductInfoVo> getProductAll( Long customerId) {
 
         // TODO  构建返回的对象
         List<FireProductInfoVo> ProductVolist = Lists.newArrayList();
@@ -209,7 +215,7 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
      * @Date: 2021/5/31 11:13
      */
     @Override
-    public void deleteProductByProductId(Integer productId) {
+    public void deleteProductByProductId(Long productId) {
         FireProductInfo productInfo = FireProductInfo.builder().productId(productId)
                 .isDelete(1).build();
         baseMapper.updateById(productInfo);

modules/admin/src/main/java/com/fire/admin/service/impl/SysRoleServiceImpl.java

@@ -17,11 +17,15 @@ import com.fire.dto.system.SysRoleMenu;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import redis.clients.jedis.JedisCluster;
+
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
+
 /**
  * @classname: SysRoleServiceImpl
  * @description TODO 系统角色表 服务实现类
@@ -37,6 +41,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Resource
     private ISysRoleDeptService roleDeptService;
 
+    @Resource
+    private JedisCluster jedisCluster;
+
 
     /**
      *@Description: TODO 保存角色和菜单
@@ -49,6 +56,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public boolean saveRoleMenu(RoleDTO roleDto) {
         SysRole sysRole = new SysRole();
+        sysRole.setRoleId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
         BeanUtils.copyProperties(roleDto, sysRole);
         baseMapper.insertRole(sysRole);
         Integer roleId = sysRole.getRoleId();

modules/admin/src/main/java/com/fire/admin/service/impl/SysUserServiceImpl.java

@@ -30,11 +30,15 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import redis.clients.jedis.JedisCluster;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
+
 
 /**
  * @classname: SysUserServiceImpl
@@ -56,6 +60,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private AuthenticationManager authenticationManager;
 
+    @Resource
+    private JedisCluster jedisCluster;
 
     /**
      * @Description: TODO 分页查询用户信息（含有角色信息）
@@ -85,6 +91,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = new SysUser();
         BeanUtils.copyProperties(userDto, sysUser);
         // 默认密码 123456
+       sysUser.setUserId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
         sysUser.setPassword(PreUtil.encode("123456"));
         log.info("新增用户数据为：【{}】", sysUser.toString());
         baseMapper.insertUser(sysUser);

modules/admin/src/main/java/com/fire/admin/vo/FireProductInfoVo.java

@@ -25,7 +25,7 @@ public class FireProductInfoVo   {
 
 
     @ApiModelProperty(value = "产品编号（主键）")
-    private Integer productId;
+    private Long productId;
 
     /**
      * 产品编号