From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 166 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 143 insertions(+), 23 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index 85e8c4f..b16e878 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -4,8 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.admin.entity.Franchisee;
-import com.ruoyi.admin.service.FranchiseeService;
+import com.ruoyi.admin.entity.*;
+import com.ruoyi.admin.service.*;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,6 +40,14 @@
@Resource
private FranchiseeService franchiseeService;
+ @Resource
+ private SysUserService sysUserService;
+ @Resource
+ private UserRoleService userRoleService;
+ @Resource
+ private RegionService regionService;
+ @Resource
+ private MasterWorkerService masterWorkerService;
/**
* 加盟商信息分页列表
@@ -46,7 +55,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
- @RequiresPermissions("franchisee")
+ @RequiresPermissions("franchisee_list")
@ApiOperation(value = "加盟商信息分页查询列表", tags = {"后台-加盟商管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -74,14 +83,35 @@
*
* @param id 加盟商信息id
*/
- @RequiresPermissions("franchisee")
+ @RequiresPermissions("franchisee_detail")
@ApiOperation(value = "加盟商信息详情", tags = {"后台-加盟商管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@ApiImplicitParam(value = "加盟商信息id", name = "id", dataType = "Integer", required = true)
})
- public R<Franchisee> detail(@RequestParam Integer id) {
- return R.ok(franchiseeService.getById(id));
+ public R<Franchisee> detail(@RequestParam("id") Integer id) {
+ return R.ok(franchiseeService.lambdaQuery()
+ .eq(Franchisee::getId, id).eq(Franchisee::getIsDelete, 0).one());
+ }
+
+ /**
+ * 加盟商管辖城市详情
+ * -- 远程调用
+ *
+ * @param id 加盟商信息id
+ */
+ @ApiOperation(value = "加盟商管辖城市详情", tags = {"后台-加盟商管理"})
+ @GetMapping(value = "/cityDetail")
+ public R<List<String>> cityDetail(@RequestParam("id") Integer id) {
+ Franchisee franchisee = franchiseeService.lambdaQuery()
+ .eq(Franchisee::getId, id).eq(Franchisee::getIsDelete, 0).one();
+ return R.ok(Arrays.stream(franchisee.getCityCode().split(",")).collect(Collectors.toList()));
+ }
+
+ @GetMapping(value = "/getWorkPic")
+ public R<String> getWorkPic(@RequestParam("id") Integer id) {
+ MasterWorker byId = masterWorkerService.getById(id);
+ return R.ok(byId.getProfilePicture());
}
/**
@@ -89,16 +119,43 @@
*
* @param franchisee 加盟商信息信息
*/
- @RequiresPermissions("franchisee")
+ @RequiresPermissions("franchisee_save")
@ApiOperation(value = "新增加盟商信息", tags = {"后台-加盟商管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody @Validated Franchisee franchisee) {
- checkFranchisee(franchisee);
if (null == franchisee.getAdminPassword() || StringUtils.isBlank(franchisee.getAdminPassword())) {
throw new GlobalException("请输入管理员初始密码！");
}
+ String md5Password = checkFranchisee(franchisee);
+ String cityCode = franchisee.getCityCode();
+ List<String> list = Arrays.stream(cityCode.split(",")).collect(Collectors.toList());
+ StringBuilder str = new StringBuilder();
+ for (String code : list) {
+ Region region = regionService.lambdaQuery()
+ .eq(Region::getCode, code).one();
+ if (null != region) {
+ str.append(region.getName()).append(",");
+ }
+ }
+ String city = str.substring(Constants.ZERO, str.length() - 1);
+ franchisee.setCity(city);
+ boolean save = franchiseeService.save(franchisee);
+ // 生成sysUser账号
+ SysUser sysUser = new SysUser();
+ sysUser.setFranchiseeId(franchisee.getId());
+ sysUser.setNickName(franchisee.getName());
+ sysUser.setAccount(franchisee.getAdminAccount());
+ sysUser.setPassword(md5Password);
+ sysUser.setIsEnable(Constants.ONE);
+ sysUser.setIsDelete(Constants.ZERO);
+ save = save && sysUserService.save(sysUser);
+ // 添加账号与角色关联
+ UserRole userRole = new UserRole();
+ userRole.setUserId(sysUser.getUserId());
+ userRole.setRoleId(franchisee.getRoleId().longValue());
+ save = save && userRoleService.save(userRole);
//franchisee.setCityStr(String.valueOf(franchisee.getCityArr()));
- return franchiseeService.save(franchisee) ? R.ok() : R.fail();
+ return save ? R.ok() : R.fail();
}
/**
@@ -106,11 +163,47 @@
*
* @param franchisee 加盟商信息信息
*/
- @RequiresPermissions("franchisee")
+ @RequiresPermissions("franchisee_update")
@ApiOperation(value = "修改加盟商信息", tags = {"后台-加盟商管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody @Validated Franchisee franchisee) {
- checkFranchisee(franchisee);
+ boolean b = false;
+ if (franchisee.getAdminPassword().equals("")){
+ b = true;
+ }
+ String md5Password = checkFranchisee(franchisee);
+ SysUser sysUser = sysUserService.lambdaQuery()
+ .eq(SysUser::getFranchiseeId, franchisee.getId())
+ .eq(SysUser::getIsDelete, Constants.ZERO).one();
+ if (null == sysUser) {
+ sysUser = new SysUser();
+ sysUser.setNickName(franchisee.getName());
+ sysUser.setAccount(franchisee.getAdminAccount());
+ sysUser.setPassword(md5Password);
+ sysUser.setIsEnable(franchisee.getIsEnable());
+ sysUser.setIsDelete(Constants.ZERO);
+ sysUserService.save(sysUser);
+ } else {
+ // 生成sysUser账号
+ sysUser.setNickName(franchisee.getName());
+ sysUser.setAccount(franchisee.getAdminAccount());
+ if (!b) {
+ sysUser.setPassword(md5Password);
+ }
+ sysUser.setIsEnable(franchisee.getIsEnable());
+
+
+
+ sysUserService.updateById(sysUser);
+ }
+ List<String> cityStr = new ArrayList<>();
+ String[] split = franchisee.getCityCode().split(",");
+ for (String s : split) {
+ Region one = regionService.lambdaQuery().eq(Region::getCode, s).one();
+ cityStr.add(one.getName());
+ }
+ franchisee.setCity(String.join(",", cityStr));
+
return franchiseeService.updateById(franchisee) ? R.ok() : R.fail();
}
@@ -120,7 +213,7 @@
* @param id 加盟商id
* @param enable 启用/关闭
*/
- @RequiresPermissions("franchisee")
+ @RequiresPermissions("franchisee_enable")
@ApiOperation(value = "启用/关闭加盟商", tags = {"后台-加盟商管理"})
@GetMapping(value = "/enable")
@ApiImplicitParams({
@@ -130,6 +223,10 @@
public R<String> enable(@RequestParam Integer id, @RequestParam Integer enable) {
boolean update = franchiseeService.lambdaUpdate().set(Franchisee::getIsEnable, enable)
.eq(Franchisee::getId, id).update();
+ // 启动/关闭后台账号
+ sysUserService.lambdaUpdate()
+ .eq(SysUser::getFranchiseeId, id)
+ .set(SysUser::getIsEnable, enable).update();
return update ? R.ok() : R.fail();
}
@@ -138,20 +235,39 @@
*
* @param franchisee 加盟商信息
*/
- private void checkFranchisee(Franchisee franchisee) {
- String city = franchisee.getCity();
- List<String> cityList = Arrays.stream(city.split(",")).collect(Collectors.toList());
- for (String c : cityList) {
- Franchisee one = franchiseeService.lambdaQuery().like(Franchisee::getCity, c)
- .eq(Franchisee::getIsDelete, 0).one();
- if (null != one) {
- throw new GlobalException("当前所选城市中 " + c + " 已有加盟商所管辖！");
- }
+ private String checkFranchisee(Franchisee franchisee) {
+ LambdaQueryChainWrapper<Franchisee> wrapper = franchiseeService.lambdaQuery()
+ .eq(Franchisee::getAdminAccount, franchisee.getAdminAccount())
+ .eq(Franchisee::getIsDelete, 0);
+ // 校验账号是否唯一
+ Franchisee only;
+ if (null == franchisee.getId()) {
+ only = wrapper.one();
+ } else {
+ only = wrapper.ne(Franchisee::getId, franchisee.getId()).one();
}
+ // 校验后台账号是否存在当前账号
+ SysUser user = sysUserService.lambdaQuery()
+ .eq(SysUser::getAccount, franchisee.getAdminAccount())
+ .eq(SysUser::getIsDelete, Constants.ZERO)
+ .eq(SysUser::getFranchiseeId, null).one();
+ if (null != only || null != user) {
+ throw new GlobalException("该账号已存在！", 500);
+ }
+// String city = franchisee.getCity();
+// List<String> cityList = Arrays.stream(city.split(",")).collect(Collectors.toList());
+// for (String c : cityList) {
+// Franchisee one = franchiseeService.lambdaQuery().like(Franchisee::getCity, c)
+// .eq(Franchisee::getIsDelete, 0).one();
+// if (null != one) {
+// throw new GlobalException("当前所选城市中 " + c + " 已有加盟商所管辖！");
+// }
+// }
// MD5加密登录密码(新)
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- String md5Password = passwordEncoder.encode(Constants.DEFAULT_PASSWORD);
+ String md5Password = passwordEncoder.encode(franchisee.getAdminPassword());
franchisee.setAdminPassword(md5Password);
+ return md5Password;
}
/**
@@ -159,7 +275,7 @@
*
* @param ids 加盟商信息多条id拼接
*/
- @RequiresPermissions("franchisee")
+ @RequiresPermissions("franchisee_delete")
@ApiOperation(value = "批量删除加盟商信息", tags = {"后台-加盟商管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -169,6 +285,10 @@
List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
List<Franchisee> list = franchiseeService.lambdaQuery().in(Franchisee::getId, idList).list();
list.forEach(data -> data.setIsDelete(1));
+ // 删除对应sysUser账号
+ sysUserService.lambdaUpdate()
+ .in(SysUser::getFranchiseeId, idList)
+ .set(SysUser::getIsDelete, Constants.ONE).update();
return franchiseeService.updateBatchById(list) ? R.ok() : R.fail();
}
--
Gitblit v1.7.1