已开通产品修改

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

@@ -25,9 +25,14 @@ public class AuthDetailDTO implements Serializable {
     private String name;
 
     /**
-     * 是否通过审核,N:未通过，Y:已通过
+     * 是否通过审核,0.不通过1.通过2.待审核
      */
-    private String auditStatus;
+    private Integer auditStatus;
+    
+    /**
+     * 审核信息
+     */
+    private String auditStatusMsg;
 
     /**
      * 不通过原因

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

@@ -43,6 +43,21 @@ public class GetConsoleOpenedDTO implements Serializable {
      * 当前用户的产品停用状态
      */
     private Integer serviceStatus;
+    
+    /**
+     * 当前用户产品停用状态信息
+     */
+    private String serviceStatusMsg;
 
 
-}
+    /**
+     * 接入方式（1：嵌入式，2：接口方式，3：online）
+     */
+    private String accessType;
+    
+    /**
+     * 接入方式信息
+     */
+    private String accessTypeMsg;
+    
+}

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

@@ -21,6 +21,8 @@ import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.enums.AccessTypeEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.OpenedProductsServiceImpl;
@@ -54,7 +56,18 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
      */
     public List<GetConsoleOpenedDTO> getConsoleOpened() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        return baseMapper.getConsoleOpened(userId);
+        
+        List<GetConsoleOpenedDTO> retList = baseMapper.getConsoleOpened(userId);
+        for(GetConsoleOpenedDTO i : retList){
+        	String accessTypeMsg = "";
+        	for(String j:i.getAccessType().split(",")){
+        		accessTypeMsg+=AccessTypeEnum.getName(Integer.parseInt(j))+" ";
+        	}
+        	i.setAccessTypeMsg(accessTypeMsg);
+        	i.setServiceStatusMsg(StatusEnum.getName(i.getServiceStatus()));
+        }
+        
+        return retList;
     }
 
     /**

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

@@ -70,16 +70,25 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         for (ProductOrder i : orderList) {
             nums.add(i.getNum());
         }
+        
+        if(nums.size()==0){
+        	return retList;
+        }
+        
         List<AuthDetailDTO> detailList = baseMapper.getOrderDetailsByNums(nums);
+        List<AuthDetailDTO> products = null;
         Map<String, List<AuthDetailDTO>> detailMap = detailList.stream().collect(Collectors.groupingBy(AuthDetailDTO::getNum));
         for (String num : detailMap.keySet()) {
             ProductAuthProgressDTO productAuthProgressDTO = new ProductAuthProgressDTO();
             productAuthProgressDTO.setNum(num);
-            productAuthProgressDTO.setProducts(detailMap.get(num));
+            products = detailMap.get(num);
+            for(AuthDetailDTO i : products){
+            	i.setAuditStatusMsg(AuditStatusEnum.getName(i.getAuditStatus()));
+            }
+            productAuthProgressDTO.setProducts(products);
             retList.add(productAuthProgressDTO);
         }
 
-
         return retList;
     }
 

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

@@ -69,7 +69,8 @@
 			b.name as name,
 			DATE_FORMAT(a.start_time,'%Y-%m-%d') as startTime,
 			DATE_FORMAT(a.end_time,'%Y-%m-%d') as endTime,
-			a.service_status as serviceStatus
+			a.service_status as serviceStatus,
+			b.access_type as accessType
 		from diag_opened_products a join diag_lantone_product b on a.product_id=b.id
 		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId};
     </select>