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

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

@@ -36,17 +36,29 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         return this.getByAppkeyAndSecret(map);
     }
 
-
+    /**
+     * 得到所有已开通的产品
+     * @return 所有已经开通的产品
+     */
     public List<GetConsoleOpenedDTO> getConsoleOpened(){
     	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         return baseMapper.getConsoleOpened(userId);
     }
 
+    /**
+     * 得到所有可试用的产品
+     * @return 所有可试用的产品
+     */
     public List<GetConsoleOnTrialDTO> getConsoleOnTrial(){
     	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         return baseMapper.getConsoleOnTrial(userId);
     }
     
+    /**
+     * 产品立即试用接口，返回所需要的token
+     * @param openUpOnTrialVO 产品立即试用接口请求参数
+     * @return 包含token
+     */
     public OpenUpOnTrialDTO openUpOnTrial(OpenUpOnTrialVO openUpOnTrialVO){
     	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
     	String userName = UserUtils.getCurrentPrinciple();
@@ -81,6 +93,10 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
     	return openUpOnTrialDTO;	
     }
     
+    /**
+     * 计算可展示的选项卡
+     * @return 可展是的选项卡
+     */
     public EnShowOptionDTO enShowOption(){
     	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
     	int openedCount = baseMapper.getConsoleOpenedCount(userId);

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

@@ -57,6 +57,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	@Autowired
 	private ProductOrderFacade productOrderFacade;
 
+	/**
+	 * 获取产品的认证进度
+	 * @return 包含产品当前的认证状态
+	 */
 	public List<ProductAuthProgressDTO> productAuthProgress(){
 		List<ProductAuthProgressDTO> retList = new ArrayList<ProductAuthProgressDTO>();
 		Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
@@ -116,7 +120,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		return selctOrderTimeByOrderNum(productOrder);
 	}
 	
-	
+	/**
+	 * 计算待审核的订单数量
+	 * @return 待审核的订单数量
+	 */
     public WaitExamOrderCouDTO waitExamOrderCou(){
     	WaitExamOrderCouDTO waitExamOrderCouDTO = new WaitExamOrderCouDTO();
     	waitExamOrderCouDTO.setCount(baseMapper.waitExamOrderCou());

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

@@ -49,8 +49,9 @@ import java.util.List;
 
 /**
  * 
+ * @Description 订单产品相关的操作
  * @author rgb
- *
+ * @time 2018年9月25日下午4:06:16
  */
 @Api(value="控制台-产品操作API", tags={"控制台-产品操作API"})
 @RestController

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

@@ -69,15 +69,15 @@ public class User implements Serializable {
     /**
      * 用户类型
      */
-    private String type;
+    private Integer type;
 
 
 
-    public String getType() {
+    public Integer getType() {
 		return type;
 	}
 
-	public void setType(String type) {
+	public void setType(Integer type) {
 		this.type = type;
 	}
 

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

@@ -155,6 +155,10 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         return map;
     }
 
+    /**
+     * 控制台-获取用户账号的认证进度
+     * @return 包含当前账号的认证状态
+     */
     public QueryAuthProgressDTO queryAuthProgress() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         UserAuthentication userAuthentication = this.getByUserId(userId);
@@ -167,6 +171,10 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         return queryAuthProgressDTO;
     }
     
+    /**
+     * 控制台-获取待认证的账号数量
+     * @return 待认证的账号个数
+     */
     public WaitAuthenDTO waitAuthen(){
     	WaitAuthenDTO waitAuthenDTO = new WaitAuthenDTO();
     	waitAuthenDTO.setCount(baseMapper.getAllWaitAuthCou());

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

@@ -363,6 +363,10 @@ public class UserFacade extends UserServiceImpl {
         return super.removeById(id);
     }
 
+    /**
+     * 获取控制台用户信息
+     * @return 用户信息
+     */
 	public GetConsoleUserInfoDTO getConsoleUserInfo() {
 		Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
 	    User user = this.getById(userId);