浏览代码

更新!

TRX 1 年之前
父节点
当前提交
be56d38b69

+ 1 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/TestController.java

@@ -31,8 +31,7 @@ public class TestController {
     @RequestMapping(value = "text", method = {RequestMethod.GET})
     public ResultContent text() {
 
-        openAPIRegisterService.initRegisterPAIS();
-
+//        openAPIRegisterService.initRegisterPAIS();
         try {
             byte[] bins = BytesUtil.longToBin(Long.parseLong("2152525002"), 4);
 //            var ret = reverse(bins);

+ 8 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/init/OpenApiInit.java

@@ -4,6 +4,7 @@ import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.server.core.service.openAPI.OpenAPIRegisterService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
@@ -23,12 +24,18 @@ public class OpenApiInit implements CommandLineRunner {
     @Autowired
     OpenAPIRegisterService openAPIRegisterService;
 
+    @Value("${openapi.initRegister}")
+    public boolean initRegister = false;
+
     @Override
     public void run(String... args) throws Exception {
         CompletableFuture.runAsync(() -> {
             try {
                 TimeUnit.SECONDS.sleep(30);
-                openAPIRegisterService.initRegisterPAIS();
+                log.info("initRegister {}", initRegister);
+                if (initRegister) {
+                    openAPIRegisterService.initRegisterPAIS();
+                }
             } catch (Exception e) {
                 e.printStackTrace();
             }

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

@@ -146,6 +146,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             return ResultContent.buildFail("项目负责人不能为空");
         }
         String currentOid = getCurrentOid();
+        // 管理员
         List<UserAccount> userAccounts = userAccountService.getUserAccounts(param.getManagerUserIds());
         if (userAccounts.size() != param.getManagerUserIds().size()) {
             return ResultContent.buildFail("managerUserIds错误");
@@ -161,9 +162,17 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             if (ObjectUtils.isNotEmpty(nameOrganization) && !nameOrganization.getId().equals(organization.getId())) {
                 return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
-            BeanUtils.copyProperties(param, organization, "code");
+            // 项目修改更新特定的字段
+            organization.setName(param.getName());
+            organization.setDataAuthType(param.getDataAuthType());
+            organization.setState(param.getState());
+            organization.setManagerUserIds(param.getManagerUserIds());
+            organization.setRemark(param.getRemark());
+
             initUpdateEntity(organization);
             organizationDao.save(organization);
+
+            authCenterUpdateOrgInfo(organization.getProjectOid(), organization.getName(), organization.getAuthType(), organization.getRemark());
         } else {
             if (ObjectUtils.isNotEmpty(nameOrganization)) {
                 return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
@@ -300,6 +309,27 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         return ResultContent.buildSuccess(oid);
     }
 
+    public ResultContent<String> authCenterUpdateOrgInfo(String id, String name, AuthType authType, String remark) {
+        String oid = "";
+        com.github.microservice.auth.client.model.OrganizationModel organizationModel = new com.github.microservice.auth.client.model.OrganizationModel();
+        organizationModel.setName(name);
+        organizationModel.setAuthType(authType);
+        organizationModel.setRemark(remark);
+        com.github.microservice.auth.client.content.ResultContent<String> resultContent = organizationService.add(organizationModel);
+        if (resultContent.getState() == ResultState.Success) {
+            log.info("平台初始成功: {}", resultContent.getContent());
+            oid = resultContent.getContent();
+        } else {
+            String msg = resultContent.getMsg();
+            if (StringUtils.isEmpty(msg) && resultContent.getException() != null) {
+                msg = resultContent.getException().getMessage();
+            }
+            log.info("initSuperOrganization {}", msg);
+            return ResultContent.buildFail(msg);
+        }
+        return ResultContent.buildSuccess(oid);
+    }
+
     /**
      * 添加机构 (只是添加、没得编辑)
      *