更新！11

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/DevicePermissIotService.java

@@ -8,9 +8,7 @@ import com.github.microservice.models.devicePermiss.GateWayPermissModel;
 import com.github.microservice.models.devicePermiss.ProjectUserPermiss;
 import com.github.microservice.net.ResultContent;
 import com.google.common.collect.Lists;
-import com.zhongshu.card.client.model.school.CardInfoModel;
 import com.zhongshu.card.client.type.DataState;
-import com.zhongshu.card.client.type.school.CardState;
 import com.zhongshu.card.server.core.dao.devices.DevicePermissDao;
 import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
 import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
@@ -62,6 +60,7 @@ public class DevicePermissIotService {
 
     //线程池
     private ExecutorService executorService = Executors.newFixedThreadPool(SystemUtil.getCpuCoreCount() * 2);
+
     @Autowired
     private UserCanUseDeviceService userCanUseDeviceService;
 
@@ -252,41 +251,4 @@ public class DevicePermissIotService {
         return gateWayPermissModel;
     }
 
-    /**
-     * 组装用户信息 权限数据
-     *
-     * @param devicePermiss
-     * @return
-     */
-    public ProjectUserPermiss toModel(DevicePermiss devicePermiss) {
-        ProjectUserPermiss userPermiss = null;
-        if (ObjectUtils.isNotEmpty(devicePermiss)) {
-            userPermiss = new ProjectUserPermiss();
-            String userId = devicePermiss.getUserId();
-            String projectOid = devicePermiss.getProjectOid();
-            UserAccount account = devicePermiss.getUserAccount();
-            userPermiss.setUid(userId);
-            if (ObjectUtils.isNotEmpty(account)) {
-                userPermiss.setUn(account.getName());
-            }
-
-            // 查询用户的头像
-            OrgUserFace orgUserFace = orgUserFaceService.getUserFace(userId, projectOid);
-            if (ObjectUtils.isNotEmpty(orgUserFace)) {
-                userPermiss.setFi(orgUserFace.getImg());
-            } else {
-                // 默认头像
-                userPermiss.setFi(CardSystemDefault.defaultPermissFaceUrl);
-            }
-
-            // 查询用户的卡片
-            List<CardInfoModel> list = cardInfoService.getUserOrgAllCard(userId, projectOid);
-            List<String> cardNos = new ArrayList<>();
-            if (ObjectUtils.isNotEmpty(list)) {
-                cardNos = list.stream().filter(it -> it.getCardState() == CardState.Enable).map(it -> it.getCode()).collect(Collectors.toUnmodifiableList());
-            }
-            userPermiss.setCNos(cardNos);
-        }
-        return userPermiss;
-    }
 }