rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移除代理商中的地域类型，因为地域类型需要放到代理商公司中

This commit is contained in:
曹鹏飞 2026-01-20 16:40:32 +08:00
parent 3ef8d33592
commit 869914819c
15 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java
View File

@ -240,7 +240,7 @@ public class AppUserController extends ControllerBase {
.setTitleId(request.getTitleId()) .setTitleId(request.getTitleId())
.setCompanyId(StrUtil.join(",", request.getCompanyIds())) .setCompanyId(StrUtil.join(",", request.getCompanyIds()))
.setDepartmentId(request.getDepartmentId()) .setDepartmentId(request.getDepartmentId())
.setRegionTypeId(request.getRegionTypeId()) // .setRegionTypeId(request.getRegionTypeId())
.setUpdateBy(AdminUserUtil.getUserName()) .setUpdateBy(AdminUserUtil.getUserName())
.setUpdateTime(LocalDateTime.now()); .setUpdateTime(LocalDateTime.now());
if (!Objects.equals(user.getState(), UserState.ToBeActivated.getState()) && Objects.nonNull(request.getEnable())) { if (!Objects.equals(user.getState(), UserState.ToBeActivated.getState()) && Objects.nonNull(request.getEnable())) {
@ -289,19 +289,19 @@ public class AppUserController extends ControllerBase {
.setTitleId(request.getTitleId()) .setTitleId(request.getTitleId())
.setCompanyId(StrUtil.join(",", request.getCompanyIds())) .setCompanyId(StrUtil.join(",", request.getCompanyIds()))
.setDepartmentId(request.getDepartmentId()) .setDepartmentId(request.getDepartmentId())
.setRegionTypeId(request.getRegionTypeId()) // .setRegionTypeId(request.getRegionTypeId())
.setUpdateBy(AdminUserUtil.getUserName()) .setUpdateBy(AdminUserUtil.getUserName())
.setUpdateTime(LocalDateTime.now()); .setUpdateTime(LocalDateTime.now());
if (!Objects.equals(user.getState(), UserState.ToBeActivated.getState()) && Objects.nonNull(request.getEnable())) { if (!Objects.equals(user.getState(), UserState.ToBeActivated.getState()) && Objects.nonNull(request.getEnable())) {
user.setState(request.getEnable() ? UserState.Activated.getState() : UserState.Disabled.getState()); user.setState(request.getEnable() ? UserState.Activated.getState() : UserState.Disabled.getState());
} }
if (Objects.equals(user.getRegionTypeId(), request.getRegionTypeId())) { // if (Objects.equals(user.getRegionTypeId(), request.getRegionTypeId())) {
List<AppUser> children = appUserService.getChildren(user); // List<AppUser> children = appUserService.getChildren(user);
appUserService.lambdaUpdate() // appUserService.lambdaUpdate()
.set(AppUser::getRegionTypeId, request.getRegionTypeId()) // .set(AppUser::getRegionTypeId, request.getRegionTypeId())
.in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList())) // .in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList()))
.update(); // .update();
} // }
appUserService.updateById(user); appUserService.updateById(user);
} }

5
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java
View File

@ -89,10 +89,10 @@ public class CustomerController extends ControllerBase {
@MethodInfoMark(value = "新增" ,menuName = "客户管理") @MethodInfoMark(value = "新增" ,menuName = "客户管理")
@ApiMark(moduleName = "客户管理", apiName = "新增") @ApiMark(moduleName = "客户管理", apiName = "新增")
public ApiResult<Boolean> add(@Valid @RequestBody CustomerDTO customerDTO) { public ApiResult<Boolean> add(@Valid @RequestBody CustomerDTO customerDTO) {
VUtils.trueThrow(CollUtil.isEmpty(customerDTO.getAreaList())).throwMessage(STATE.ParamErr,"公司区域不能为空");
//检查公司名称是否已存在 //检查公司名称是否已存在
List<TBaseCustomer> existCompany = baseCustomerService.lambdaQuery().eq(TBaseCustomer::getAgencyCompanyName, customerDTO.getAgencyCompanyName()).list(); List<TBaseCustomer> existCompany = baseCustomerService.lambdaQuery().eq(TBaseCustomer::getAgencyCompanyName, customerDTO.getAgencyCompanyName()).list();
VUtils.trueThrow(CollUtil.isNotEmpty(existCompany)).throwMessage(STATE.PageError,customerDTO.getAgencyCompanyName()+"公司名称已存在"); VUtils.trueThrow(CollUtil.isNotEmpty(existCompany)).throwMessage(STATE.PageError,customerDTO.getAgencyCompanyName()+"公司名称已存在");
VUtils.trueThrow(CollUtil.isEmpty(customerDTO.getAreaList())).throwMessage(STATE.ParamErr,"公司区域不能为空");
TBaseCustomer ent = Convert.convert(TBaseCustomer.class, customerDTO); TBaseCustomer ent = Convert.convert(TBaseCustomer.class, customerDTO);
ent.setId(null); ent.setId(null);
ent.setAgencyCompanyCode(UniqueSequenceGenerator.generateCode(Constant.CustomerCodePrefix)); ent.setAgencyCompanyCode(UniqueSequenceGenerator.generateCode(Constant.CustomerCodePrefix));
@ -118,11 +118,10 @@ public class CustomerController extends ControllerBase {
@MethodInfoMark(value = "编辑" ,menuName = "客户管理") @MethodInfoMark(value = "编辑" ,menuName = "客户管理")
@ApiMark(moduleName = "客户管理", apiName = "编辑") @ApiMark(moduleName = "客户管理", apiName = "编辑")
public ApiResult<Boolean> updateCompany(@Valid @RequestBody CustomerDTO customerDTO) { public ApiResult<Boolean> updateCompany(@Valid @RequestBody CustomerDTO customerDTO) {
VUtils.trueThrow(CollUtil.isEmpty(customerDTO.getAreaList())).throwMessage(STATE.ParamErr,"公司区域不能为空");
//检查公司名称是否已存在 //检查公司名称是否已存在
TBaseCustomer oldEnt = baseCustomerService.getById(customerDTO.getId()); TBaseCustomer oldEnt = baseCustomerService.getById(customerDTO.getId());
VUtils.trueThrow(Objects.isNull(oldEnt)).throwMessage(STATE.PageError,customerDTO.getAgencyCompanyName()+"公司不存在"); VUtils.trueThrow(Objects.isNull(oldEnt)).throwMessage(STATE.PageError,customerDTO.getAgencyCompanyName()+"公司不存在");
VUtils.trueThrow(CollUtil.isEmpty(customerDTO.getAreaList())).throwMessage(STATE.ParamErr,"公司区域不能为空");
BeanUtil.copyProperties(customerDTO,oldEnt); BeanUtil.copyProperties(customerDTO,oldEnt);
oldEnt.setAreaCode(StrUtil.join(",", customerDTO.getAreaList().stream().map(u->u.getAreaCode()).collect(Collectors.toList()))); oldEnt.setAreaCode(StrUtil.join(",", customerDTO.getAreaList().stream().map(u->u.getAreaCode()).collect(Collectors.toList())));
oldEnt.setAreaName(StrUtil.join(",", customerDTO.getAreaList().stream().map(u->u.getAreaName()).collect(Collectors.toList()))); oldEnt.setAreaName(StrUtil.join(",", customerDTO.getAreaList().stream().map(u->u.getAreaName()).collect(Collectors.toList())));

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java
View File

@ -88,5 +88,5 @@ public class CustomerDTO {
* 是否报价对象 * 是否报价对象
*/ */
@NotNull(message = "是否报价对象不能为空") @NotNull(message = "是否报价对象不能为空")
private Boolean quotationUse; private Boolean quotationUse=false;
} }

10
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/PrimaryAppUserAddRequest.java
View File

@ -53,9 +53,9 @@ public class PrimaryAppUserAddRequest {
@NotNull(message = "部门不能为空") @NotNull(message = "部门不能为空")
private Long departmentId; private Long departmentId;
/** // /**
* 地域类型，字典id // * 地域类型，字典id
*/ // */
@NotNull(message = "地域类型不能为空") // @NotNull(message = "地域类型不能为空")
private Integer regionTypeId; // private Integer regionTypeId;
} }

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAdminUtil.java
View File

@ -140,7 +140,7 @@ public class SaTokenAdminUtil {
} }
public static <T> T getLoginId(T defaultValue) { public static <T> T getLoginId(T defaultValue) {
return (T)stpLogic.getLoginId(defaultValue); return stpLogic.getLoginId(defaultValue);
} }
public static Object getLoginIdDefaultNull() { public static Object getLoginIdDefaultNull() {

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAppUtil.java
View File

@ -141,7 +141,7 @@ public class SaTokenAppUtil {
} }
public static <T> T getLoginId(T defaultValue) { public static <T> T getLoginId(T defaultValue) {
return (T)stpLogic.getLoginId(defaultValue); return stpLogic.getLoginId(defaultValue);
} }
public static Object getLoginIdDefaultNull() { public static Object getLoginIdDefaultNull() {

6
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/event/TicketCallBeginEvent.java
View File

@ -40,9 +40,9 @@ public class TicketCallBeginEvent extends ApplicationEvent implements Applicatio
.setSenderName("通话助手") .setSenderName("通话助手")
.setContent(userName + "发起了视频通话") .setContent(userName + "发起了视频通话")
.setCreateTime(Instant.now()); .setCreateTime(Instant.now());
ticketChatService.addMessage(Long.valueOf(ticketId), message); ticketChatService.addMessage(ticketId, message);
//推送消息 //推送消息
ssePushService.sendTicketMessageToAdmin(Long.valueOf(ticketId), message); ssePushService.sendTicketMessageToAdmin(ticketId, message);
ssePushService.sendTicketMessageToApp(Long.valueOf(ticketId), message); ssePushService.sendTicketMessageToApp(ticketId, message);
} }
} }

10
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java
View File

@ -151,11 +151,11 @@ public class AppUser implements Serializable {
*/ */
private String customerName; private String customerName;
/** // /**
* 地域类型，字典id // * 地域类型，字典id
*/ // */
@TableField("region_type_id") // @TableField("region_type_id")
private Integer regionTypeId; // private Integer regionTypeId;
/** /**
* 部门id * 部门id

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleServiceImpl.java
View File

@ -95,7 +95,7 @@ public class AdminRoleServiceImpl extends ServiceImpl<AdminRoleMapper, AdminRole
} }
private void bindParent(MenuVO menu,List<MenuVO> datas){ private void bindParent(MenuVO menu,List<MenuVO> datas){
if (!Objects.equals(0,menu.getParentId())){ if (!Objects.equals(0L,menu.getParentId())){
AdminMenu mp=menuService.getById(menu.getParentId()); AdminMenu mp=menuService.getById(menu.getParentId());
if (datas.stream().noneMatch(d->Objects.equals(d.getId(),mp.getId()))){ if (datas.stream().noneMatch(d->Objects.equals(d.getId(),mp.getId()))){
MenuVO m=new MenuVO().setId(mp.getId()).setName(mp.getName()).setShow(mp.getShow()).setUrl(mp.getUrl()).setComponent(mp.getComponent()).setParentId(mp.getParentId()); MenuVO m=new MenuVO().setId(mp.getId()).setName(mp.getName()).setShow(mp.getShow()).setUrl(mp.getUrl()).setComponent(mp.getComponent()).setParentId(mp.getParentId());

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
View File

@ -220,7 +220,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
.setTitleId(applyfor.getTitleId()) .setTitleId(applyfor.getTitleId())
.setState(UserState.ToBeActivated.getState()) .setState(UserState.ToBeActivated.getState())
.setDepartmentId(request.getDepartmentId()) .setDepartmentId(request.getDepartmentId())
.setRegionTypeId(appUser.getRegionTypeId()) // .setRegionTypeId(appUser.getRegionTypeId())
.setCreateBy(appUser.getName()) .setCreateBy(appUser.getName())
.setCreateTime(LocalDateTime.now()) .setCreateTime(LocalDateTime.now())
.setExpireTime(appUser.getExpireTime()) .setExpireTime(appUser.getExpireTime())

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -176,7 +176,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.setUpdateBy(AdminUserUtil.getUserName()) .setUpdateBy(AdminUserUtil.getUserName())
.setUpdateTime(LocalDateTime.now()) .setUpdateTime(LocalDateTime.now())
.setDepartmentId(request.getDepartmentId()) .setDepartmentId(request.getDepartmentId())
.setRegionTypeId(request.getRegionTypeId()) // .setRegionTypeId(request.getRegionTypeId())
.setState(UserState.ToBeActivated.getState()) .setState(UserState.ToBeActivated.getState())
.setExpireTime(LocalDate.of(LocalDateTime.now().getYear() + 1, 1, 1)); .setExpireTime(LocalDate.of(LocalDateTime.now().getYear() + 1, 1, 1));
updateById(user); updateById(user);
@ -194,7 +194,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.setLanguageCode(request.getLanguageCode()) .setLanguageCode(request.getLanguageCode())
.setSalesUserName(request.getSalesUserName()) .setSalesUserName(request.getSalesUserName())
.setDepartmentId(request.getDepartmentId()) .setDepartmentId(request.getDepartmentId())
.setRegionTypeId(request.getRegionTypeId()) // .setRegionTypeId(request.getRegionTypeId())
.setCreateBy(AdminUserUtil.getUserName()) .setCreateBy(AdminUserUtil.getUserName())
.setCreateTime(LocalDateTime.now()) .setCreateTime(LocalDateTime.now())
.setState(UserState.ToBeActivated.getState()) .setState(UserState.ToBeActivated.getState())

5
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.nflg.mobilebroken.repository.mapper.DeviceComponentMapper;
import com.nflg.mobilebroken.repository.service.IDeviceComponentService; import com.nflg.mobilebroken.repository.service.IDeviceComponentService;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
@ -49,14 +50,14 @@ public class DeviceComponentServiceImpl extends ServiceImpl<DeviceComponentMappe
this.getBaseMapper().deleteById(id); this.getBaseMapper().deleteById(id);
} }
@Transactional
public Boolean saveOrUpdateBatchComponent(List<DeviceComponent> data){ public Boolean saveOrUpdateBatchComponent(List<DeviceComponent> data){
return this.saveOrUpdateBatch(data); return this.saveOrUpdateBatch(data);
} }
public void batchDelComponent(List<Integer> ids){ public void batchDelComponent(List<Integer> ids){
this.getBaseMapper().deleteBatchIds(ids); this.getBaseMapper().deleteByIds(ids);
} }

5
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceComponentServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.nflg.mobilebroken.repository.mapper.GongfuDeviceComponentMapper;
import com.nflg.mobilebroken.repository.service.IGongfuDeviceComponentService; import com.nflg.mobilebroken.repository.service.IGongfuDeviceComponentService;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
@ -47,14 +48,14 @@ public class GongfuDeviceComponentServiceImpl extends ServiceImpl<GongfuDeviceCo
this.getBaseMapper().deleteById(id); this.getBaseMapper().deleteById(id);
} }
@Transactional
public Boolean saveOrUpdateBatchComponent(List<GongfuDeviceComponent> data) { public Boolean saveOrUpdateBatchComponent(List<GongfuDeviceComponent> data) {
return this.saveOrUpdateBatch(data); return this.saveOrUpdateBatch(data);
} }
public void batchDelComponent(List<Long> ids) { public void batchDelComponent(List<Long> ids) {
this.getBaseMapper().deleteBatchIds(ids); this.getBaseMapper().deleteByIds(ids);
} }

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java
View File

@ -323,7 +323,7 @@ public class GongfuTicketServiceImpl extends ServiceImpl<GongfuTicketMapper, Gon
GongfuTicket ticket = lambdaQuery().eq(GongfuTicket::getId, id).one(); GongfuTicket ticket = lambdaQuery().eq(GongfuTicket::getId, id).one();
VUtils.trueThrowBusinessError(!(Objects.equals(ticket.getUserId(), AppUserUtil.getUserId()) && StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom()))) VUtils.trueThrowBusinessError(!(Objects.equals(ticket.getUserId(), AppUserUtil.getUserId()) && StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom())))
.throwMessage("无权操作该工单"); .throwMessage("无权操作该工单");
VUtils.trueThrowBusinessError(Byte.compare(ticket.getState(), TicketState.ProcessingCompleted.getState()) > 0) VUtils.trueThrowBusinessError(ticket.getState() > TicketState.ProcessingCompleted.getState())
.throwMessage("当前工单状态不允许重新打开"); .throwMessage("当前工单状态不允许重新打开");
ticket.setState(TicketState.Processing.getState()); ticket.setState(TicketState.Processing.getState());
ticket.setSolveTime(null); ticket.setSolveTime(null);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
View File

@ -360,7 +360,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
Ticket ticket = lambdaQuery().eq(Ticket::getId, id).one(); Ticket ticket = lambdaQuery().eq(Ticket::getId, id).one();
VUtils.trueThrowBusinessError(!(Objects.equals(ticket.getUserId(), AppUserUtil.getUserId()) && StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom()))) VUtils.trueThrowBusinessError(!(Objects.equals(ticket.getUserId(), AppUserUtil.getUserId()) && StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom())))
.throwMessage("无权操作该工单"); .throwMessage("无权操作该工单");
VUtils.trueThrowBusinessError(Byte.compare(ticket.getState(), TicketState.ProcessingCompleted.getState()) > 0) VUtils.trueThrowBusinessError(ticket.getState() > TicketState.ProcessingCompleted.getState())
.throwMessage("当前工单状态不允许重新打开"); .throwMessage("当前工单状态不允许重新打开");
ticket.setState(TicketState.Processing.getState()); ticket.setState(TicketState.Processing.getState());
ticket.setSolveTime(null); ticket.setSolveTime(null);