Merge remote-tracking branch 'origin/master'

wangqian
2 parents 8d4a74f6 846cdcdc
Showing 5 changed files with 48 additions and 13 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/vo/DeviceUserRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/deviceuser/DeviceUserServiceImpl.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java
@@ -55,7 +55,7 @@ public class DeviceUserController {
     @GetMapping("/get/device_no")
     @Operation(summary = "通过设备编码获取设备绑定信息")
-    public CommonResult<DeviceUserRespVO> getDeviceUserByDeviceNo(@RequestParam("device_no") @NotBlank String deviceNo) {
+    public CommonResult<DeviceUserRespVO> 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<Boolean> deleteDeviceUser(@RequestParam("user_id") @NotNull Long userId,
-                                                  @RequestParam("device_no") @NotBlank String deviceNo) {
+    public CommonResult<Boolean> 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<PageResult<DeviceUserRespVO>> getDeviceUserPage(@Valid DeviceUserPageReqVO pageReqVO) {
-        PageResult<DeviceUserDO> pageResult = deviceUserService.getDeviceUserPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DeviceUserRespVO.class));
+        PageResult<DeviceUserRespVO> pageResult = deviceUserService.getDeviceUserPage(pageReqVO);
+        return success(pageResult);
     }
     @GetMapping("/export-excel")
@@ -103,10 +103,10 @@ public class DeviceUserController {
     public void exportDeviceUserExcel(@Valid DeviceUserPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<DeviceUserDO> list = deviceUserService.getDeviceUserPage(pageReqVO).getList();
+        List<DeviceUserRespVO> list = deviceUserService.getDeviceUserPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "设备用户关系.xls", "数据", DeviceUserRespVO.class,
-                        BeanUtils.toBean(list, DeviceUserRespVO.class));
+                        list);
     }
     @PostMapping("/findDeviceDeptTree")
@@ -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;
+
 }
@@ -56,7 +56,7 @@ public interface DeviceUserService {
      * @param pageReqVO 分页查询
      * @return 设备用户关系分页
      */
-    PageResult<DeviceUserDO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO);
+    PageResult<DeviceUserRespVO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO);
     /**
@@ -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();
@@ -55,8 +61,8 @@ public class DeviceUserServiceImpl implements DeviceUserService {
             deviceUser.setProductName(deviceInfo.getProductName());
             deviceUser.setCompanyId(createReqVO.getCompanyId());
             deviceUser.setDeptId(createReqVO.getDeptId());
-            deviceUser.setUserId(Long.parseLong(userId));
-            deviceUser.setUserName(userName);
+            deviceUser.setUserId(createReqVO.getUserId());
+            deviceUser.setUserName(createReqVO.getUserName());
             deviceUser.setCreateTime(now);
             deviceUser.setCreator(userId);
             deviceUser.setCreatorName(userName);
@@ -105,8 +111,30 @@ public class DeviceUserServiceImpl implements DeviceUserService {
     }
     @Override
-    public PageResult<DeviceUserDO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO) {
-        return deviceUserMapper.selectPage(pageReqVO);
+    public PageResult<DeviceUserRespVO> getDeviceUserPage(DeviceUserPageReqVO pageReqVO) {
+        PageResult<DeviceUserDO> pageResult = deviceUserMapper.selectPage(pageReqVO);
+        PageResult<DeviceUserRespVO> pageResultVO = BeanUtils.toBean(pageResult, DeviceUserRespVO.class);
+        if(CollectionUtil.isEmpty(pageResultVO.getList())){
+            return PageResult.empty();
+        }
+       //公司
+        Set<Long> companyIds = pageResultVO.getList().stream().map(DeviceUserRespVO::getCompanyId).collect(Collectors.toSet());
+        //部门
+        Set<Long> deptIds = pageResultVO.getList().stream().map(DeviceUserRespVO::getDeptId).collect(Collectors.toSet());
+        deptIds.addAll(companyIds);
+        /*1.获取部门*/
+        Map<Long, DeptRespDTO> 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
@@ -318,7 +318,7 @@ public class DeptServiceImpl implements DeptService {
         for(AdminUserDO adminUserDO :userList){
             UserDO userDO = new UserDO();
             userDO.setUserId(adminUserDO.getId());
-            userDO.setUsername(adminUserDO.getUsername());
+            userDO.setUsername(adminUserDO.getNickname());
             userDO.setCompanyId(getParentDeptId(adminUserDO.getDeptId()));
             userDO.setDeptId(adminUserDO.getDeptId());
             userDOList.add(userDO);