Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/SystemRemindServiceImpl.java

@@ -44,12 +44,16 @@ public class SystemRemindServiceImpl implements SystemRemindService {
     public void save(AddApplyDTO addApplyDTO) {
         //校验这个人是否已经在此企业
         AccountDTO accountDTO = accountApi.getAccount(addApplyDTO.getMobile()).getData();
-        CompanyDTO companyDTO = companyApi.getCompanyByName(addApplyDTO.getCompanyName()).getData();
+        CompanyDTO companyDTO = companyApi.getCompanyById(addApplyDTO.getCompanyId()).getData();
         if (!ObjectUtils.isEmpty(accountDTO.getCompany(companyDTO.getId()))){
             throw new BizException(ExceptionCode.USER_COMPANY_EXIST);
         }
-        addApplyDTO.setCreateTime(new Date());
-        AddApply addApply = BeanMapper.map(addApplyDTO, AddApply.class);
+        AddApply addApply = new AddApply();
+        addApply.setMobile(addApplyDTO.getMobile());
+        addApply.setUsername(addApplyDTO.getUsername());
+        addApply.setStatus("2");
+        addApply.setCompanyId(addApplyDTO.getCompanyId());
+        addApply.setCreateTime(new Date());
         addApply.setCreatorId(BaseContextHolder.getUserId());
         addApply.setCreatorName(BaseContextHolder.getUserName());
         systemRemindMapper.insertSelective(addApply);

applications/commons/commons-server/src/main/resources/mapper/SystemRemindMapper.xml

@@ -48,7 +48,10 @@
                 createTime,
             </if>
             <if test="companyId != null">
-                companyId
+                companyId,
+            </if>
+            <if test="status != null">
+                re_status
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -68,7 +71,10 @@
                 #{createTime, jdbcType=TIMESTAMP},
             </if>
             <if test="companyId != null">
-                #{companyId, jdbcType=TIMESTAMP}
+                #{companyId, jdbcType=TIMESTAMP},
+            </if>
+            <if test="status != null">
+                #{status, jdbcType=TIMESTAMP}
             </if>
         </trim>
     </insert>

base-servers/account/account-api/src/main/java/com/usoftchina/saas/account/api/CompanyApi.java

@@ -3,10 +3,13 @@ package com.usoftchina.saas.account.api;
 import com.usoftchina.saas.account.dto.CompanyCopyDTO;
 import com.usoftchina.saas.account.dto.CompanyDTO;
 import com.usoftchina.saas.account.dto.CompanyRegDTO;
+import com.usoftchina.saas.account.dto.CompanyRspDTO;
 import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author yingp
  * @date 2018/11/15
@@ -67,4 +70,13 @@ public interface CompanyApi {
      */
     @GetMapping(path = "/company/read/{id}")
     Result<CompanyDTO> getCompanyById(@PathVariable("id") Long id);
+
+    /**
+     * 按名称模糊查找
+     * @param name
+     * @return
+     */
+    @GetMapping("/company/find/{name}")
+    Result<List<CompanyRspDTO>> getCompanyByFuzzyName(@PathVariable("name") String name);
+
 }

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

@@ -2,19 +2,18 @@ package com.usoftchina.saas.account.controller;
 
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
-import com.usoftchina.saas.account.dto.AccountDTO;
-import com.usoftchina.saas.account.dto.BindCompanyDTO;
-import com.usoftchina.saas.account.dto.CompanyAccountDTO;
-import com.usoftchina.saas.account.dto.CompanyDTO;
+import com.usoftchina.saas.account.dto.*;
 import com.usoftchina.saas.account.service.AccountCenterService;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.api.SystemRemindApi;
 import com.usoftchina.saas.commons.dto.AddApplyDTO;
-import com.usoftchina.saas.utils.ObjectUtils;
+import com.usoftchina.saas.exception.ExceptionCode;
 import com.usoftchina.sso.api.SsoUserSpaceApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/accountCenter")
 public class AccountCenterController {
@@ -94,17 +93,18 @@ public class AccountCenterController {
     }
 
     /**
-     * 校验企业是否已开通saas
-     * @param companyName
+     * 校验企业是否已开通saas, 返回模糊匹配结果
+     * @param companyName  企业名称或管理员名称
      * @return
      */
     @GetMapping("/company/isOpen")
     public Result checkIsOpen(@RequestParam("companyName") String companyName){
-        CompanyDTO companyDTO = companyApi.getCompanyByName(companyName).getData();
-        if (ObjectUtils.isEmpty(companyDTO)){
-            return Result.error();
+        Result<List<CompanyRspDTO>> result = companyApi.getCompanyByFuzzyName(companyName);
+        if (result.isSuccess()){
+            List<CompanyRspDTO> companyDTOList = result.getData();
+            return Result.success(companyDTOList);
         }
-        return Result.success(companyDTO.getId());
+        return Result.error(ExceptionCode.COMPANY_NOT_EXIST);
     }
 
     /**
@@ -119,7 +119,7 @@ public class AccountCenterController {
         addApplyDTO.setMobile(accountDTO.getMobile());
         addApplyDTO.setCompanyId(bindCompanyDTO.getCompanyId());
         addApplyDTO.setUsername(bindCompanyDTO.getUsername());
-        addApplyDTO.setStatus("0");
+        addApplyDTO.setStatus("2");
         systemRemindApi.save(addApplyDTO);
         return Result.success();
     }

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.account.controller;
 import com.usoftchina.saas.account.dto.CompanyCopyDTO;
 import com.usoftchina.saas.account.dto.CompanyDTO;
 import com.usoftchina.saas.account.dto.CompanyRegDTO;
+import com.usoftchina.saas.account.dto.CompanyRspDTO;
 import com.usoftchina.saas.account.po.Company;
 import com.usoftchina.saas.account.service.CompanyService;
 import com.usoftchina.saas.base.Result;
@@ -10,6 +11,7 @@ import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.ExceptionCode;
 import com.usoftchina.saas.file.dto.FileInfoDTO;
 import com.usoftchina.saas.utils.BeanMapper;
+import com.usoftchina.saas.utils.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -145,6 +147,20 @@ public class CompanyController {
         return Result.error(ExceptionCode.COMPANY_NOT_EXIST);
     }
 
+    /**
+     * 按名称(模糊)查找企业,返回企业名称、管理员名称、管理员手机号
+     * @param name
+     * @return
+     */
+    @GetMapping("/find/{name}")
+    public Result<List<CompanyRspDTO>> getCompanyByFuzzyName(@PathVariable("name") String name){
+        List<CompanyRspDTO> companyList = companyService.findByFuzzyName(name);
+        if (!CollectionUtils.isEmpty(companyList)){
+            return Result.success(companyList);
+        }
+        return Result.error(ExceptionCode.COMPANY_NOT_EXIST);
+    }
+
     /**
      * 当前登录的公司的信息
      *

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.account.mapper;
 
 import com.usoftchina.saas.account.dto.CompanyRegDTO;
+import com.usoftchina.saas.account.dto.CompanyRspDTO;
 import com.usoftchina.saas.account.po.Company;
 import com.usoftchina.saas.account.vo.CompanyBaseVO;
 import org.apache.ibatis.annotations.Param;
@@ -89,4 +90,11 @@ public interface CompanyMapper {
      * @param uu
      */
     void updateUUByPrimaryKey(@Param("companyId") Long companyId, @Param("uu") Long uu);
+
+    /**
+     * 按名称(模糊)查找企业,返回企业名称、管理员名称、管理员手机号
+     * @param name
+     * @return
+     */
+    List<CompanyRspDTO> findByFuzzyName(@Param("name") String name);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.account.service;
 
 import com.usoftchina.saas.account.dto.CompanyRegDTO;
+import com.usoftchina.saas.account.dto.CompanyRspDTO;
 import com.usoftchina.saas.account.po.Company;
 import com.usoftchina.saas.account.vo.CompanyBaseVO;
 import com.usoftchina.saas.file.dto.FileInfoDTO;
@@ -105,4 +106,11 @@ public interface CompanyService {
      * @param uu
      */
     void updateUUByPrimaryKey(Long companyId, Long uu);
+
+    /**
+     * 按名称(模糊)查找企业,返回企业名称、管理员名称、管理员手机号
+     * @param name
+     * @return
+     */
+    List<CompanyRspDTO> findByFuzzyName(String name);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.account.service.impl;
 
 import com.usoftchina.saas.account.dto.CompanyRegDTO;
+import com.usoftchina.saas.account.dto.CompanyRspDTO;
 import com.usoftchina.saas.account.mapper.AccountCompanyMapper;
 import com.usoftchina.saas.account.mapper.CompanyAppMapper;
 import com.usoftchina.saas.account.mapper.CompanyMapper;
@@ -59,6 +60,11 @@ public class CompanyServiceImpl implements CompanyService{
         companyMapper.updateUUByPrimaryKey(companyId, uu);
     }
 
+    @Override
+    public List<CompanyRspDTO> findByFuzzyName(String name) {
+        return companyMapper.findByFuzzyName(name);
+    }
+
     @Override
     public Company findByName(String name) {
         return companyMapper.selectByName(name);

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

@@ -115,6 +115,17 @@
     <select id="selectByName" parameterType="java.lang.String" resultMap="FullResultMap">
         select <include refid="baseColumns"/> from ac_company where name=#{name,jdbcType=VARCHAR}
     </select>
+    <select id="findByFuzzyName" parameterType="java.lang.String" resultType="com.usoftchina.saas.account.dto.CompanyRspDTO">
+        SELECT
+          ac.id,ac.name,aa.realname admin,aa.mobile adminMobile
+        FROM
+          ac_company ac
+          INNER JOIN ac_account aa on ac.creator_id = aa.id
+        WHERE
+          ac.name LIKE concat( '%', #{name,jdbcType=VARCHAR}, '%' )
+          OR aa.realname LIKE concat('%', '陈炜', '%')
+        ORDER BY ac.id
+    </select>
     <select id="selectByUu" parameterType="java.lang.Long" resultMap="FullResultMap">
         select <include refid="baseColumns"/> from ac_company where uu=#{uu,jdbcType=BIGINT}
     </select>