TRX 1 an în urmă
părinte
comite
899e60939c

+ 0 - 3
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/fix/FixDataService.java

@@ -16,8 +16,5 @@ public class FixDataService {
     @Autowired
     OrganizationDao organizationDao;
 
-    @Autowired
-    ProjectSyncIotCenterService projectSyncIotCenterService;
-
 
 }

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

@@ -104,9 +104,6 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
     @Autowired
     private OrganizationRelationDao organizationRelationDao;
 
-    @Autowired
-    private ProjectSyncIotCenterService projectSyncIotCenterService;
-
     @Autowired
     private OrganizationUserServiceImpl organizationUserServiceImpl;
 
@@ -368,11 +365,6 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             initOrganization(organization, param.getPassword());
         }
 
-        // 同步项目信息
-        if (authType == AuthType.Project) {
-            projectSyncIotCenterService.noticeSyncProject(organization);
-        }
-
         return ResultContent.buildSuccess(organization);
     }
 
@@ -396,9 +388,6 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         }
         BeanUtils.copyProperties(param, organization);
         organizationDao.save(organization);
-        if (organization.getAuthType() == AuthType.Project) {
-            projectSyncIotCenterService.noticeSyncProject(organization);
-        }
         return ResultContent.buildSuccess();
     }
 

+ 3 - 60
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/orgManager/OrganizationManagerServiceImpl.java

@@ -1,9 +1,5 @@
 package com.zhongshu.card.server.core.service.orgManager;
 
-import com.github.microservice.auth.client.service.OrganizationUserService;
-import com.github.microservice.auth.client.service.RoleService;
-import com.github.microservice.auth.client.service.UserService;
-import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
@@ -11,19 +7,14 @@ import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.orgModel.OrgSaveParam;
 import com.zhongshu.card.client.type.OrganizationRelationType;
-import com.zhongshu.card.server.core.dao.org.*;
+import com.zhongshu.card.server.core.dao.org.OrganizationDao;
+import com.zhongshu.card.server.core.dao.org.OrganizationRelationDao;
+import com.zhongshu.card.server.core.dao.org.RegionDao;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
 import com.zhongshu.card.server.core.domain.org.Region;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
-import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
-import com.zhongshu.card.server.core.service.projectAbout.ProjectCommonConfigService;
-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.user.DepartmentServiceImpl;
-import com.zhongshu.card.server.core.service.user.RoleServiceImpl;
-import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import com.zhongshu.card.server.core.util.NextNoUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -51,60 +42,12 @@ public class OrganizationManagerServiceImpl extends SuperService {
     @Autowired
     OrganizationDao organizationDao;
 
-    @Autowired
-    com.github.microservice.auth.client.service.OrganizationService organizationService;
-
-    @Autowired
-    OrganizationUserService organizationUserService;
-
-    @Autowired
-    RoleService roleService;
-
-    @Autowired
-    UserService userService;
-
-    @Autowired
-    UserCountDao userCountDao;
-
-    @Autowired
-    UserAccountServiceImpl userAccountService;
-
-    @Autowired
-    private OrganizationUserDao organizationUserDao;
-
-    @Autowired
-    RoleDao roleDao;
-
-    @Autowired
-    DepartmentServiceImpl departmentService;
-
-    @Autowired
-    AuthHelper authHelper;
-
     @Autowired
     RegionDao regionDao;
 
     @Autowired
     OrganizationRelationDao organizationRelationDao;
 
-    @Autowired
-    ProjectSyncIotCenterService projectSyncIotCenterService;
-
-    @Autowired
-    OrganizationUserServiceImpl organizationUserServiceImpl;
-
-    @Autowired
-    RoleServiceImpl roleServiceImpl;
-
-    @Autowired
-    ProjectIotInfoService projectIotInfoService;
-
-    @Autowired
-    ProjectWeChatInfoService projectWeChatInfoService;
-
-    @Autowired
-    ProjectCommonConfigService projectCommonConfigService;
-
     @Autowired
     OrganizationServiceImpl organizationServiceImpl;