From 05e13dc68b3db44868d9e02a10ccc330366a49c6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 八月 2023 11:58:36 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 14 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
index ad11034..67041e2 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -1,10 +1,13 @@
package com.stylefeng.guns.modular.system.controller.general;
+import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
+import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.controller.resp.TBranchOfficeResp;
import com.stylefeng.guns.modular.system.controller.resp.TDriverResp;
import com.stylefeng.guns.modular.system.enums.StatusEnum;
@@ -14,6 +17,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +29,7 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -52,6 +58,8 @@
private ITDriverService tDriverService;
@Autowired
private ITDriverWorkService tDriverWorkService;
+ @Autowired
+ private IUserService userService;
@Autowired
private RedisUtil redisUtil;
@@ -88,14 +96,14 @@
TRegion district = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tBranchOffice.getDistrictCode())
.last("LIMIT 1"));
- if(StringUtils.hasLength(tBranchOffice.getDistrictName())){
+ if(StringUtils.hasLength(tBranchOffice.getDistrictName()) && !tBranchOffice.getDistrictName().equals(tBranchOffice.getCityName())){
tBranchOfficeResp.setArea(tBranchOffice.getProvinceName()+"/"+tBranchOffice.getCityName()+"/"+tBranchOffice.getDistrictName());
}else {
tBranchOfficeResp.setArea(tBranchOffice.getProvinceName()+"/"+tBranchOffice.getCityName());
}
if(Objects.nonNull(city)){
- if(Objects.nonNull(district)){
+ if(Objects.nonNull(district) && !district.getCode().equals(city.getCode())){
tBranchOfficeResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
}else {
tBranchOfficeResp.setAreaId(city.getParentId()+"/"+city.getId());
@@ -128,15 +136,15 @@
String[] split1 = areaId.split("/");
List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
model.addAttribute("provinceList",tRegions);
- List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
- // 查询市
- List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
- model.addAttribute("cityList",tRegions1);
-
- // 查询区
- List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
- List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
- model.addAttribute("districtList",tRegions2);
+// List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
+// // 查询市
+// List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+// model.addAttribute("cityList",tRegions1);
+//
+// // 查询区
+// List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
+// List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+// model.addAttribute("districtList",tRegions2);
if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){
String[] split = area.split("/");
@@ -155,13 +163,23 @@
}else {
model.addAttribute("districtId", "");
}
+
+ List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+ model.addAttribute("cityList",tRegions1);
+
+ // 查询区
+ List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
+ model.addAttribute("districtList",tRegions2);
}else {
+ model.addAttribute("cityList",new ArrayList<>());
+ model.addAttribute("districtList",new ArrayList<>());
+
model.addAttribute("provinceName","");
- model.addAttribute("cityName","split[1]");
+ model.addAttribute("cityName","");
model.addAttribute("districtName","");
model.addAttribute("provinceId","");
- model.addAttribute("cityId","split1[1]");
+ model.addAttribute("cityId","");
model.addAttribute("districtId", "");
}
return PREFIX + "tBranchOfficeAreaAdd.html";
@@ -201,7 +219,7 @@
// 查询区
List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
- List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+ List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
model.addAttribute("districtList",tRegions2);
return PREFIX + "tBranchOfficeAreaUpdate.html";
@@ -214,6 +232,9 @@
@ResponseBody
public Object list(String branchOfficeName,String principal,String principalPhone,Integer operatingBusiness ,Integer status) {
List<TBranchOfficeResp> tBranchOfficeRespList = tBranchOfficeService.getPageList(branchOfficeName,principal,principalPhone,operatingBusiness,status);
+ for (TBranchOfficeResp tBranchOfficeResp : tBranchOfficeRespList) {
+ tBranchOfficeResp.setUserType(Objects.requireNonNull(ShiroKit.getUser()).getRoleType());
+ }
// 分公司查询优惠券，订单，司机等信息
tBranchOfficeService.queryOtherInfo(tBranchOfficeRespList);
return tBranchOfficeRespList;
@@ -287,10 +308,15 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
public Object add(TBranchOffice tBranchOffice) {
int count = tBranchOfficeService.selectCount(new EntityWrapper<TBranchOffice>().eq("branchOfficeName", tBranchOffice.getBranchOfficeName()));
if(count>0){
return new SuccessTip(500,"该分公司名称已存在!");
+ }
+ int count1 = userService.selectCount(new EntityWrapper<User>().eq("account", tBranchOffice.getAccount()));
+ if (count1 > 0){
+ return new SuccessTip(500,"该账号已存在!");
}
Object o = tBranchOfficeService.addOrUpdate(tBranchOffice);
@@ -301,6 +327,22 @@
tBranchOffice.setStatus(StatusEnum.NORMAL.getCode());
tBranchOfficeService.insert(tBranchOffice);
+
+ //添加User对象
+ User user = new User();
+ user.setAccount(tBranchOffice.getAccount());
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(tBranchOffice.getPassword(), user.getSalt()));
+ user.setStatus(ManagerStatus.OK.getCode());
+ user.setRoleid("3");
+ user.setDeptid(25);
+ user.setCreatetime(new Date());
+ user.setRoleType(2);
+ user.setObjectId(tBranchOffice.getId());
+ user.setName(tBranchOffice.getPrincipal());
+ user.setSex(1);
+ userService.insert(user);
+
return SUCCESS_TIP;
}
@@ -321,7 +363,43 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
public Object update(TBranchOffice tBranchOffice) {
+ TBranchOffice branchOffice = tBranchOfficeService.selectById(tBranchOffice.getId());
+ User user = userService.selectOne(new EntityWrapper<User>()
+ .eq("role_type", 2)
+ .eq("object_id", branchOffice.getId())
+ .last("LIMIT 1"));
+ //判断账号是否已存在
+ if (SinataUtil.isNotEmpty(tBranchOffice.getAccount()) && SinataUtil.isNotEmpty(tBranchOffice.getPassword())){
+ if(Objects.isNull(user)){
+ //添加User对象
+ user.setAccount(tBranchOffice.getAccount());
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(tBranchOffice.getPassword(), user.getSalt()));
+ user.setStatus(ManagerStatus.OK.getCode());
+ user.setRoleid("3");
+ user.setDeptid(25);
+ user.setCreatetime(new Date());
+ user.setRoleType(2);
+ user.setObjectId(tBranchOffice.getId());
+ user.setName(tBranchOffice.getPrincipal());
+ user.setSex(1);
+ userService.insert(user);
+ }else {
+ if (!tBranchOffice.getAccount().equals(user.getAccount())){
+ //判断账号是否已存在
+ int count = userService.selectCount(new EntityWrapper<User>().eq("account", tBranchOffice.getAccount()));
+ if (count > 0){
+ return new SuccessTip(500,"该账号已存在!");
+ }
+ }
+ user.setAccount(tBranchOffice.getAccount());
+ user.setPassword(ShiroKit.md5(tBranchOffice.getPassword(), user.getSalt()));
+ userService.updateById(user);
+ }
+ }
+
TBranchOffice office = tBranchOfficeService.selectOne(new EntityWrapper<TBranchOffice>().eq("branchOfficeName", tBranchOffice.getBranchOfficeName())
.last("LIMIT 1"));
if(Objects.nonNull(office) && !tBranchOffice.getId().equals(office.getId())){
--
Gitblit v1.7.1