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

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

@@ -1,12 +1,19 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AuthDetailDTO {
+public class AuthDetailDTO implements Serializable{
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	/**
      * 产品名称
      */

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

@@ -1,12 +1,19 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class EnShowOptionDTO {
+public class EnShowOptionDTO implements Serializable{
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	/**
 	 * 可开通产品数量
 	 */

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

@@ -1,12 +1,19 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class GetConsoleOnTrialDTO {
+public class GetConsoleOnTrialDTO implements Serializable{
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	/**
 	 * 产品id
 	 */

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

@@ -1,12 +1,19 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class GetConsoleOpenedDTO {
+public class GetConsoleOpenedDTO implements Serializable{
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	/**
      * 已开通产品id
      */

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

@@ -1,11 +1,18 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class OpenUpOnTrialDTO {
+public class OpenUpOnTrialDTO implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	
 
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
 import java.util.List;
 
 import lombok.Getter;
@@ -12,9 +13,14 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ProductAuthProgressDTO {
+public class ProductAuthProgressDTO implements Serializable{
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
      * 订单编号
      */
 	private String num;

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

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import java.io.Serializable;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class WaitExamOrderCouDTO implements Serializable{
+	
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private Integer count;
+
+}

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

@@ -15,5 +15,11 @@ import java.util.Date;
 @Setter
 public class OpendProductWrapper extends OpenedProducts{
     private Date orderTime;
-
+    private String username;// 用户名
+    private String linkman;//联系人
+    private String email;// 邮箱
+    private Long orgId;//机构ID
+    private String orgName;//机构名称
+    private Integer isReject; //是否通过认证
+    private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 }

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

@@ -6,11 +6,11 @@ import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.UserUtils;
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -124,8 +123,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      */
     public List<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO){
         OpenedProductsIndex openedProductsIndex =new OpenedProductsIndex();
-        Long curren = openedProductsIndex.getCurrent();
-        Long size =openedProductsIndex.getSize();
+        Long curren = oppendedProductVO.getCurrent();
+        Long size =oppendedProductVO.getSize();
         if(curren==null){
             oppendedProductVO.setCurrent(1L);
         }
@@ -133,18 +132,31 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             oppendedProductVO.setSize(10L);
         }
         BeanUtil.copyProperties(oppendedProductVO, openedProductsIndex);
-
         openedProductsIndex.setIndex((oppendedProductVO.getCurrent().longValue()-1)*oppendedProductVO.getSize().longValue());
         List<OpendProductWrapper> list = openedProductsFacade.getByProductId(openedProductsIndex);
         List<Long> list1 =new ArrayList<>();
-        for (OpenedProducts opendProducts:list) {
+        for (OpendProductWrapper opendProducts:list) {
             Long longs = opendProducts.getUserId();
             list1.add(longs);
         }
-        RespDTO<Map<Long, UserOrgDTO>> mapRespDTO =userServiceClient.getUserAndOrg(list1);
-        Map map =new HashMap();
-        map.put("1",RespDTO.onSuc(mapRespDTO));
-        System.out.println(list);
+        RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(list1);
+        if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "获取用户和机构信息失败");
+        }
+        Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
+        for(OpendProductWrapper bean : list) {
+            UserOrgDTO uo = dataMap.get(bean.getUserId());
+            if(uo != null) {
+                bean.setUsername(uo.getUsername());
+                bean.setLinkman(uo.getLinkman());
+                bean.setEmail(uo.getEmail());
+                bean.setOrgId(uo.getOrgId());
+                bean.setOrgName(uo.getOrgName());
+                bean.setIsReject(uo.getIsReject());
+                bean.setAuStatus(uo.getAuStatus());
+            }
+        }
         return list;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.ProductOrder;
@@ -108,4 +109,14 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	public ProductOrder selectByOrderNum(ProductOrder productOrder){
 		return selctOrderTimeByOrderNum(productOrder);
 	}
+	
+	
+    public WaitExamOrderCouDTO waitExamOrderCou(){
+    	WaitExamOrderCouDTO waitExamOrderCouDTO = new WaitExamOrderCouDTO();
+    	waitExamOrderCouDTO.setCount(baseMapper.waitExamOrderCou());
+    	return waitExamOrderCouDTO;
+    }
+	
 }
+
+

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

@@ -26,4 +26,10 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
 	 * @Date: 19:39 2018/9/20
 	 */
 	ProductOrder selctOrderTimeByOrderNum(ProductOrder productOrder);
+	
+	/**
+	 * 待审核订单个数
+	 * @return
+	 */
+	int waitExamOrderCou();
 }

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

@@ -14,7 +14,6 @@ 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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,7 +49,7 @@ public class DiagLantoneProductController {
     @ApiOperation(value = "分页查询查询产品线",
             notes = "name：添加后则根据产品名称查询，选填<br>"+
                     "根据每页显示条数，默认 10，和当前页<br>")
-    @GetMapping("/selectProduct")
+    @PostMapping("/selectProduct")
     @SysLogger("selectProduct")
     public RespDTO<LantoneProduct> selectProduct(Page page , String name){
         IPage<LantoneProduct> pages = lantoneProductFacade.selectProduct(page,name);
@@ -94,7 +93,7 @@ public class DiagLantoneProductController {
     }
 
     @ApiOperation(value = "根据用户id查询当前用户已开通产品")
-    @GetMapping("/opendedProductByCurrentUser")
+    @PostMapping("/opendedProductByCurrentUser")
     @SysLogger("opendedProductByCurrentUser")
     public RespDTO opendedProductByCurrentUser() {
         List<LantoneProductWrapper> list = lantoneProductFacade.opendedProductByCurrentUser();

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

@@ -15,6 +15,7 @@ import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutDTO;
+import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
@@ -76,6 +77,15 @@ public class ProductOrderController {
 		return RespDTO.onSuc(openedProductsFacade.enShowOption());
 	}
 	
+	@ApiOperation(value = "控制台-待审核订单个数",notes="控制台-待审核订单个数")
+	@PostMapping("/waitExamOrderCou")
+	@SysLogger("waitExamOrderCou")
+	public RespDTO<WaitExamOrderCouDTO> waitExamOrderCou() {
+		return RespDTO.onSuc(productOrderFacade.waitExamOrderCou());
+	}
+	
+	
+	
 	   
     @ApiOperation(value = "根据用户id查询已开通的功能", notes = "已开通信息")
     @PostMapping("/getInformationAvailableByUserId")

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

@@ -39,4 +39,13 @@
              AND num=#{num}
          </if>
     </select>
+    
+    <select id="waitExamOrderCou" resultType="int">
+    	SELECT
+			count(DISTINCT a.num)
+		from diag_product_order a join diag_order_details b on a.num=b.order_num
+		where b.audit_status is null
+    </select>
+    
+    
 </mapper>

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

@@ -1,5 +1,7 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,8 +12,13 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QueryAuthProgressDTO {
+public class QueryAuthProgressDTO implements Serializable{
    
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	private Integer status;
 	
 	private Integer isReject;

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

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import java.io.Serializable;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class WaitAuthenDTO implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private Integer count;
+
+}

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

@@ -1,7 +1,16 @@
 package com.diagbot.facade;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.diagbot.dto.QueryAuthProgressDTO;
 import com.diagbot.dto.UserAuthenticationDTO;
+import com.diagbot.dto.WaitAuthenDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserAuthentication;
@@ -12,12 +21,6 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.UserAuthenticationServiceImpl;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.UserAuthenticationVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description:用户认证业务层
@@ -163,4 +166,10 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
 
         return queryAuthProgressDTO;
     }
+    
+    public WaitAuthenDTO waitAuthen(){
+    	WaitAuthenDTO waitAuthenDTO = new WaitAuthenDTO();
+    	waitAuthenDTO.setCount(baseMapper.getAllWaitAuthCou());
+    	return waitAuthenDTO;
+    }
 }

user-service/src/main/java/com/diagbot/mapper/UserAuthenticationMapper.java

@@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface UserAuthenticationMapper extends BaseMapper<UserAuthentication> {
     UserAuthentication getByUserId(Long userId);
+    
+    int getAllWaitAuthCou();
 }

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

@@ -1,23 +1,27 @@
 package com.diagbot.web;
 
 
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QueryAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAuthenticationDTO;
+import com.diagbot.dto.WaitAuthenDTO;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.vo.UserAuthenticationVO;
+
 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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.Map;
 
 /**
  * <p>
@@ -68,5 +72,12 @@ public class UserAuthenticationController {
 	public RespDTO<QueryAuthProgressDTO> queryAuthProgress() {
 		return RespDTO.onSuc(userAuthenticationFacade.queryAuthProgress());
 	}
+	
+	@ApiOperation(value = "控制台-待认证账号数量",notes="控制台-待认证账号数量")
+	@PostMapping("/waitAuthen")
+	@SysLogger("waitAuthen")
+	public RespDTO<WaitAuthenDTO> waitAuthen() {
+		return RespDTO.onSuc(userAuthenticationFacade.waitAuthen());
+	}
     
 }

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

@@ -23,5 +23,12 @@
         SELECT a.* FROM `sys_user_authentication` a
         where a.user_id=#{userId} and  a.is_deleted = 'N'
     </select>
+    
+    <select id="getAllWaitAuthCou" resultType="int">
+    	select
+    		count(1)
+    	from sys_user_authentication
+    	where is_deleted = 'N' and status=2
+    </select>
 
 </mapper>