diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java index f753641a..983828ed 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java @@ -240,7 +240,7 @@ public class AppUserController extends ControllerBase { .setTitleId(request.getTitleId()) .setCompanyId(StrUtil.join(",", request.getCompanyIds())) .setDepartmentId(request.getDepartmentId()) - .setRegionTypeId(request.getRegionTypeId()) +// .setRegionTypeId(request.getRegionTypeId()) .setUpdateBy(AdminUserUtil.getUserName()) .setUpdateTime(LocalDateTime.now()); if (!Objects.equals(user.getState(), UserState.ToBeActivated.getState()) && Objects.nonNull(request.getEnable())) { @@ -289,19 +289,19 @@ public class AppUserController extends ControllerBase { .setTitleId(request.getTitleId()) .setCompanyId(StrUtil.join(",", request.getCompanyIds())) .setDepartmentId(request.getDepartmentId()) - .setRegionTypeId(request.getRegionTypeId()) +// .setRegionTypeId(request.getRegionTypeId()) .setUpdateBy(AdminUserUtil.getUserName()) .setUpdateTime(LocalDateTime.now()); if (!Objects.equals(user.getState(), UserState.ToBeActivated.getState()) && Objects.nonNull(request.getEnable())) { user.setState(request.getEnable() ? UserState.Activated.getState() : UserState.Disabled.getState()); } - if (Objects.equals(user.getRegionTypeId(), request.getRegionTypeId())) { - List children = appUserService.getChildren(user); - appUserService.lambdaUpdate() - .set(AppUser::getRegionTypeId, request.getRegionTypeId()) - .in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList())) - .update(); - } +// if (Objects.equals(user.getRegionTypeId(), request.getRegionTypeId())) { +// List children = appUserService.getChildren(user); +// appUserService.lambdaUpdate() +// .set(AppUser::getRegionTypeId, request.getRegionTypeId()) +// .in(AppUser::getId, children.stream().map(AppUser::getId).collect(Collectors.toList())) +// .update(); +// } appUserService.updateById(user); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java index 414b75a0..874a43b3 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java @@ -89,10 +89,10 @@ public class CustomerController extends ControllerBase { @MethodInfoMark(value = "新增" ,menuName = "客户管理") @ApiMark(moduleName = "客户管理", apiName = "新增") public ApiResult add(@Valid @RequestBody CustomerDTO customerDTO) { + VUtils.trueThrow(CollUtil.isEmpty(customerDTO.getAreaList())).throwMessage(STATE.ParamErr,"公司区域不能为空"); //检查公司名称是否已存在 List existCompany = baseCustomerService.lambdaQuery().eq(TBaseCustomer::getAgencyCompanyName, customerDTO.getAgencyCompanyName()).list(); 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); ent.setId(null); ent.setAgencyCompanyCode(UniqueSequenceGenerator.generateCode(Constant.CustomerCodePrefix)); @@ -118,11 +118,10 @@ public class CustomerController extends ControllerBase { @MethodInfoMark(value = "编辑" ,menuName = "客户管理") @ApiMark(moduleName = "客户管理", apiName = "编辑") public ApiResult updateCompany(@Valid @RequestBody CustomerDTO customerDTO) { + VUtils.trueThrow(CollUtil.isEmpty(customerDTO.getAreaList())).throwMessage(STATE.ParamErr,"公司区域不能为空"); //检查公司名称是否已存在 TBaseCustomer oldEnt = baseCustomerService.getById(customerDTO.getId()); VUtils.trueThrow(Objects.isNull(oldEnt)).throwMessage(STATE.PageError,customerDTO.getAgencyCompanyName()+"公司不存在"); - - VUtils.trueThrow(CollUtil.isEmpty(customerDTO.getAreaList())).throwMessage(STATE.ParamErr,"公司区域不能为空"); BeanUtil.copyProperties(customerDTO,oldEnt); 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()))); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java index 932c9ee0..81cc74ca 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java @@ -88,5 +88,5 @@ public class CustomerDTO { * 是否报价对象 */ @NotNull(message = "是否报价对象不能为空") - private Boolean quotationUse; + private Boolean quotationUse=false; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/PrimaryAppUserAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/PrimaryAppUserAddRequest.java index 4986ca4b..cfab7246 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/PrimaryAppUserAddRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/PrimaryAppUserAddRequest.java @@ -53,9 +53,9 @@ public class PrimaryAppUserAddRequest { @NotNull(message = "部门不能为空") private Long departmentId; - /** - * 地域类型，字典id - */ - @NotNull(message = "地域类型不能为空") - private Integer regionTypeId; +// /** +// * 地域类型，字典id +// */ +// @NotNull(message = "地域类型不能为空") +// private Integer regionTypeId; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAdminUtil.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAdminUtil.java index 824fe2eb..fa92f7c1 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAdminUtil.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAdminUtil.java @@ -140,7 +140,7 @@ public class SaTokenAdminUtil { } public static T getLoginId(T defaultValue) { - return (T)stpLogic.getLoginId(defaultValue); + return stpLogic.getLoginId(defaultValue); } public static Object getLoginIdDefaultNull() { diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAppUtil.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAppUtil.java index 1c291868..eddf7f27 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAppUtil.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/SaTokenAppUtil.java @@ -141,7 +141,7 @@ public class SaTokenAppUtil { } public static T getLoginId(T defaultValue) { - return (T)stpLogic.getLoginId(defaultValue); + return stpLogic.getLoginId(defaultValue); } public static Object getLoginIdDefaultNull() { diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/event/TicketCallBeginEvent.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/event/TicketCallBeginEvent.java index 08493829..283ca39b 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/event/TicketCallBeginEvent.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/event/TicketCallBeginEvent.java @@ -40,9 +40,9 @@ public class TicketCallBeginEvent extends ApplicationEvent implements Applicatio .setSenderName("通话助手") .setContent(userName + "发起了视频通话") .setCreateTime(Instant.now()); - ticketChatService.addMessage(Long.valueOf(ticketId), message); + ticketChatService.addMessage(ticketId, message); //推送消息 - ssePushService.sendTicketMessageToAdmin(Long.valueOf(ticketId), message); - ssePushService.sendTicketMessageToApp(Long.valueOf(ticketId), message); + ssePushService.sendTicketMessageToAdmin(ticketId, message); + ssePushService.sendTicketMessageToApp(ticketId, message); } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java index ab6dd52a..aa0ec664 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java @@ -151,11 +151,11 @@ public class AppUser implements Serializable { */ private String customerName; - /** - * 地域类型，字典id - */ - @TableField("region_type_id") - private Integer regionTypeId; +// /** +// * 地域类型，字典id +// */ +// @TableField("region_type_id") +// private Integer regionTypeId; /** * 部门id diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleServiceImpl.java index 3aa1b820..cd860ec0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleServiceImpl.java @@ -95,7 +95,7 @@ public class AdminRoleServiceImpl extends ServiceImpl datas){ - if (!Objects.equals(0,menu.getParentId())){ + if (!Objects.equals(0L,menu.getParentId())){ AdminMenu mp=menuService.getById(menu.getParentId()); 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()); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java index 3b87ec33..69fb34c7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java @@ -220,7 +220,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl impl .setUpdateBy(AdminUserUtil.getUserName()) .setUpdateTime(LocalDateTime.now()) .setDepartmentId(request.getDepartmentId()) - .setRegionTypeId(request.getRegionTypeId()) +// .setRegionTypeId(request.getRegionTypeId()) .setState(UserState.ToBeActivated.getState()) .setExpireTime(LocalDate.of(LocalDateTime.now().getYear() + 1, 1, 1)); updateById(user); @@ -194,7 +194,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .setLanguageCode(request.getLanguageCode()) .setSalesUserName(request.getSalesUserName()) .setDepartmentId(request.getDepartmentId()) - .setRegionTypeId(request.getRegionTypeId()) +// .setRegionTypeId(request.getRegionTypeId()) .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()) .setState(UserState.ToBeActivated.getState()) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java index 07096f6d..0cb577ae 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java @@ -11,6 +11,7 @@ import com.nflg.mobilebroken.repository.mapper.DeviceComponentMapper; import com.nflg.mobilebroken.repository.service.IDeviceComponentService; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -49,14 +50,14 @@ public class DeviceComponentServiceImpl extends ServiceImpl data){ return this.saveOrUpdateBatch(data); } public void batchDelComponent(List ids){ - this.getBaseMapper().deleteBatchIds(ids); + this.getBaseMapper().deleteByIds(ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceComponentServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceComponentServiceImpl.java index 6cb1edcb..1e0edd8b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceComponentServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceComponentServiceImpl.java @@ -11,6 +11,7 @@ import com.nflg.mobilebroken.repository.mapper.GongfuDeviceComponentMapper; import com.nflg.mobilebroken.repository.service.IGongfuDeviceComponentService; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -47,14 +48,14 @@ public class GongfuDeviceComponentServiceImpl extends ServiceImpl data) { return this.saveOrUpdateBatch(data); } public void batchDelComponent(List ids) { - this.getBaseMapper().deleteBatchIds(ids); + this.getBaseMapper().deleteByIds(ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java index 0b7ea6a5..09290dd0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java @@ -323,7 +323,7 @@ public class GongfuTicketServiceImpl extends ServiceImpl 0) + VUtils.trueThrowBusinessError(ticket.getState() > TicketState.ProcessingCompleted.getState()) .throwMessage("当前工单状态不允许重新打开"); ticket.setState(TicketState.Processing.getState()); ticket.setSolveTime(null); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java index 5e589aee..081d7c53 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java @@ -360,7 +360,7 @@ public class TicketServiceImpl extends ServiceImpl impleme Ticket ticket = lambdaQuery().eq(Ticket::getId, id).one(); VUtils.trueThrowBusinessError(!(Objects.equals(ticket.getUserId(), AppUserUtil.getUserId()) && StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom()))) .throwMessage("无权操作该工单"); - VUtils.trueThrowBusinessError(Byte.compare(ticket.getState(), TicketState.ProcessingCompleted.getState()) > 0) + VUtils.trueThrowBusinessError(ticket.getState() > TicketState.ProcessingCompleted.getState()) .throwMessage("当前工单状态不允许重新打开"); ticket.setState(TicketState.Processing.getState()); ticket.setSolveTime(null);