设备查询分页接口设置机构名称

sms_water/src/main/java/com/huaxu/controller/DeviceController.java

@@ -3,6 +3,7 @@ package com.huaxu.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.dto.AlarmSettingDto;
 import com.huaxu.dto.DeviceDto;
 import com.huaxu.entity.DeviceEntity;
 import com.huaxu.logAdvice.LogAnnotation;
@@ -10,6 +11,7 @@ import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
 import com.huaxu.service.DeviceService;
+import com.huaxu.util.OrgInfoUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,6 +30,8 @@ public class DeviceController {
 
     @Autowired
     private DeviceService deviceService;
+    @Autowired
+    private OrgInfoUtil orgInfoUtil;
 
     @RequestMapping(value="get" , method = RequestMethod.GET)
     @ApiOperation(value = "查询单个设备信息")
@@ -64,6 +68,10 @@ public class DeviceController {
         }
         iPage = deviceService.selectPage(iPage,deviceDto);
         Pagination<DeviceDto> pages = new Pagination<>(iPage);
+        for(DeviceDto device : pages.getList()){
+            device.setCompanyOrgName(orgInfoUtil.getOrgName(device.getCompanyOrgId()));
+            device.setDeptOrgName(orgInfoUtil.getOrgName(device.getDeptOrgId()));
+        }
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 

sms_water/src/main/java/com/huaxu/dto/DeviceDto.java

@@ -34,6 +34,10 @@ public class DeviceDto extends DeviceEntity {
     private String deviceType;
     @ApiModelProperty("设备型号")
     private String deviceMode;
+    @ApiModelProperty(value = "所属公司")
+    private String companyOrgName;
+    @ApiModelProperty(value = "所属部门")
+    private String deptOrgName;
 
     @ApiModelProperty(value ="权限",hidden = true)
     @JsonIgnore