Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -3,6 +3,7 @@ package com.diagbot.client;
 import com.diagbot.client.hystrix.UserServiceHystrix;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.entity.User;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +20,9 @@ import java.util.Map;
 @FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
 public interface UserServiceClient {
 
+    @PostMapping(value = "/user/getUserAuthStatus")
+    RespDTO<User> getUserAuthStatus(@RequestBody Long userId);
+
     @PostMapping(value = "/user/getUserAndOrg")
     RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(@RequestBody List<Long> userIds);
 

diagbotman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -3,8 +3,10 @@ package com.diagbot.client.hystrix;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.entity.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -19,6 +21,12 @@ import java.util.Map;
 @Slf4j
 public class UserServiceHystrix implements UserServiceClient {
 
+    @Override
+    public RespDTO<User> getUserAuthStatus(@RequestBody Long userId) {
+        log.error("【hystrix】调用{}异常", "getUserAuthStatus");
+        return null;
+    }
+
     @Override
     public RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(List<Long> userIds) {
         log.error("【hystrix】调用{}异常", "getUserAndOrg");

diagbotman-service/src/main/java/com/diagbot/dto/ProductOrderExportDTO.java

@@ -17,7 +17,7 @@ public class ProductOrderExportDTO {
     private String time;
     private String num;
     private String orgName;
-    private String linKman;
+    private String linkman;
     private String userName;
     private String email;
     private String auditStatus;
@@ -33,7 +33,7 @@ public class ProductOrderExportDTO {
         this.time = time;
         this.num = num;
         this.orgName = orgName;
-        this.linKman = linKman;
+        this.linkman = linKman;
         this.userName = userName;
         this.email = email;
         this.auditStatus = auditStatus;

diagbotman-service/src/main/java/com/diagbot/entity/User.java

@@ -61,6 +61,18 @@ public class User implements Serializable {
      */
     private String username;
 
+    /**
+     * 认证状态: 0 未认证，1 已认证，2 认证中
+     */
+    private Integer authStatus;
+
+    public Integer getAuthStatus() {
+        return authStatus;
+    }
+
+    public void setAuthStatus(Integer authStatus) {
+        this.authStatus = authStatus;
+    }
 
     public Long getId() {
         return id;
@@ -137,6 +149,7 @@ public class User implements Serializable {
                 ", modifier=" + modifier +
                 ", password=" + password +
                 ", username=" + username +
+                ", authStatus="+ authStatus +
                 "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.User;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.entity.wrapper.ServiceInfoWrapper;
 import com.diagbot.enums.AccessTypeEnum;
@@ -65,7 +66,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @return Boolean true
      */
     public Boolean addProducts(AddProductsVO addProductsVO) {
-        if(addProductsVO.getName().equals(this.selectProductByName(addProductsVO.getName()).getName())){
+        LantoneProduct lantoneProductInfos = this.selectProductByName(addProductsVO.getName());
+        if(lantoneProductInfos != null && addProductsVO.getName().equals(lantoneProductInfos.getName())){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "产品名称重复");
         }
@@ -88,7 +90,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @return Boolean true
      */
     public Boolean updateProduct(UpdateProductVO updateProductVO) {
-        if(updateProductVO.getName().equals(this.selectProductByName(updateProductVO.getName()).getName())){
+        LantoneProduct lantoneProductInfo = this.selectProductByName(updateProductVO.getName());
+        if(updateProductVO.getName().equals(lantoneProductInfo.getName()) && updateProductVO.getId() != lantoneProductInfo.getId()){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "产品名称重复");
         }
@@ -96,7 +99,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         BeanUtil.copyProperties(updateProductVO, lantoneProduct);
         lantoneProduct.setModifier(UserUtils.getCurrentPrincipleID());
         lantoneProduct.setGmtModified(DateUtil.now());
-        if(updateProductVO.getServiceStatus()==StatusEnum.Disable.getKey()){
+        if(null != updateProductVO.getServiceStatus() && updateProductVO.getServiceStatus()==StatusEnum.Disable.getKey()){
             Page page =new Page();
             OpenedProductsIndex openedProductsIndex =new OpenedProductsIndex();
             openedProductsIndex.setProductId(updateProductVO.getId());
@@ -250,19 +253,13 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
                 productLineDTO.setProductAudit(ProductAuditEnum.NotOpend.getKey());
             }
         }
-        RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(userIdList);
+        RespDTO<User> mapRespDTO = userServiceClient.getUserAuthStatus(userId);
         if (mapRespDTO == null || !"0".equals(mapRespDTO.code)) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "获取用户机构信息失败");
         }
-        Map<Long, UserOrgDTO> dataMap =mapRespDTO.data;
-        UserOrgDTO uo =dataMap.get(userId);
         Map map =new HashMap();
-        if(uo.getAuStatus() == null){
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                    "账号信息不完善");
-        }
-        map.put("userAuStatus",uo.getAuStatus());
+        map.put("userAuStatus",mapRespDTO.data.getAuthStatus());
         List list =new ArrayList();
         list.add(productLineDTOList);
         list.add(map);

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -344,7 +344,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         listId.add("time");//申请时间
         listId.add("num");// 订单号
         listId.add("orgName");//申请机构
-        listId.add("linKman");// 申请人
+        listId.add("linkman");// 申请人
         listId.add("userName");//手机号
         listId.add("email");//邮箱
         listId.add("auditStatus");//审核状态

diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.dto.RenewalsInfosDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.UserRenewals;
 import com.diagbot.entity.wrapper.UserRenewalsWrapper;
 import com.diagbot.enums.CancelRenewalsEnum;
@@ -20,6 +21,7 @@ import com.diagbot.service.impl.UserRenewalsServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddRenewalsInfoVO;
@@ -62,7 +64,8 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         userRenewals.setApplyTime(DateUtil.now());
         userRenewals.setGmtCreate(DateUtil.now());
         userRenewals.setRenewalsNo(visibleIdCreater.getNextId(VisibleIdTypeEnum.IS_RENEWALS.getKey()).toString());
-        if(openedProductsFacade.selectOpenedProducts(map).size() == 0){
+        List<OpenedProducts> openedProductsList = openedProductsFacade.selectOpenedProducts(map);
+        if(ListUtil.isEmpty(openedProductsList)){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该产品未开通，不能续费");
         }
         if(this.selectProductIdByUserId(map).contains(addRenewalsInfoVO.getProductId())){

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -38,6 +38,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/user/index").permitAll()
                 .antMatchers("/user/getUserAndOrg").permitAll()
                 .antMatchers("/user/getUserByOrgName").permitAll()
+                .antMatchers("/user/getUserAuthStatus").permitAll()
                 .antMatchers("/user/resetPassword").permitAll()
                 .antMatchers("/user/verifyNoUsername").permitAll()
                 .antMatchers("/user/verifyExistUsername").permitAll()

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -82,6 +82,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/user/resetPassword", request)
                 || matchers("/user/index", request)
                 || matchers("/user/getUserByOrgName", request)
+                || matchers("/user/getUserAuthStatus", request)
                 || matchers("/user/getUserAndOrg", request)
                 || matchers("/user/verifyNoUsername", request)
                 || matchers("/user/verifyExistUsername", request)

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -1343,5 +1343,8 @@ public class UserFacade extends UserServiceImpl {
         return RespDTO.onSuc(res);
     }
 
+    public RespDTO<User> getUserAuthStatus(Long userId){
+        return RespDTO.onSuc(this.getById(userId));
+    }
 
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -182,6 +182,13 @@ public class UserController {
         return RespDTO.onSuc(result);
     }
 
+    @PostMapping(value = "/getUserAuthStatus")
+    @SysLogger("getUserAuthStatus")
+    @ApiOperation(value = "远程调用，获取用户认证状态[by:wangyu]")
+    @ApiIgnore
+    RespDTO<User> getUserAuthStatus(@RequestBody Long userId) {
+        return userFacade.getUserAuthStatus(userId);
+    }
 
     @PostMapping(value = "/getUserByOrgName")
     @SysLogger("getUserByOrgName")

user-service/src/main/resources/mapper/UserMapper.xml

@@ -75,10 +75,10 @@
 
     <select id="getUserOrgDTOByIds" resultMap="UserOrgDTO">
         select u.id user_id ,u.username username, u.email email, u.linkman linkman , org.id org_id,
-        org.name org_name, ua.is_reject is_reject, u.auth_status au_status,org.sub_num
-        from sys_user u, sys_user_organization uo, sys_organization org , sys_user_authentication ua
+        org.name org_name, u.auth_status is_reject, u.auth_status au_status,org.sub_num
+        from sys_user u, sys_user_organization uo, sys_organization org
         where u.is_deleted = 'N' and uo.is_deleted = 'N' and org.is_deleted = 'N'
-        and u.id = uo.user_id and uo.organization_id = org.id and u.id = ua.user_id
+        and u.id = uo.user_id and uo.organization_id = org.id
         and u.id in
         <foreach collection="list" item="ids" open="(" close=")" separator=",">
             #{ids}