feat:拆解orgId

server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmConfigHeartDTOVO.java

@@ -22,7 +22,7 @@ public class PlatAlarmConfigHeartDTOVO {
     private Integer heartRateStart;
     private Integer heartRateStart;
 
 
     @ApiModelProperty("心率正常范围结束")
     @ApiModelProperty("心率正常范围结束")
-    private Integer heartRateEnd;
+    private Integer heartRateeEnd;
 
 
     @ApiModelProperty("异常持续时间")
     @ApiModelProperty("异常持续时间")
     private Integer duration;
     private Integer duration;

server-service/src/main/java/com/makeit/dto/platform/auth/PlatOrgSplitDTO.java

+package com.makeit.dto.platform.auth;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PlatOrgSplitDTO {
+    @ApiModelProperty(value = "部门树id")
+    private String orgId;
+
+    @ApiModelProperty(value = "城市组织id")
+    private String cityOrgId;
+
+    @ApiModelProperty(value = "区组织id")
+    private String districtOrgId;
+
+    @ApiModelProperty(value = "街道组织id")
+    private String streetOrgId;
+
+    @ApiModelProperty(value = "组织路径")
+    private String orgPath;
+}

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java

@@ -55,7 +55,7 @@ public class HeartAlarm implements IAlarm {
         int hr = (int) properties.get("hr");
         int hr = (int) properties.get("hr");
         PlatAlarmConfigHeartDTOVO ruleConfig = JsonUtil.toObj(ruleConfigStr, PlatAlarmConfigHeartDTOVO.class);
         PlatAlarmConfigHeartDTOVO ruleConfig = JsonUtil.toObj(ruleConfigStr, PlatAlarmConfigHeartDTOVO.class);
         Integer start = ruleConfig.getHeartRateStart();
         Integer start = ruleConfig.getHeartRateStart();
-        Integer end = ruleConfig.getHeartRateEnd();
+        Integer end = ruleConfig.getHeartRateeEnd();
         Integer duration = ruleConfig.getDuration();
         Integer duration = ruleConfig.getDuration();
         Date now = new Date();
         Date now = new Date();
         long endLong = now.getTime();
         long endLong = now.getTime();

server-service/src/main/java/com/makeit/service/platform/auth/PlatOrgService.java

@@ -4,6 +4,7 @@ package com.makeit.service.platform.auth;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.common.page.PageVO;
+import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
 import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
 
 
@@ -98,4 +99,11 @@ public interface PlatOrgService extends IService<PlatOrg> {
     List<PlatOrg> createOrgTree(List<PlatOrg> orgList);
     List<PlatOrg> createOrgTree(List<PlatOrg> orgList);
 
 
     List<PlatOrg> belongToScopeList(PlatOrg param);
     List<PlatOrg> belongToScopeList(PlatOrg param);
+
+    /**
+     * 获取orgId 的 城市|区|街道 id
+     * @param orgId
+     * @return
+     */
+    PlatOrgSplitDTO getOrgSplitVO(String orgId);
 }
 }

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.common.page.PageVO;
+import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatRoleOrg;
 import com.makeit.entity.platform.auth.PlatRoleOrg;
 import com.makeit.entity.platform.auth.PlatUserRole;
 import com.makeit.entity.platform.auth.PlatUserRole;
@@ -46,6 +47,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Objects;
 import java.util.Set;
 import java.util.Set;
+import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.Stream;
@@ -607,4 +609,29 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
 
 
         platAlarmConfigService.copyForOrg(platOrg);
         platAlarmConfigService.copyForOrg(platOrg);
     }
     }
+
+    @Override
+    public PlatOrgSplitDTO getOrgSplitVO(String orgId) {
+        PlatOrgSplitDTO platOrgSplitDTO = new PlatOrgSplitDTO();
+        platOrgSplitDTO.setOrgId(orgId);
+        PlatOrg platOrg = getById(orgId);
+        if (platOrg == null) {
+            return platOrgSplitDTO;
+        }
+        String orgPath = platOrg.getPath();
+        if (StringUtils.isBlank(orgPath)) {
+            return platOrgSplitDTO;
+        }
+        List<BiConsumer<PlatOrgSplitDTO, String>> list = Arrays.asList(
+                PlatOrgSplitDTO::setCityOrgId,
+                PlatOrgSplitDTO::setDistrictOrgId,
+                PlatOrgSplitDTO::setStreetOrgId
+        );
+        String[] split = orgPath.split(",");
+        for (int i = 1; i < split.length; i++) {
+            BiConsumer<PlatOrgSplitDTO, String> e = list.get(i - 1);
+            e.accept(platOrgSplitDTO, split[i]);
+        }
+        return platOrgSplitDTO;
+    }
 }
 }