diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java index 383e4e4..e147c35 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java @@ -55,7 +55,7 @@ public class DeviceUserController { @GetMapping("/get/device_no") @Operation(summary = "通过设备编码获取设备绑定信息") - public CommonResult getDeviceUserByDeviceNo(@RequestParam("device_no") @NotBlank String deviceNo) { + public CommonResult getDeviceUserByDeviceNo(@RequestParam("deviceNo") @NotBlank String deviceNo) { DeviceUserRespVO deviceUser = deviceUserService.getDeviceUserByDeviceNo(deviceNo); return success(deviceUser); } @@ -64,8 +64,8 @@ public class DeviceUserController { @Operation(summary = "删除设备用户关系") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('garden:device-user:delete')") - public CommonResult deleteDeviceUser(@RequestParam("user_id") @NotNull Long userId, - @RequestParam("device_no") @NotBlank String deviceNo) { + public CommonResult deleteDeviceUser(@RequestParam("userId") @NotNull Long userId, + @RequestParam("deviceNo") @NotBlank String deviceNo) { deviceUserService.deleteDeviceUser(userId, deviceNo); return success(true); } @@ -92,8 +92,8 @@ public class DeviceUserController { @Operation(summary = "获得设备用户关系分页") //@PreAuthorize("@ss.hasPermission('garden:device-user:query')") public CommonResult> getDeviceUserPage(@Valid DeviceUserPageReqVO pageReqVO) { - PageResult pageResult = deviceUserService.getDeviceUserPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, DeviceUserRespVO.class)); + PageResult pageResult = deviceUserService.getDeviceUserPage(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/vo/DeviceUserRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/vo/DeviceUserRespVO.java index 86689c8..2626933 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/vo/DeviceUserRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/vo/DeviceUserRespVO.java @@ -57,5 +57,12 @@ public class DeviceUserRespVO { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "20800") + @ExcelProperty("归属(一级部门id)") + private String companyName; + + @ExcelProperty("部门(道路负责部门)") + private String deptName; + } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserService.java index 5cfd74b..bba2f3f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserService.java @@ -56,7 +56,7 @@ public interface DeviceUserService { * @param pageReqVO 分页查询 * @return 设备用户关系分页 */ - PageResult getDeviceUserPage(DeviceUserPageReqVO pageReqVO); + PageResult getDeviceUserPage(DeviceUserPageReqVO pageReqVO); /** diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java index 9dd92ad..93202d3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java @@ -6,8 +6,11 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanRespVO; import com.zteits.urbanops.module.garden.util.DeviceDeptTreeUtils; import com.zteits.urbanops.module.garden.util.http.OkHttpClientUtil; +import com.zteits.urbanops.module.system.api.dept.DeptApi; +import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; @@ -41,6 +44,9 @@ public class DeviceUserServiceImpl implements DeviceUserService { @Resource private DeviceUserMapper deviceUserMapper; + @Resource + private DeptApi deptApi; + @Override public Long createDeviceUser(DeviceUserSaveReqVO createReqVO) { LocalDateTime now = LocalDateTime.now(); @@ -105,8 +111,30 @@ public class DeviceUserServiceImpl implements DeviceUserService { } @Override - public PageResult getDeviceUserPage(DeviceUserPageReqVO pageReqVO) { - return deviceUserMapper.selectPage(pageReqVO); + public PageResult getDeviceUserPage(DeviceUserPageReqVO pageReqVO) { + PageResult pageResult = deviceUserMapper.selectPage(pageReqVO); + PageResult pageResultVO = BeanUtils.toBean(pageResult, DeviceUserRespVO.class); + if(CollectionUtil.isEmpty(pageResultVO.getList())){ + return PageResult.empty(); + } + //公司 + Set companyIds = pageResultVO.getList().stream().map(DeviceUserRespVO::getCompanyId).collect(Collectors.toSet()); + //部门 + Set deptIds = pageResultVO.getList().stream().map(DeviceUserRespVO::getDeptId).collect(Collectors.toSet()); + deptIds.addAll(companyIds); + /*1.获取部门*/ + Map deptMap = deptApi.getDeptMap(deptIds); + pageResultVO.getList().forEach(deviceUserRespVO -> { + DeptRespDTO deptRespDTO = deptMap.get(deviceUserRespVO.getDeptId()); + if(deptRespDTO != null){ + deviceUserRespVO.setDeptName(deptRespDTO.getName()); + } + DeptRespDTO company = deptMap.get(deviceUserRespVO.getCompanyId()); + if(company != null){ + deviceUserRespVO.setCompanyName(company.getName()); + } + }); + return pageResultVO; } @Override