Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteExcleDto.java

@@ -29,7 +29,7 @@ public class KeySiteExcleDto implements Serializable {
 	private String name;
 
 	@ExcelProperty(value = "所属单位/部门id", index = 1)
-	@ExplicitConstraint(indexNum = 1,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyList") //固定下拉内容
+	@ExplicitConstraint(indexNum = 1,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyDetailTree") //固定下拉内容
 	@ApiModelProperty(value = "所属单位/部门id")
 	private String belongName;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -328,9 +328,9 @@ public class CommandController extends BaseController {
      * **/
 
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "JQ")
+    @GetMapping(value = "JQ/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询灾情详情", notes = "根据id查询灾情详情")
-    public ResponseModel<Object> selectById( Long id) {
+    public ResponseModel<Object> selectById( @PathVariable Long id) {
 
         return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledKeyValueLabelById(id));
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -974,4 +974,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
   	});  	  
 	  return lidataDtos;
 	}
+	
+	public List<OrgUsr> getCompanyDetailTree() {
+		LambdaQueryWrapper<OrgUsr> wrapper= new LambdaQueryWrapper<OrgUsr>(); 
+		wrapper.eq(OrgUsr::getBizOrgType, "COMPANY");
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		return	this.baseMapper.selectList(wrapper);
+	}
+	
+	
 }
+
+
+	
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -46,219 +46,231 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 @Service
 public class DataSourcesImpl implements DataSources {
 
-    @Resource
-    DataDictionaryMapper dataDictionaryMapper;
-    @Autowired
-    EquipmentServiceImpl equipmentService;
-    @Autowired
-    OrgUsrServiceImpl orgUsrService;
-    @Autowired
-    FirefightersServiceImpl firefightersService;
-    @Autowired
-    FireTeamServiceImpl fireTeamService;
-    @Autowired
-    EquipFeignClient equipFeignClient;
+	@Resource
+	DataDictionaryMapper dataDictionaryMapper;
+	@Autowired
+	EquipmentServiceImpl equipmentService;
+	@Autowired
+	OrgUsrServiceImpl orgUsrService;
+	@Autowired
+	FirefightersServiceImpl firefightersService;
+	@Autowired
+	FireTeamServiceImpl fireTeamService;
+	@Autowired
+	EquipFeignClient equipFeignClient;
 
-    @Autowired
+	@Autowired
 	IMaintenanceCompanyService maintenanceCompanyService;
-    
-    @Autowired
-    IKeySiteService keySiteService;
-    @Autowired
-    private RestTemplate restTemplate;
 
-    @Value("${security.systemctl.name}")
-    private String systemctl;
+	@Autowired
+	IKeySiteService keySiteService;
+	@Autowired
+	private RestTemplate restTemplate;
 
-    @Override
-    public String[] selectList(String type, String method) throws Exception {
-        String[] str = {};
-        if (StringUtils.isNotEmpty(type)) {
-            str = getDataDictionary(type);
-        } else {
-            switch (method) {
-                case "getNations":
-                    str = ExcelSelectData.NATION;
-                    break;
-                case "getPoliticalOutlook":
-                    str = ExcelSelectData.POLITICAL_OUTLOOK;
-                    break;
-                case "getAdministrativeDivisions":
-                    // 设置请求头
-                    HttpHeaders headers = new HttpHeaders();
-                    headers.setContentType(MediaType.valueOf("application/json; charset=utf-8"));
-                    // 用HttpEntity封装整个请求报文
-                    HttpEntity<Object> httpEntity = new HttpEntity<>(null, headers);
-                    ResponseEntity<String> responseEntity = restTemplate.exchange("http://" + systemctl + "/systemctl" +
-                                    "/v1" +
-                                    "/region/tree/parent", HttpMethod.GET,
-                            httpEntity, String.class);
-                    String body = responseEntity.getBody();
-                    break;
-                case "getBuildingList":
-                    str = getBuildingList();
-                    break;
-                case "getFireSystemList":
-                    str = getFireSystemList();
-                    break;
-                case "getCompanyList":
-                    str = getCompanyList();
-                    break;
-                case "getFirefighters":
-                    str = getFirefighters();
-                    break;
-                case "getBizCompanyList":
-                    str = getBizCompanyList();
-                    break;
-                case "getFireTeam":
-                    str = getFireTeam();
-                    break;
-                case "getMaritalStatus":
-                    str = ExcelSelectData.MARITAL_STATUS;
-                    break;
-                case "getCarList":
-                    str = getCarList();
-                    break;
-                case "getCompanyAndDeparementTree":
-                	str= getCompanyAndDeparementTree();
-                	break;
-                case "getBuildTree":
-                	str=getBuildTree();
-                	break;
-            }
-        }
-        return str;
-    }
+	@Value("${security.systemctl.name}")
+	private String systemctl;
 
-    private String[] getCarList() {
-        ResponseModel<Object> response = equipFeignClient.getFireCarListAll();
-        List<Map<String, Object>> carList = (List<Map<String, Object>>) response.getResult();
-        List<String> carNameList = Lists.newArrayList();
-        carList.forEach(car -> {
-            carNameList.add(car.get("name") + "(" + car.get("carNum") + ")" + "@" + car.get("id"));
-        });
-        String[] str = carNameList.toArray(new String[carNameList.size()]);
-        return str;
-    }
+	@Override
+	public String[] selectList(String type, String method) throws Exception {
+		String[] str = {};
+		if (StringUtils.isNotEmpty(type)) {
+			str = getDataDictionary(type);
+		} else {
+			switch (method) {
+			case "getNations":
+				str = ExcelSelectData.NATION;
+				break;
+			case "getPoliticalOutlook":
+				str = ExcelSelectData.POLITICAL_OUTLOOK;
+				break;
+			case "getAdministrativeDivisions":
+				// 设置请求头
+				HttpHeaders headers = new HttpHeaders();
+				headers.setContentType(MediaType.valueOf("application/json; charset=utf-8"));
+				// 用HttpEntity封装整个请求报文
+				HttpEntity<Object> httpEntity = new HttpEntity<>(null, headers);
+				ResponseEntity<String> responseEntity = restTemplate.exchange(
+						"http://" + systemctl + "/systemctl" + "/v1" + "/region/tree/parent", HttpMethod.GET,
+						httpEntity, String.class);
+				String body = responseEntity.getBody();
+				break;
+			case "getBuildingList":
+				str = getBuildingList();
+				break;
+			case "getFireSystemList":
+				str = getFireSystemList();
+				break;
+			case "getCompanyList":
+				str = getCompanyList();
+				break;
+			case "getFirefighters":
+				str = getFirefighters();
+				break;
+			case "getBizCompanyList":
+				str = getBizCompanyList();
+				break;
+			case "getFireTeam":
+				str = getFireTeam();
+				break;
+			case "getMaritalStatus":
+				str = ExcelSelectData.MARITAL_STATUS;
+				break;
+			case "getCarList":
+				str = getCarList();
+				break;
+			case "getCompanyAndDeparementTree":
+				str = getCompanyAndDeparementTree();
+				break;
+			case "getBuildTree":
+				str = getBuildTree();
+				break;
+			case "getCompanyDetailTree":
+				str =getCompanyDetailTree();
+				break;
+			}
+		}
+		return str;
+	}
 
-    private String[] getFireTeam() {
-        Page<FireTeamCardDto> pageBean = new Page<>(1, Integer.MAX_VALUE);
-        IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
-                new FireTeamListDto());
-        List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
-        List<String> names = records.stream().map(item -> {
-            return item.getName() + "@" + item.getSequenceNbr();
-        }).collect(Collectors.toList());
-        String[] str = names.toArray(new String[names.size()]);
-        return str;
-    }
+	private String[] getCarList() {
+		ResponseModel<Object> response = equipFeignClient.getFireCarListAll();
+		List<Map<String, Object>> carList = (List<Map<String, Object>>) response.getResult();
+		List<String> carNameList = Lists.newArrayList();
+		carList.forEach(car -> {
+			carNameList.add(car.get("name") + "(" + car.get("carNum") + ")" + "@" + car.get("id"));
+		});
+		String[] str = carNameList.toArray(new String[carNameList.size()]);
+		return str;
+	}
 
-    private String[] getBizCompanyList() throws Exception {
-        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
-                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
-        List<String> stringList = new ArrayList<String>();
-        initBizCompanyList(orgUsrTree, stringList);
-        String[] str = stringList.toArray(new String[stringList.size()]);
-        return str;
-    }
+	private String[] getFireTeam() {
+		Page<FireTeamCardDto> pageBean = new Page<>(1, Integer.MAX_VALUE);
+		IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
+				new FireTeamListDto());
+		List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
+		List<String> names = records.stream().map(item -> {
+			return item.getName() + "@" + item.getSequenceNbr();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
 
-    private void initBizCompanyList(List<OrgMenuDto> orgUsrTree, List<String> stringList) {
-        for (OrgMenuDto orgMenuDto : orgUsrTree) {
-            stringList.add(orgMenuDto.getName() + "@" + orgMenuDto.getKey() + "@" + orgMenuDto.getBizOrgCode());
-            List<OrgMenuDto> children = orgMenuDto.getChildren();
-            if (children != null && children.size() > 0) {
-                initCompanyList(children, stringList);
-            }
-        }
-    }
+	private String[] getBizCompanyList() throws Exception {
+		List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
+				OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+		List<String> stringList = new ArrayList<String>();
+		initBizCompanyList(orgUsrTree, stringList);
+		String[] str = stringList.toArray(new String[stringList.size()]);
+		return str;
+	}
 
-    private String[] getFirefighters() {
-        List<FirefightersZhDto> firefighters = firefightersService.getFirefighters(1, Integer.MAX_VALUE,
-                new FirefightersDto());
-        List<String> names = firefighters.stream().map(item -> {
-            return item.getName() + "@" + item.getSequenceNbr();
-        }).collect(Collectors.toList());
-        String[] str = names.toArray(new String[names.size()]);
-        return str;
-    }
+	private void initBizCompanyList(List<OrgMenuDto> orgUsrTree, List<String> stringList) {
+		for (OrgMenuDto orgMenuDto : orgUsrTree) {
+			stringList.add(orgMenuDto.getName() + "@" + orgMenuDto.getKey() + "@" + orgMenuDto.getBizOrgCode());
+			List<OrgMenuDto> children = orgMenuDto.getChildren();
+			if (children != null && children.size() > 0) {
+				initCompanyList(children, stringList);
+			}
+		}
+	}
 
-    private String[] getCompanyList() throws Exception {
-        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
-                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
-        List<String> stringList = new ArrayList<String>();
-        initCompanyList(orgUsrTree, stringList);
-        String[] str = stringList.toArray(new String[stringList.size()]);
-        return str;
-    }
+	private String[] getFirefighters() {
+		List<FirefightersZhDto> firefighters = firefightersService.getFirefighters(1, Integer.MAX_VALUE,
+				new FirefightersDto());
+		List<String> names = firefighters.stream().map(item -> {
+			return item.getName() + "@" + item.getSequenceNbr();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
 
-    private void initCompanyList(List<OrgMenuDto> orgUsrTree, List<String> stringList) {
-        for (OrgMenuDto orgMenuDto : orgUsrTree) {
-            stringList.add(orgMenuDto.getName() + "@" + orgMenuDto.getKey());
-            List<OrgMenuDto> children = orgMenuDto.getChildren();
-            if (children != null && children.size() > 0) {
-                initCompanyList(children, stringList);
-            }
-        }
-    }
+	private String[] getCompanyList() throws Exception {
+		List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
+				OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+		List<String> stringList = new ArrayList<String>();
+		initCompanyList(orgUsrTree, stringList);
+		String[] str = stringList.toArray(new String[stringList.size()]);
+		return str;
+	}
 
-    private String[] getFireSystemList() {
-        List<MenuFrom> fireSystemList = equipmentService.getFireSystemList();
-        List<String> names = fireSystemList.stream().map(item -> {
-            return item.getName() + "@" + item.getKey();
-        }).collect(Collectors.toList());
-        String[] str = names.toArray(new String[names.size()]);
-        return str;
-    }
+	private void initCompanyList(List<OrgMenuDto> orgUsrTree, List<String> stringList) {
+		for (OrgMenuDto orgMenuDto : orgUsrTree) {
+			stringList.add(orgMenuDto.getName() + "@" + orgMenuDto.getKey());
+			List<OrgMenuDto> children = orgMenuDto.getChildren();
+			if (children != null && children.size() > 0) {
+				initCompanyList(children, stringList);
+			}
+		}
+	}
 
-    private String[] getBuildingList() {
-        List<MenuFrom> buildingList = equipmentService.getBuildingList();
-        List<String> buildingNames = buildingList.stream().map(item -> {
-            return item.getName() + "@" + item.getKey();
-        }).collect(Collectors.toList());
-        String[] str = buildingNames.toArray(new String[buildingNames.size()]);
-        return str;
-    }
+	private String[] getFireSystemList() {
+		List<MenuFrom> fireSystemList = equipmentService.getFireSystemList();
+		List<String> names = fireSystemList.stream().map(item -> {
+			return item.getName() + "@" + item.getKey();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
 
-    private String[] getDataDictionary(String type) {
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
-        List<DataDictionary> list = dataDictionaryMapper.selectList(queryWrapper);
-        List<String> names = list.stream().map(dataDictionary -> {
-            return dataDictionary.getName() + "@" + dataDictionary.getCode();
-        }).collect(Collectors.toList());
-        String[] str = names.toArray(new String[names.size()]);
-        return str;
-    }
-  private String[] getCompanyAndDeparementTree() throws Exception {
-	  List<OrgMenuDto> menus = orgUsrService.getTree(null,
-				maintenanceCompanyService.getCompanyAndDepartmentTree(), MaintenanceCompany.class.getName(),
-				"getSequenceNbr", 2, "getName", "getParentId", "getType");
-	  List<String> stringList = new ArrayList<String>();
-      initCompanyList(menus, stringList);
-      String[] str = stringList.toArray(new String[stringList.size()]);
-      return str;
-	  
-  }
-  private String[] getBuildTree() throws Exception {
-	  List<Object> menus = keySiteService.getBuildTree();
-	  List<String> stringList = new ArrayList<String>();
-      initBuildTreeList(menus, stringList);
-      String[] str = stringList.toArray(new String[stringList.size()]);
-      return str;
-	  
-  }
+	private String[] getBuildingList() {
+		List<MenuFrom> buildingList = equipmentService.getBuildingList();
+		List<String> buildingNames = buildingList.stream().map(item -> {
+			return item.getName() + "@" + item.getKey();
+		}).collect(Collectors.toList());
+		String[] str = buildingNames.toArray(new String[buildingNames.size()]);
+		return str;
+	}
 
-private void initBuildTreeList(List<Object> menus, List<String> stringList) {
-	 for (Object orgMenuDto : menus) {
-		 JSONObject detailObject= JSONObject.parseObject(orgMenuDto.toString());
-		 if(detailObject.containsKey("id")) {
-			  stringList.add(detailObject.getString("name") + "@" + detailObject.getString("id"));
-		 }
-         JSONArray children = detailObject.getJSONArray("children");
-         if (children != null && children.size() > 0) {
-        	 initBuildTreeList(children, stringList);
-         }
-     }
-}
+	private String[] getDataDictionary(String type) {
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+		List<DataDictionary> list = dataDictionaryMapper.selectList(queryWrapper);
+		List<String> names = list.stream().map(dataDictionary -> {
+			return dataDictionary.getName() + "@" + dataDictionary.getCode();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
+
+	private String[] getCompanyAndDeparementTree() throws Exception {
+		List<OrgMenuDto> menus = orgUsrService.getTree(null, maintenanceCompanyService.getCompanyAndDepartmentTree(),
+				MaintenanceCompany.class.getName(), "getSequenceNbr", 2, "getName", "getParentId", "getType");
+		List<String> stringList = new ArrayList<String>();
+		initCompanyList(menus, stringList);
+		String[] str = stringList.toArray(new String[stringList.size()]);
+		return str;
+
+	}
+
+	private String[] getBuildTree() throws Exception {
+		List<Object> menus = keySiteService.getBuildTree();
+		List<String> stringList = new ArrayList<String>();
+		initBuildTreeList(menus, stringList);
+		String[] str = stringList.toArray(new String[stringList.size()]);
+		return str;
+
+	}
+
+	private void initBuildTreeList(List<Object> menus, List<String> stringList) {
+		for (Object orgMenuDto : menus) {
+			JSONObject detailObject = JSONObject.parseObject(orgMenuDto.toString());
+			if (detailObject.containsKey("id")) {
+				stringList.add(detailObject.getString("id") + "@" + detailObject.getString("name"));
+			}
+			JSONArray children = detailObject.getJSONArray("children");
+			if (children != null && children.size() > 0) {
+				initBuildTreeList(children, stringList);
+			}
+		}
+	}
+	
+	 private String[] getCompanyDetailTree() throws Exception {
+	        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.getCompanyDetailTree(),
+	                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+	        List<String> stringList = new ArrayList<String>();
+	        initCompanyList(orgUsrTree, stringList);
+	        String[] str = stringList.toArray(new String[stringList.size()]);
+	        return str;
+	    }
 }