TRX 1 سال پیش
والد
کامیت
ddc9265058

+ 6 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/ProjectOrgModel.java

@@ -22,4 +22,10 @@ public class ProjectOrgModel extends OrganizationModel {
     @Schema(description = "在线设备数量")
     private Long onLineNumber = 0L;
 
+    @Schema(description = "是否完成 项目管理的微信配置")
+    private Boolean isFinishWeChat = Boolean.FALSE;
+
+    @Schema(description = "是否完成项目管理的物联网设置")
+    private Boolean isFinishIot = Boolean.FALSE;
+
 }

+ 12 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -24,6 +24,8 @@ import com.zhongshu.card.server.core.dao.org.*;
 import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
 import com.zhongshu.card.server.core.domain.org.*;
 import com.zhongshu.card.server.core.service.base.SuperService;
+import com.zhongshu.card.server.core.service.projectAbout.ProjectIotInfoService;
+import com.zhongshu.card.server.core.service.projectAbout.ProjectWeChatInfoService;
 import com.zhongshu.card.server.core.service.sync.ProjectSyncIotCenterService;
 import com.zhongshu.card.server.core.util.*;
 import lombok.extern.slf4j.Slf4j;
@@ -100,6 +102,12 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
     @Autowired
     RoleServiceImpl roleServiceImpl;
 
+    @Autowired
+    ProjectIotInfoService projectIotInfoService;
+
+    @Autowired
+    ProjectWeChatInfoService projectWeChatInfoService;
+
     /**
      * 保存项目信息
      *
@@ -1093,6 +1101,10 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
 
             // 在线设备数量
 
+            // 是否完成配置
+            model.setIsFinishWeChat(projectWeChatInfoService.isFinishConfig(entity.getOid()));
+            model.setIsFinishIot(projectIotInfoService.isFinishConfig(entity.getOid()));
+
         }
         return model;
     }