diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesUserController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesUserController.java index 94d5496b..5f36fd41 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesUserController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesUserController.java @@ -85,6 +85,20 @@ public class CeesUserController extends JeecgController getGenerativeRules() { + return ceesUserService.getGenerativeRules(); + } + @GetMapping("/updateGenerateRule") + public Result updateGenerateRule(@RequestParam(name = "id") Long id,@RequestParam(name = "groupType") Integer groupType,@RequestParam(name = "majorId") Integer majorId){ + return ceesUserService.updateGenerateRule(id, groupType, majorId); +// return null; + } /** * 编辑 * diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java index e5bdf374..fb66732c 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java @@ -23,4 +23,8 @@ public interface ICeesUserService extends IService { Result getGroupName(String groupId); void createAccount(CreateAccountDto createAccountDto); + + Result getGenerativeRules(); + + Result updateGenerateRule(Long id, Integer groupType, Integer majorId); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java index 57405482..70abcc51 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; @@ -257,6 +258,8 @@ public class CeesUserServiceImpl extends ServiceImpl i /** * @param createAccountDto + * @param groupType + * @param majorId * @return */ @Override @@ -270,7 +273,7 @@ public class CeesUserServiceImpl extends ServiceImpl i } // 获取生成规则 - CeesGenerativeRules rules = getGenerativeRules(); + CeesGenerativeRules rules = GetGenerativeRules(); if (rules == null) { throw new IllegalArgumentException("找不到对应的账号生成规则"); } @@ -314,8 +317,33 @@ public class CeesUserServiceImpl extends ServiceImpl i userMIDList.clear(); } + // 获取生成规则---用户前端获取rule + public Result getGenerativeRules() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CeesGenerativeRules::getIs_default, "1"); + JSONObject result = new JSONObject(); + result.put("GenerativeRules",ceesGenerativeRulesMapper.selectOne(queryWrapper)); + return Result.ok(result); + } + + @Override + public Result updateGenerateRule(Long id, Integer groupType, Integer majorId) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(CeesGenerativeRules::getId, id) + .set(CeesGenerativeRules::getGroupType, groupType) + .set(CeesGenerativeRules::getMajorId, majorId); + // 使用 update 方法进行更新 + int result = ceesGenerativeRulesMapper.update(null, updateWrapper); + + if (result > 0) { + return Result.ok("更新成功"); + } else { + return Result.error("更新失败"); + } + } + // 获取生成规则 - private CeesGenerativeRules getGenerativeRules() { + private CeesGenerativeRules GetGenerativeRules() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CeesGenerativeRules::getIs_default, "1"); return ceesGenerativeRulesMapper.selectOne(queryWrapper);