1.企业列表接口修改

2.ssoAPi接口补充
3.增加企业名称、手机号校验接口

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyRspDTO.java

@@ -14,9 +14,39 @@ public class CompanyRspDTO implements Serializable {
      */
     private String businessCode;
     private String address;
+    /**
+     * 是否是默认企业
+     */
     private boolean default_;
+    /**
+     * 是否开通saas
+     */
     private boolean saas_;
     private String uu;
+    /**
+     * 是否有默认企业
+     */
+    private boolean hasDefaultCompany;
+    /**
+     * 默认企业ID
+     */
+    private Long defaultCompanyId;
+
+    public boolean isHasDefaultCompany() {
+        return hasDefaultCompany;
+    }
+
+    public void setHasDefaultCompany(boolean hasDefaultCompany) {
+        this.hasDefaultCompany = hasDefaultCompany;
+    }
+
+    public Long getDefaultCompanyId() {
+        return defaultCompanyId;
+    }
+
+    public void setDefaultCompanyId(Long defaultCompanyId) {
+        this.defaultCompanyId = defaultCompanyId;
+    }
 
     public String getUu() {
         return uu;
@@ -73,4 +103,16 @@ public class CompanyRspDTO implements Serializable {
     public void setDefault_(boolean default_) {
         this.default_ = default_;
     }
+
+    public CompanyRspDTO(String name, String businessCode, String address, boolean default_, boolean saas_, String uu) {
+        this.name = name;
+        this.businessCode = businessCode;
+        this.address = address;
+        this.default_ = default_;
+        this.saas_ = saas_;
+        this.uu = uu;
+    }
+
+    public CompanyRspDTO() {
+    }
 }

base-servers/account/account-server/pom.xml

@@ -21,6 +21,11 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>account-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>sso-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>file-api</artifactId>

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/AccountApplication.java

@@ -14,7 +14,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @SpringBootApplication
 @EnableEurekaClient
-@EnableFeignClients("com.usoftchina.saas")
+@EnableFeignClients({"com.usoftchina.sso",
+                     "com.usoftchina.saas"})
 @EnableTransactionManagement
 @MapperScan(basePackages = "com.usoftchina.saas.account.mapper")
 @EnableAuthClient

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountCenterController.java

@@ -2,9 +2,9 @@ package com.usoftchina.saas.account.controller;
 
 import com.usoftchina.saas.account.dto.BindCompanyDTO;
 import com.usoftchina.saas.account.dto.CompanyAccountDTO;
-import com.usoftchina.saas.account.dto.CompanyListDTO;
 import com.usoftchina.saas.account.service.AccountCenterService;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.sso.api.SsoUserSpaceApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -14,6 +14,8 @@ public class AccountCenterController {
 
     @Autowired
     private AccountCenterService accountCenterService;
+    @Autowired
+    private SsoUserSpaceApi ssoUserSpaceApi;
 
     /**
      * 信息完善界面   保存接口
@@ -27,7 +29,7 @@ public class AccountCenterController {
 
     /**
      * 获取企业信息列表
-     * @param mobile      用户UU号
+     * @param mobile
      * @return
      */
     @GetMapping("/company/list")
@@ -46,4 +48,14 @@ public class AccountCenterController {
         return Result.success();
     }
 
+    /**
+     * 校验企业名称时候已在账户中心注册过
+     * @param spaceName
+     * @return
+     */
+    @GetMapping("/checkSpaceName")
+    public Result checkSpaceName(@RequestParam("spaceName") String spaceName){
+        return Result.success(ssoUserSpaceApi.checkSpaceName(spaceName));
+    }
+
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -17,6 +17,7 @@ import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.saas.utils.RegexpUtils;
+import com.usoftchina.sso.api.SsoUserApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,6 +42,9 @@ public class AccountController {
     @Autowired
     private RoleService roleService;
 
+    @Autowired
+    private SsoUserApi ssoUserApi;
+
     /**
      * 注册
      *
@@ -104,6 +108,47 @@ public class AccountController {
         return Result.success();
     }
 
+    /**
+     * SAAS手动添加账户,并默认绑定当前公司
+     *
+     * @param accountCopyDTO
+     * @return
+     */
+    @PostMapping("/register/add")
+    @IgnoreAuth
+    public Result AddAccount(@RequestBody AccountCopyDTO accountCopyDTO) {
+        // 判断是否已注册
+        Account account = accountService.findByUsername(accountCopyDTO.getUsername());
+        if (null != account) {
+            return Result.error(ExceptionCode.USER_NAME_EXIST);
+        }
+        account = accountService.findByMobile(accountCopyDTO.getMobile());
+        if (null != account) {
+            return Result.error(ExceptionCode.USER_MOBILE_EXIST);
+        }
+        account = accountService.findByEmail(accountCopyDTO.getEmail());
+        if (null != account) {
+            return Result.error(ExceptionCode.USER_EMAIL_EXIST);
+        }
+
+        account = BeanMapper.map(accountCopyDTO, Account.class);
+        account.setEnabled(true);
+        accountService.save(account);
+        //绑定企业
+        accountService.bindCompany(account.getId(), BaseContextHolder.getCompanyId());
+        return Result.success();
+    }
+
+    /**
+     * 校验该手机号是否已在账户中心注册
+     * @param mobile
+     * @return
+     */
+    @GetMapping("/checkMobile")
+    public Result checkMobile(@RequestParam("mobile") String mobile){
+        return Result.success(ssoUserApi.checkMobile(mobile));
+    }
+
     /**
      * 修改
      *

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/AccountCenterService.java

@@ -6,6 +6,7 @@ import com.usoftchina.saas.account.dto.CompanyRspDTO;
 import com.usoftchina.saas.base.Result;
 
 import java.util.List;
+import java.util.Map;
 
 public interface AccountCenterService {
 
@@ -21,7 +22,7 @@ public interface AccountCenterService {
      * @param mobile
      * @return
      */
-    List<CompanyRspDTO> getCompanyList(String mobile);
+    Map<String, Object> getCompanyList(String mobile);
 
     /**
      * 更新默认企业

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountCenterServiceImpl.java

@@ -11,6 +11,9 @@ import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.exception.ExceptionCode;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.StringUtils;
+import com.usoftchina.sso.api.SsoUserApi;
+import com.usoftchina.sso.dto.SsoUserSpace;
+import com.usoftchina.sso.dto.SsoUserSpaceList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +22,9 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class AccountCenterServiceImpl implements AccountCenterService {
@@ -29,6 +34,8 @@ public class AccountCenterServiceImpl implements AccountCenterService {
     @Autowired
     private AccountService accountService;
     @Autowired
+    private SsoUserApi ssoUserApi;
+    @Autowired
     private AccountCompanyMapper accountCompanyMapper;
 
     private final String ACCOUNTCNETER_URL_DEV = "http://192.168.253.12:32323";
@@ -89,8 +96,11 @@ public class AccountCenterServiceImpl implements AccountCenterService {
     }
 
     @Override
-    public List<CompanyRspDTO> getCompanyList(String mobile) {
-        List<CompanyRspDTO> result = new ArrayList<CompanyRspDTO>();
+    public Map<String, Object> getCompanyList(String mobile) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        List<CompanyRspDTO> resultList = new ArrayList<CompanyRspDTO>();
+        resultMap.put("hasDefaultCompany", false);
+        resultMap.put("defaultCompanyId", -1);
         //1、获取本SAAS系统的企业信息
         List<CompanyRspDTO> companyRspDTOList = accountCompanyMapper.getCompanyListByAccountMobile(mobile);
         //如果只有一条记录,将该企业设置为默认企业
@@ -99,21 +109,37 @@ public class AccountCenterServiceImpl implements AccountCenterService {
             Long companyId = companyRspDTOList.get(0).getId();
             accountCompanyMapper.bindDefault(accountId, companyId);
         }
-        result.addAll(companyRspDTOList);
+        resultList.addAll(companyRspDTOList);
         //2、优软云返回的企业信息
-        //TODO 通过接口获取优软云的企业信息
+        SsoUserSpaceList ssoUserSpaceList = ssoUserApi.getUserSpacesByMobile(mobile);
+        List<SsoUserSpace> ssoUserSpaces = ssoUserSpaceList.getSpaces();
 
         //3、去重复
-        /*for (CompanyRspDTO companyRspDTO : companyRspDTOList){
-            for (CompanyBaseDTO companyBaseDTO : companyBaseDTOList){
-                if (companyRspDTO.getName().equals(companyBaseDTO.getName())){
-                    companyBaseDTOList.remove(companyRspDTO);
+        for (CompanyRspDTO companyRspDTO : companyRspDTOList) {
+            for (SsoUserSpace ssoUserSpace : ssoUserSpaces) {
+                if (companyRspDTO.getName().equals(ssoUserSpace.getSpaceName())){
+                    ssoUserSpaces.remove(ssoUserSpace);
                 }
             }
+            if (companyRspDTO.isDefault_()){
+                resultMap.put("hasDefaultCompany", true);
+                resultMap.put("defaultCompanyId", companyRspDTO.getId());
+            }
         }
-        List<CompanyRspDTO> companyBaseRspDTOList = BeanMapper.mapList(companyBaseDTOList, CompanyRspDTO.class);
-        result.addAll(companyBaseRspDTOList);*/
-        return result;
+        //构造返回数据
+        for (SsoUserSpace ssoUserSpace : ssoUserSpaces){
+            CompanyRspDTO companyRspDTO = new CompanyRspDTO(
+                    ssoUserSpace.getSpaceName(),
+                    ssoUserSpace.getBusinessCode(),
+                    ssoUserSpace.getRegAddress(),
+                    false,
+                    false,
+                    ssoUserSpace.getSpaceUU().toString()
+            );
+            resultList.add(companyRspDTO);
+        }
+        resultMap.put("spaces", resultList);
+        return resultMap;
     }
 
     @Override

base-servers/account/account-server/src/main/resources/application.yml

@@ -80,4 +80,6 @@ mybatis:
   type-aliases-package: com.usoftchina.saas.account.po,com.usoftchina.saas.account.vo
   mapper-locations: classpath:mapper/*.xml
 auth:
-  public-key: auth/pub.key
+  public-key: auth/pub.key
+sso:
+  base-url: http://192.168.253.12:32323

base-servers/account/account-server/src/main/resources/mapper/AccountCompanyMapper.xml

@@ -17,7 +17,8 @@
         SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_ from ac_company cmp
         left join ac_account_company accmp on accmp.company_id=cmp.id
         left join ac_account ac on ac.id = accmp.account_id
-        where ac.mobile = #{mobile};
+        where ac.mobile = #{mobile}
+        order by is_default desc
     </select>
     <update id="unBindDefault" >
         UPDATE AC_ACCOUNT_COMPANY SET IS_DEFAULT = 0 WHERE ACCOUNT_ID = #{accountId}

base-servers/account/account-server/src/test/java/com/usoftchina/saas/account/service/CompanyServiceTest.java

@@ -1,12 +1,24 @@
 package com.usoftchina.saas.account.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.usoftchina.saas.account.po.Company;
+import com.usoftchina.saas.utils.StringUtils;
+import com.usoftchina.saas.utils.http.HttpUtil;
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author yingp
@@ -41,4 +53,27 @@ public class CompanyServiceTest {
         boolean removed = companyService.removeByPrimaryKey(company.getId());
         Assert.assertTrue(removed);
     }
+
+    @Test
+    public void testC_postToAccountCenter(){
+        String url = "/sso/userspace/register/admin";
+        RestTemplate restTemplate = new RestTemplate();
+        MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
+        requestEntity.add("spaceName", "测试企业001");
+        requestEntity.add("businessCode", StringUtils.createBusinessCode());
+        requestEntity.add("userUU", "1000027260");
+        String result = restTemplate.postForObject("http://192.168.253.12:32323" + url, requestEntity, String.class);
+        System.out.println(result);
+    }
+
+    @Test
+    public void TestE_getCompanyByMobile() throws Exception {
+        String url = "http://10.1.51.83:8081/api/userspace/erp/info";
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("_by", "mobile");
+        map.put("mobile", "18702604854");
+        HttpUtil.Response response = HttpUtil.sendGetRequest(url, map, true, "b4uzn6vf1db06qmn");
+        JSONObject json = JSONObject.parseObject(response.getResponseText());
+        System.out.println(json.get("content"));
+    }
 }

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/api/SsoUserApi.java

@@ -1,5 +1,6 @@
 package com.usoftchina.sso.api;
 
+import com.usoftchina.sso.dto.SsoCheckMobile;
 import com.usoftchina.sso.dto.SsoResult;
 import com.usoftchina.sso.dto.SsoUser;
 import com.usoftchina.sso.dto.SsoUserSpaceList;
@@ -36,6 +37,9 @@ public interface SsoUserApi {
     @Deprecated
     SsoUserSpaceList getUserSpacesByMobile(@RequestParam("mobile") String mobile);
 
+    @GetMapping("/checkMobile")
+    SsoCheckMobile checkMobile(@RequestParam("mobile") String mobile);
+
     @Component
     class DefaultFallback implements SsoUserApi{
         @Override
@@ -47,5 +51,11 @@ public interface SsoUserApi {
         public SsoUserSpaceList getUserSpacesByMobile(String mobile) {
             return null;
         }
+
+        @Override
+        public SsoCheckMobile checkMobile(String mobile) {
+            return null;
+        }
+
     }
 }

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/api/SsoUserSpaceApi.java

@@ -1,8 +1,30 @@
 package com.usoftchina.sso.api;
 
+import com.usoftchina.sso.dto.SsoResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
 /**
  * @author yingp
  * @date 2018/11/23
  */
+@FeignClient(url = "${sso.base-url}", name = "sso-server", fallback = SsoUserApi.DefaultFallback.class)
+@RequestMapping("/api/userspace")
 public interface SsoUserSpaceApi {
+
+    @GetMapping("/checkSpaceName")
+    SsoResult checkSpaceName(@RequestParam("spacename") String spacename);
+
+    @Component
+    class DefaultFallback implements SsoUserSpaceApi{
+
+        @Override
+        public SsoResult checkSpaceName(String spaceName) {
+            return null;
+        }
+    }
+
 }

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/dto/SsoCheckMobile.java

@@ -0,0 +1,19 @@
+package com.usoftchina.sso.dto;
+
+import java.io.Serializable;
+
+/**
+ * 校验手机号是否已经注册
+ */
+public class SsoCheckMobile implements Serializable {
+
+    private boolean hasRegister;
+
+    public boolean isHasRegister() {
+        return hasRegister;
+    }
+
+    public void setHasRegister(boolean hasRegister) {
+        this.hasRegister = hasRegister;
+    }
+}

base-servers/auth/sso-api/src/test/java/com/usoftchina/sso/test/SsoUserApiTest.java

@@ -2,6 +2,7 @@ package com.usoftchina.sso.test;
 
 import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.sso.api.SsoUserApi;
+import com.usoftchina.sso.dto.SsoCheckMobile;
 import com.usoftchina.sso.dto.SsoResult;
 import com.usoftchina.sso.dto.SsoUser;
 import com.usoftchina.sso.dto.SsoUserSpaceList;
@@ -12,6 +13,7 @@ import org.junit.runners.MethodSorters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author yingp
@@ -27,7 +29,7 @@ public class SsoUserApiTest {
 
     final static long userUU = 200040149;
 
-    final static String mobile = "13798490565";
+    final static String mobile = "18595633323";
 
     @Test
     public void testA_getUserByUu() {
@@ -44,4 +46,11 @@ public class SsoUserApiTest {
             list.getSpaces().forEach(space -> System.out.println(space.getSpaceName()));
         }
     }
+
+    @Test
+    public void testC_checkMobile(){
+        SsoCheckMobile checked = ssoUserApi.checkMobile(mobile);
+        System.out.println(checked);
+    }
+
 }

base-servers/auth/sso-api/src/test/java/com/usoftchina/sso/test/SsoUserSpaceApiTeest.java

@@ -0,0 +1,30 @@
+package com.usoftchina.sso.test;
+
+import com.usoftchina.sso.api.SsoUserSpaceApi;
+import com.usoftchina.sso.dto.SsoResult;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @author  chenw
+ * @date 2018/11/23
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SsoUserSpaceApiTeest {
+
+    @Autowired
+    private SsoUserSpaceApi ssoUserSpaceApi;
+
+    @Test
+    public void testA_checkSpaceName(){
+        SsoResult result = ssoUserSpaceApi.checkSpaceName("测试公司08111550");
+        System.out.println(result);
+    }
+}