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

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/LantoneProductWrapper.java

@@ -2,10 +2,52 @@ package com.diagbot.entity.wrapper;
 
 import com.diagbot.entity.LantoneProduct;
 
+import java.util.Date;
+
 /**
  * @Description:
  * @author: wangyu
  * @time: 2018/9/19 17:09
  */
 public class LantoneProductWrapper extends LantoneProduct {
+    /**
+     * 开通日期
+     */
+    private Date startTime;
+
+    /**
+     * 结束日期
+     */
+    private Date endTime;
+
+    /**
+     * 停用状态
+     */
+    private Integer serviceStatus;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    @Override
+    public Integer getServiceStatus() {
+        return serviceStatus;
+    }
+
+    @Override
+    public void setServiceStatus(Integer serviceStatus) {
+        this.serviceStatus = serviceStatus;
+    }
 }

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

@@ -3,11 +3,16 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.UserUtils;
+import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description:产品业务层
  * @author: wangyu
@@ -66,6 +71,16 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         return CommonErrorCode.OK;
     }
 
+    /**
+     * @Description: 查询当前用户已开通产品
+     * @Author: zhaops
+     * @Date: 10:10 2018/9/20
+     */
+    public List<LantoneProductWrapper> opendedProductByCurrentUser() {
+        Long userId=Long.parseLong(UserUtils.getCurrentPrincipleID());
+        return this.opendedProductByUserId(userId);
+    }
+
     /**
      * @Description: 根据用户id查询是否有开通产品
      * @Author: wangyu

diagbotman-service/src/main/java/com/diagbot/mapper/LantoneProductMapper.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,7 +31,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> selectProduct(Page page, @Param("name") String name );
+    IPage<LantoneProduct> selectProduct(Page page, @Param("name") String name);
 
     /**
      * @Description: 查询开通当前产品的所有用户
@@ -38,4 +40,12 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      */
     IPage<LantoneProduct> opendedProduct(Page page, @Param("map") Map map);
 
+
+    /**
+     * @Description: 根据用户查询已开通产品
+     * @Author: zhaops
+     * @Date: 10:10 2018/9/20
+     */
+    List<LantoneProductWrapper> opendedProductByUserId(Long userId);
+
 }

diagbotman-service/src/main/java/com/diagbot/service/LantoneProductService.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.wrapper.LantoneProductWrapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,4 +38,11 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Date: 13:32 2018/9/18
      */
     IPage<LantoneProduct> opendedProduct(Page page, Map map);
+
+    /**
+     * @Description: 根据用户查询已开通产品
+     * @Author: zhaops
+     * @Date: 10:10 2018/9/20
+     */
+    List<LantoneProductWrapper> opendedProductByUserId(Long userId);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/LantoneProductServiceImpl.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.mapper.LantoneProductMapper;
 import com.diagbot.service.LantoneProductService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -45,4 +47,14 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
     public IPage<LantoneProduct> opendedProduct(Page page, Map map) {
         return baseMapper.opendedProduct(page,map);
     }
+
+    /**
+     * @Description: 根据用户查询已开通产品
+     * @Author: zhaops
+     * @Date: 10:10 2018/9/20
+     */
+    @Override
+    public List<LantoneProductWrapper> opendedProductByUserId(Long userId) {
+        return baseMapper.opendedProductByUserId(userId);
+    }
 }

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
+import com.diagbot.util.UserUtils;
 import com.diagbot.facade.OpenedProductsFacade;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -90,6 +93,12 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(page,map));
     }
 
-
+    @ApiOperation(value = "查询当前登录用户已开通产品列表")
+    @GetMapping("/opendedProductByCurrentUser")
+    @SysLogger("opendedProductByCurrentUser")
+    public RespDTO opendedProductByCurrentUser() {
+        List<LantoneProductWrapper> list = lantoneProductFacade.opendedProductByCurrentUser();
+        return RespDTO.onSuc(list);
+    }
 }
 

diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -20,6 +20,27 @@
         <result column="trial_url" property="trialUrl" />
         <result column="access_type" property="accessType" />
     </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultWrapperMap" type="com.diagbot.entity.wrapper.LantoneProductWrapper">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="decription" property="decription" />
+        <result column="charge_type" property="chargeType" />
+        <result column="url" property="url" />
+        <result column="open_num" property="openNum" />
+        <result column="service_status" property="serviceStatus" />
+        <result column="trial_status" property="trialStatus" />
+        <result column="trial_url" property="trialUrl" />
+        <result column="access_type" property="accessType" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="service_status" property="serviceStatus" />
+    </resultMap>
 
     <!--根据用户id查询用户是否有开通产品-->
     <select id="productLine" resultMap="BaseResultMap">
@@ -46,4 +67,10 @@
         </if>
     </select>
 
+    <!--根据用户查询已开通产品-->
+    <select id="opendedProductByUserId" resultMap="BaseResultWrapperMap" parameterType="java.lang.Long">
+        select a.*,b.start_time,b.end_time,b.service_status from diag_lantone_product a,diag_opened_products b
+        where a.id=b.product_id and a.is_deleted='N' and b.is_deleted='N'
+        and b.user_id=#{userId}
+    </select>
 </mapper>

user-service/src/main/java/com/diagbot/dto/GetConsoleUserInfoDTO.java

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.Organization;
+import com.diagbot.entity.User;
+import com.diagbot.entity.UserAuthentication;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 控制台账户信息
+ * @author rgb
+ *
+ */
+@Getter
+@Setter
+public class GetConsoleUserInfoDTO {
+
+    private User user;
+    private Organization organization;
+    private UserAuthentication userAuthentication;
+	
+}

user-service/src/main/java/com/diagbot/dto/QueryAuthProgressDTO.java

@@ -12,8 +12,10 @@ import lombok.Setter;
 @Setter
 public class QueryAuthProgressDTO {
    
-	private String status;
+	private Integer status;
 	
-	private String statusMessage;
+	private String isReject;
+	
+	private String rejectComment;
 	
 }

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

@@ -150,30 +150,15 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
     }
 
     public QueryAuthProgressDTO queryAuthProgress() {
-        QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         UserAuthentication userAuthentication = this.getByUserId(userId);
-        Integer status = userAuthentication.getStatus();
-        String isReject = userAuthentication.getIsReject();
-        if (StringUtils.isBlank(isReject)) {
-            if (status == 0) {
-                queryAuthProgressDTO.setStatus("1");
-                queryAuthProgressDTO.setStatusMessage("未认证");
-            } else if (status == 2) {
-                queryAuthProgressDTO.setStatus("2");
-                queryAuthProgressDTO.setStatusMessage("认证中");
-            }
-        } else if (isReject.equals("N")) {
-            if (status == 0) {
-                queryAuthProgressDTO.setStatus("3");
-                queryAuthProgressDTO.setStatusMessage("认证未通过");
-            }
-        } else if (isReject.equals("Y")) {
-            if (status == 1) {
-                queryAuthProgressDTO.setStatus("4");
-                queryAuthProgressDTO.setStatusMessage("认证通过");
-            }
-        }
+        
+        QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
+        queryAuthProgressDTO.setStatus(userAuthentication.getStatus());
+        queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
+        queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
+        
         return queryAuthProgressDTO;
     }
+    
 }

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

@@ -1,8 +1,23 @@
 package com.diagbot.facade;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.AuthServiceClient;
+import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -24,19 +39,6 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.UserSaveVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 用户业务层
@@ -285,5 +287,18 @@ public class UserFacade extends UserServiceImpl {
         return super.removeById(id);
     }
 
+	public GetConsoleUserInfoDTO getConsoleUserInfo() {
+		Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+	    User user = this.getById(userId);
+	    Organization organization = organizationFacade.getByUserId(userId);
+	    UserAuthentication userAuthentication = userAuthenticationFacade.getByUserId(userId);
+	        
+	    GetConsoleUserInfoDTO getConsoleUserInfoDTO = new GetConsoleUserInfoDTO();
+	    getConsoleUserInfoDTO.setUser(user);
+	    getConsoleUserInfoDTO.setOrganization(organization);
+	    getConsoleUserInfoDTO.setUserAuthentication(userAuthentication);
+	      
+	    return getConsoleUserInfoDTO;
+	}
 
 }

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

@@ -64,11 +64,11 @@ public class UserAuthenticationController {
         return RespDTO.onSuc(map);
     }
     
-	 @ApiOperation(value = "当前用户认证进度")
-	 @PostMapping("/queryAuthProgress")
-	 @SysLogger("queryAuthProgress")
-	 public RespDTO<QueryAuthProgressDTO> queryAuthProgress() {
-		 return RespDTO.onSuc(userAuthenticationFacade.queryAuthProgress());
-	 }
+	@ApiOperation(value = "控制台-账号认证进度",notes="控制台-账号认证进度")
+	@PostMapping("/queryAuthProgress")
+	@SysLogger("queryAuthProgress")
+	public RespDTO<QueryAuthProgressDTO> queryAuthProgress() {
+		return RespDTO.onSuc(userAuthenticationFacade.queryAuthProgress());
+	}
     
 }

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

@@ -1,8 +1,23 @@
 package com.diagbot.web;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -11,22 +26,11 @@ import com.diagbot.entity.User;
 import com.diagbot.facade.PermissionFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.UserSaveVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Description: 用户操作API
  * @author: gaodm
@@ -216,4 +220,11 @@ public class UserController {
     public RespDTO delUser(Long id){
         return RespDTO.onSuc(userFacade.removeById(id));
     }
+    
+    @ApiOperation(value = "控制台账户信息", notes="控制台账户信息")
+	@PostMapping("/getConsoleUserInfo")
+	@SysLogger("getConsoleUserInfo")
+	public RespDTO<GetConsoleUserInfoDTO> getConsoleUserInfo() {
+		return RespDTO.onSuc(userFacade.getConsoleUserInfo());
+	}
 }