From a018beab2f72f34e15542a365c4ceb73648d67fe Mon Sep 17 00:00:00 2001 From: Ziin Date: Thu, 3 Jul 2025 15:23:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E7=A7=9F=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=AD=97=E6=AE=B5=202.=E4=B8=BB=E6=92=AD?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20updateTime=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=203.=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B7=B2=E5=88=86=E9=85=8D=E7=BB=99=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E7=9A=84=E4=B8=BB=E6=92=AD=E7=BB=99=E5=85=B6=E4=BB=96=E5=91=98?= =?UTF-8?q?=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmployeeHostsController.java | 10 ++++++ .../employeehosts/vo/EmployeeHostsRespVO.java | 4 +++ .../admin/newhosts/vo/NewHostsRespVO.java | 4 +++ .../employeehosts/EmployeeHostsService.java | 2 ++ .../EmployeeHostsServiceImpl.java | 11 ++++++ .../employeehosts/EmployeeHostsMapper.xml | 4 +-- .../mapper/newhosts/NewHostsMapper.xml | 2 +- .../tenant/vo/tenant/TenantSaveReqVO.java | 3 ++ .../controller/admin/user/UserController.java | 2 +- .../user/vo/user/UserClientSaveReqVO.java | 36 +++++++++++++++++++ .../admin/user/vo/user/UserRespVO.java | 3 +- .../admin/user/vo/user/UserSaveReqVO.java | 3 ++ .../dal/dataobject/user/AdminUserDO.java | 4 +++ .../system/service/user/AdminUserService.java | 2 +- .../service/user/AdminUserServiceImpl.java | 12 +------ 15 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserClientSaveReqVO.java diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java index bc56ae9..87ba731 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java @@ -53,6 +53,16 @@ public class EmployeeHostsController { return success(true); } + @PutMapping("/batch_update") + @Operation(summary = "批量更新员工分配主播") + @PreAuthorize("@ss.hasPermission('server:employee-hosts:batchupdate')") + public CommonResult updateEmployeeHosts(@RequestBody List updateReqVOList) { + employeeHostsService.batchUpdateEmployeeHosts(updateReqVOList); + return success(true); + } + + + @DeleteMapping("/delete") @Operation(summary = "删除员工分配主播") @Parameter(name = "id", description = "编号", required = true) diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java index 625cbea..b7fdf4d 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeHostsRespVO.java @@ -67,6 +67,10 @@ public class EmployeeHostsRespVO { @ExcelProperty("数据插入时间") private LocalDateTime createTime; + @Schema(description = "数据更新时间") + @ExcelProperty("数据更新时间") + private LocalDateTime updateTime; + @Schema(description = "备注", example = "1") private String remake; diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java index 0cc08c0..ed46243 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/newhosts/vo/NewHostsRespVO.java @@ -64,6 +64,10 @@ public class NewHostsRespVO { @ExcelProperty("数据插入时间") private LocalDateTime createTime; + @Schema(description = "数据更新时间") + @ExcelProperty("数据更新时间") + private LocalDateTime updateTime; + @Schema(description = "用户 Id", example = "10967") @ExcelProperty("用户 Id") private Long userId; diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java index da6988d..decc04b 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java @@ -62,4 +62,6 @@ public interface EmployeeHostsService { Integer allocationHostsEmployee(List hostsList); PageResult getEmployeeHostsPageWithSelf(@Valid EmployeeHostsPageReqVO pageReqVO); + + void batchUpdateEmployeeHosts(List updateReqVOList); } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index 9ec43db..ee72df3 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -136,4 +136,15 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { return null; } + @Override + public void batchUpdateEmployeeHosts(List updateReqVOList) { + + ArrayList employeeHostsDOS = new ArrayList<>(); + for (EmployeeHostsSaveReqVO employeeHostsSaveReqVO : updateReqVOList) { + EmployeeHostsDO updateObj = BeanUtils.toBean(employeeHostsSaveReqVO, EmployeeHostsDO.class); + employeeHostsDOS.add(updateObj); + } + employeeHostsMapper.updateBatch(employeeHostsDOS); + } + } \ No newline at end of file diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml index ab87796..e1f532f 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml @@ -62,7 +62,7 @@ select ns.id,hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum, - yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status,user_id,uid from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name + yesterday_coins,ns.create_time, country, online_fans,hosts_kind,remake ,operation_status,user_id,uid,ns.update_time from server_employee_hosts ns left join server_country_info ci ON ns.country = ci.country_name WHERE tenant_id = #{req.tenantId,jdbcType=BIGINT} and deleted = 0 diff --git a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml index 4b8c815..fc2f3bb 100644 --- a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml @@ -12,7 +12,7 @@