获取当前登录人所在技能组方法

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -827,19 +827,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Override
     public AlarmStatisticsDto getAlertStatistics(ReginParams reginParams) {
         AlarmStatisticsDto alarmStatisticsDto = new AlarmStatisticsDto();
-
         //获取当前登录人所在的技能组code
-        TzsCitInfo tzsCitInfo = citInfoService.getOne(new QueryWrapper<TzsCitInfo>().eq("cti_user_id", reginParams.getUserModel().getUserId()));
-        String groupCode = null;
-        if (!ValidationUtil.isEmpty(tzsCitInfo)) {
-            if (tzsCitInfo.getGid().contains(",")) {
-                groupCode = tzsCitInfo.getGid().split(",")[0];
-            } else {
-                groupCode = tzsCitInfo.getGid().split("，")[0];
-            }
-        } else {
-            return alarmStatisticsDto;
-        }
+        String groupCode = ctiService.getSkillGroup(reginParams.getUserModel().getUserId());
 
         if (groupCode != null) {
             Map<String, Long> myBacklogMap = alertCalledMapper.getMyBacklog(groupCode);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/CtiServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.enums.DictTypeEnum;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -264,22 +265,19 @@ public class CtiServiceImpl implements ICtiService {
     }
 
 
-    public LinkedHashSet<String> getSkillGroup(String regionCode) {
-        LinkedHashSet<String> groupCodeList = new LinkedHashSet<>();
-        LambdaQueryWrapper<TzsCitInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(TzsCitInfo::getRegionCode, regionCode);
-        List<TzsCitInfo> ctiInfo = ctiInfoService.list(wrapper);
-        if (!ValidationUtil.isEmpty(ctiInfo)) {
-            for (TzsCitInfo tzsCitInfo : ctiInfo) {
-                String groupCode = null;
-                if (tzsCitInfo.getGid().contains(",")) {
-                    groupCode = tzsCitInfo.getGid().split(",")[0];
-                } else {
-                    groupCode = tzsCitInfo.getGid().split("，")[0];
-                }
-                groupCodeList.add(groupCode);
+    public String getSkillGroup(String userId) {
+        String groupCode = null;
+        //获取当前登录人所在的技能组code
+        TzsCitInfo tzsCitInfo = ctiInfoService.getOne(new QueryWrapper<TzsCitInfo>().eq("cti_user_id", userId));
+        if (!ValidationUtil.isEmpty(tzsCitInfo)) {
+            if (tzsCitInfo.getGid().contains(",")) {
+                groupCode = tzsCitInfo.getGid().split(",")[0];
+            } else {
+                groupCode = tzsCitInfo.getGid().split("，")[0];
             }
+        } else {
+            return groupCode;
         }
-        return groupCodeList;
+        return groupCode;
     }
 }
\ No newline at end of file