解决冲突

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

@@ -132,13 +132,11 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		if (linkageUnitDto.getAddress() != null) {
 			JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(linkageUnitDto.getAddress());
 			linkageUnitDto.setAddress(address.getString(BizConstant.ADDRESS));
-			String[] addressArr = linkageUnitDto.getAddress().split("@address@");
-			JSONObject jsonObject = JSONObject.parseObject(addressArr[1]);
-			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LONGITUDE))) {
-				linkageUnitDto.setLongitude(Double.valueOf(jsonObject.getString(BizConstant.LONGITUDE)));
+			if (StringUtils.isNotEmpty(address.getString(BizConstant.LONGITUDE))) {
+				linkageUnitDto.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
 			}
-			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LATITUDE))) {
-				linkageUnitDto.setLatitude(Double.valueOf(jsonObject.getString(BizConstant.LATITUDE)));
+			if (StringUtils.isNotEmpty(address.getString(BizConstant.LATITUDE))) {
+				linkageUnitDto.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
 			}
 		}
 		// 1.保存行数据

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

@@ -1710,7 +1710,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		// BUG 2843 过滤没有绑定关联账户的user by kongfm 2021-09-16
 		List<OrgUsr> tempUserList = this
 				.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getParentId, parentId)
-						.eq(OrgUsr::getBizOrgType, bizOrgType).isNotNull(OrgUsr::getAmosOrgId));
+						.eq(OrgUsr::getBizOrgType, bizOrgType));
 		tempUserList.stream().forEach(m -> {
 			if (StringUtils.isNotEmpty(m.getAmosOrgId())) {
 				FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(m.getAmosOrgId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -435,7 +435,11 @@ public class ConfigureController extends AbstractBaseController {
         if (StringUtils.isNotBlank(systemCode)) {
             hashMap.put("systemCode", systemCode);
         }
-        return CommonResponseUtil.success(iFireFightingSystemService.getSystemName(hashMap));
+        Map<String, Object> map = iFireFightingSystemService.getSystemName(hashMap);
+        if (StringUtils.isEmpty(systemCode)) {
+            map.put("name", "");
+        }
+        return CommonResponseUtil.success(map);
     }
     @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -459,6 +463,34 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.getSystemStatus(hashMap));
     }
+
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "获取系统工作状态（根据系统编码查询）")
+    @GetMapping("/buildSystemStatus")
+    public ResponseModel buildEquipSystemStatus(@RequestParam(required = false) String systemCode) {
+        HashMap<String, Object> hashMap = new HashMap<>();
+        ReginParams reginParams = getSelectedOrgInfo();
+        ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+        if (!ValidationUtil.isEmpty(personIdentity)) {
+            String bizOrgCode = personIdentity.getBizOrgCode();
+            if (StringUtils.isNotBlank(bizOrgCode)) {
+                hashMap.put("bizOrgCode", bizOrgCode);
+            }
+            if (bizOrgCode == null) {
+                return CommonResponseUtil.success(null);
+            }
+        }
+        if (StringUtils.isNotBlank(systemCode)) {
+            hashMap.put("systemCode", systemCode);
+        }
+        Map<String, Object> map = iFireFightingSystemService.getSystemStatus(hashMap);
+        if (map.containsKey("labels")) {
+            map.put("labels", "异常");
+        }
+        return CommonResponseUtil.success(map);
+    }
+
     @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取系统近一月告警设备top5（根据系统编码查询）")