Merge remote-tracking branch 'origin/20210223' into 20210223

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.lang.reflect.Array;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -379,6 +380,29 @@ public class WorkOrderManageController {
         return new AjaxMessage<>(ResultStatus.OK, list);
     }
 
+    @GetMapping("/maintain/user")
+    @ApiOperation(value = "维护列表/人员")
+    public AjaxMessage<List<Map<String,Object>>> selectMaintainUser(){
+        List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
+        AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserListByType();
+        for(UserEntity userEntity : listAjaxMessage.getData()){
+            Map<String, Object> orderStatusMap = workOrderManageService.selectOrderUserStatus(userEntity.getId().toString());
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", userEntity.getId());
+            map.put("userName", userEntity.getUsername());
+            map.put("phone", userEntity.getPhone());
+            map.put("deptName", userEntity.getDeptOrgName());
+            if (orderStatusMap != null) {
+                map.put("status", orderStatusMap.get("S").toString());
+            }
+            else {
+                map.put("status", "空闲");
+            }
+            list.add(map);
+        }
+        return new AjaxMessage<>(ResultStatus.OK, list);
+    }
+
     @GetMapping("/pending")
     @ApiOperation(value = "查询待处理工单")
     public AjaxMessage<Pagination<WorkOrderManageDto>> selectPendingOrder(

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

@@ -191,8 +191,10 @@ public class ComDisplayController {
     @RequestMapping(value="selectPipeNetLayer" , method = RequestMethod.GET)
     @ApiOperation(value = "查询管网地图图层及设备")
     public AjaxMessage<List<PipeNetLayerDto>> selectPipeNetLayer(
-            @ApiParam(value = "公司机构id", required = true)@RequestParam Integer companyOrgId){
+            @ApiParam(value = "公司机构id", required = true)@RequestParam Integer companyOrgId,
+            @ApiParam(value = "一级场景类型名称", required = false) @RequestParam(required = false) String sceneTypeName){
         OnlineDataDto onlineDataDto=new OnlineDataDto();
+        onlineDataDto.setSceneTypeName(sceneTypeName);
         onlineDataDto.setFlag(1);
         onlineDataDto.setSceneIds(sceneService.findByParentIdsByCom(Long.valueOf(companyOrgId)));
         List<PipeNetLayerDto> result=onlineMonitorService.selectPipeNetLayer(onlineDataDto);
@@ -214,8 +216,10 @@ public class ComDisplayController {
     @RequestMapping(value="selectMapSuspension" , method = RequestMethod.GET)
     @ApiOperation(value = "查询地图悬浮数据")
     public AjaxMessage<List<MonitorDataCollectDto>> selectMapSuspension(
-            @ApiParam(value = "公司机构id", required = true)@RequestParam Integer companyOrgId){
+            @ApiParam(value = "公司机构id", required = true)@RequestParam Integer companyOrgId,
+            @ApiParam(value = "一级场景类型名称", required = false) @RequestParam(required = false) String sceneTypeName){
         MonitorDataCollectDto monitorDataCollectDto=new MonitorDataCollectDto();
+        monitorDataCollectDto.setSceneTypeName(sceneTypeName);
         monitorDataCollectDto.setFlag(1);
         monitorDataCollectDto.setSceneIds(sceneService.findByParentIdsByCom(Long.valueOf(companyOrgId)));
         List<MonitorDataCollectDto> result=onlineMonitorService.selectMapSuspension(monitorDataCollectDto);