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

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

@@ -31,6 +31,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/diagLantoneProduct/selectProduct").permitAll()
                 .antMatchers("/morServices/addOrder").permitAll()
                 .antMatchers("/diagLantoneProduct/opendedProduct").permitAll()
+                .antMatchers("/productOrder/getInformationAvailableAll").permitAll()
                 .antMatchers("/**").authenticated();
         //        .antMatchers("/**").permitAll();
     }

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

@@ -37,6 +37,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/getDiagbotManEnumsData", request)
                     || matchers("/service_filter/getAll", request)
                     || matchers("/serviceToken/hasPermission", request)
+                    || matchers("/productOrder/getInformationAvailableAll", request)
                     || matchers("/diagLantoneProduct/selectProduct", request)
                     || matchers("/morServices/addOrder", request)
                     || matchers("/diagLantoneProduct/opendedProduct", request)

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

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -44,5 +45,9 @@ public class ProductOrderIndex implements Serializable {
      * 入参页数
      */
     private Long index;
+    /**
+     * 用户id
+     */
+    private List<Long> userId;
 
 }

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

@@ -50,7 +50,6 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
 
     /**
      * 产品申请审核接口
-     *
      * @param auditStatusVO 需要提供参数（订单明细id，审核状态，开始时间，结束时间）
      * @return Boolean true
      */
@@ -64,19 +63,20 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         orderDetails.setGmtModified(DateUtil.now());
         orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
         orderDetails.setAuditStatus(auditStatusVO.getAuditStatus());
-        if (auditStatusVO.getAuditStatus() == AuditStatusEnum.Veto.getKey()) {
-            if (!this.updateById(orderDetails)) {
+        //TODO  根据订单审核状态修改主表审核状态  审核失败设置失败原因   没有线上模式时不是抛异常而是不生成token
+        if(auditStatusVO.getAuditStatus()== AuditStatusEnum.Veto.getKey()){
+            if(!this.updateById(orderDetails)){
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         "审核状态修改失败");
             }
             return true;
         }
-        if (!this.updateById(orderDetails)) {
+        if(!this.updateById(orderDetails)){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "审核状态修改失败");
         }
-        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        OpenedProducts openedProducts = new OpenedProducts();
+        Long userId =Long.parseLong(UserUtils.getCurrentPrincipleID());
+        OpenedProducts openedProducts =new OpenedProducts();
         openedProducts.setGmtCreate(DateUtil.now());
         openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
         openedProducts.setProductId(1L);
@@ -85,17 +85,17 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         openedProducts.setEndTime(auditStatusVO.getEndTime());
         openedProducts.setOrderId(1L);
         openedProductsFacade.save(openedProducts);
-        LantoneProduct lantoneProduct = new LantoneProduct();
-        if (lantoneProductFacade.getById(lantoneProduct).getAccessType().indexOf(TokenTypeEnum.Online.getKey()) == -1) {
+        LantoneProduct lantoneProduct =new LantoneProduct();
+        if(lantoneProductFacade.getById(lantoneProduct).getAccessType().indexOf(TokenTypeEnum.Online.getKey())==-1){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "该产品没有线上模式");
         }
-        ServiceSaveVO serviceSaveVO = new ServiceSaveVO();
+        ServiceSaveVO serviceSaveVO =new ServiceSaveVO();
         serviceSaveVO.setDescription(lantoneProduct.getDecription());
         serviceSaveVO.setName(lantoneProduct.getName());
         serviceSaveVO.setType(TokenTypeEnum.Online.getKey());
         ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
-        ProductServiceSaveVO productServiceSaveVO = new ProductServiceSaveVO();
+        ProductServiceSaveVO productServiceSaveVO =new ProductServiceSaveVO();
         productServiceSaveVO.setProductId(auditStatusVO.getId());
         productServiceSaveVO.setServiceId(serviceInfo.getId());
         productServiceSaveVO.setType(TokenTypeEnum.Online.getKey());
@@ -106,39 +106,38 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
 
     /**
      * 产品申请查询所有订单明细
-     *
      * @param orderDetialsVO 需要提供参数（付款状态，页数，每页条数默认显示10条）
      * @return 所有订单明细
      */
-    public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
-        OrderDetailsIndex orderDetailsIndex = new OrderDetailsIndex();
+    public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
+        OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
         Long curren = orderDetialsVO.getCurrent();
-        Long size = orderDetialsVO.getSize();
-        if (curren == null) {
+        Long size =orderDetialsVO.getSize();
+        if(curren==null){
             orderDetialsVO.setCurrent(1L);
         }
-        if (size == null) {
+        if (size==null){
             orderDetialsVO.setSize(10L);
         }
         BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
-        orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue() - 1) * orderDetialsVO.getSize().longValue());
+        orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue()-1)*orderDetialsVO.getSize().longValue());
 
         orderDetailsIndex.setUserId(1L);
-        List<OrderDetailsWapper> list = this.seleAllOrderDetials(orderDetailsIndex);
-        List<Long> list1 = new ArrayList<>();
-        for (OrderDetails orderDetails : list) {
+        List<OrderDetailsWapper> list =this.seleAllOrderDetials(orderDetailsIndex);
+        List<Long> list1 =new ArrayList<>();
+        for (OrderDetails orderDetails:list) {
             Long longs = orderDetails.getUserId();
             list1.add(longs);
         }
         RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(list1);
-        if (mapRespDTO == null || !"0".equals(mapRespDTO.code)) {
+        if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "获取用户和机构信息失败");
         }
         Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
-        for (OrderDetailsWapper bean : list) {
+        for(OrderDetailsWapper bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
-            if (uo != null) {
+            if(uo != null) {
                 bean.setUsername(uo.getUsername());
                 bean.setLinkman(uo.getLinkman());
                 bean.setEmail(uo.getEmail());

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

@@ -141,52 +141,53 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
     }
 
 
-    /**
-     * 产品申请查询所有订单信息
+	/**
+	 * 产品申请查询所有订单信息
      *
-     * @param productOrderVO （订单编号，机构名称，申请状态）
-     * @return 所有订单信息
-     */
-    public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderVO productOrderVO) {
-        ProductOrderIndex productOrderIndex = new ProductOrderIndex();
-        Long curren = productOrderVO.getCurrent();
-        Long size = productOrderVO.getSize();
-        if (curren == null) {
-            productOrderVO.setCurrent(1L);
-        }
-        if (size == null) {
-            productOrderVO.setSize(10L);
-        }
-        BeanUtil.copyProperties(productOrderVO, productOrderIndex);
-        productOrderIndex.setIndex((productOrderVO.getCurrent().longValue() - 1) * productOrderVO.getSize().longValue());
-        //TODO
-        userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
-        List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderIndex);
-        List<Long> list1 = new ArrayList<>();
-        for (ProductOrderWrapper productOrderWrapper : list) {
-            Long longs = productOrderWrapper.getUserId();
-            list1.add(longs);
-        }
-        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 (ProductOrderWrapper 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;
-    }
+	 * @param productOrderVO （订单编号，机构名称，申请状态）
+	 * @return 所有订单信息
+	 */
+	public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderVO productOrderVO){
+		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
+		Long curren = productOrderVO.getCurrent();
+		Long size =productOrderVO.getSize();
+		if(curren==null){
+			productOrderVO.setCurrent(1L);
+		}
+		if (size==null){
+			productOrderVO.setSize(10L);
+		}
+		BeanUtil.copyProperties(productOrderVO, productOrderIndex);
+		productOrderIndex.setIndex((productOrderVO.getCurrent().longValue()-1)*productOrderVO.getSize().longValue());
+		//TODO
+		RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
+		productOrderIndex.setUserId(rlist.data);
+		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(productOrderIndex);
+		List<Long> list1 =new ArrayList<>();
+		for (ProductOrderWrapper productOrderWrapper:list) {
+			Long longs = productOrderWrapper.getUserId();
+			list1.add(longs);
+		}
+		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(ProductOrderWrapper 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/vo/AddProductsVO.java

@@ -21,4 +21,14 @@ public class AddProductsVO {
     private String url;
     @NotBlank(message = "请输入计费方式!")
     private String chargeType;
+    @NotBlank(message = "请输入计费方式!")
+    private Integer trialStatus;
+    /**
+     * 试用路径
+     */
+    private String trialUrl;
+    /**
+     * 接入方式
+      */
+    private String accessType;
 }

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

@@ -144,4 +144,12 @@ public class ProductOrderController {
         List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderVO);
         return RespDTO.onSuc(list);
     }
+    @ApiOperation(value = "查询已开通的功能[by:wangfeng]", notes = "已开通信息")
+    @PostMapping("/getInformationAvailableAll")
+    @SysLogger("getInformationAvailableAll")
+    public RespDTO<List<UserAndProdutDTO>>  getInformationAvailableByUserIds(){
+		OpenedProducts openedProducts =new OpenedProducts();
+    	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(openedProducts);
+    	return RespDTO.onSuc(UserAndProdutData);
+    }
 }

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

@@ -88,6 +88,12 @@
         <if test="auditStatus != null and auditStatus != ''">
             AND audit_status=#{auditStatus}
         </if>
+        <if test="userId != null and userId.size > 0">
+            AND user_id IN
+            <foreach item="userId" collection="userId" open="(" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
         LIMIT #{index},#{size}
     </select>
 

user-service/src/main/java/com/diagbot/client/DiagbotmanService.java

@@ -0,0 +1,24 @@
+package com.diagbot.client;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.diagbot.client.hystrix.DiagbotmanServiceHystrix;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutUDTO;
+
+/**
+ * 
+ * @Description: 调用产品服务
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:05:45
+ */
+@FeignClient(value = "diagbotman-service",fallback = DiagbotmanServiceHystrix.class )
+public interface DiagbotmanService {
+	
+	@PostMapping(value = "/productOrder/getInformationAvailableAll")
+	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll();
+
+}

user-service/src/main/java/com/diagbot/client/hystrix/DiagbotmanServiceHystrix.java

@@ -0,0 +1,29 @@
+package com.diagbot.client.hystrix;
+
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.diagbot.client.DiagbotmanService;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutUDTO;
+
+import lombok.extern.slf4j.Slf4j;
+/**
+ * 
+ * @Description: 调用产品服务
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:12:36
+ */
+@Component
+@Slf4j
+public class DiagbotmanServiceHystrix implements DiagbotmanService {
+	
+	@Override
+	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(){
+		 log.error("【hystrix】调用{}异常","getInformationAvailableByUserId");
+	        return null;
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description:  用户已开通产品出参
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:21:45
+ */
+@Getter
+@Setter
+public class UserAndProdutUDTO {
+	
+	private Long  Id;//开通的id
+	private Long  productId;//产品Id
+	private Long userId;//用户Id
+	private Date startTime;//开通时间
+	private Date endTime;//结束时间
+	private Integer serviceStatus;//启用状态
+	private Integer accessType;//接入方式
+	private Integer chargeType;//结算方式
+	private String  productName;//产品名称
+
+}

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

@@ -0,0 +1,167 @@
+package com.diagbot.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.OrganizationTypeEnum;
+
+/**
+ * 
+ * @Description: 用户信息机构信息开通产品
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:17:57
+ */
+public class UserOrganProductDTO implements Serializable{
+	
+	 private static final long serialVersionUID = 1L;
+
+	    @TableId(value = "id", type = IdType.AUTO)
+	    private Long userId;//用户ID
+	    private Date userGmtCreate;//记录创建时间
+	    private String userName;// 用户名
+	    private String linKman;//联系人
+	    private String email;// 邮箱
+	    @TableId(value = "id", type = IdType.AUTO)
+	    private Long orgId;//机构ID
+	    private Date orgGmtCreate;//记录创建时间
+	    private String orgName;//机构名称
+	    private Integer orgType;//机构属性
+	    private String  orgTypeStr;//机构属性String
+	    private String orgPrincipal;//负责人
+	    private String orgAddress;//机构地址
+	    private Long orgParentId;//上级机构id
+	    private Integer orgSubNum;//下属机构数量
+	    private String autPosition;//岗位信息
+	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
+	    private Integer autStatus;//认证状态
+	    private String autStatusStr;//认证状态String
+	    private List<UserAndProdutUDTO> userAndProdutUDTO;
+		public Long getUserId() {
+			return userId;
+		}
+		public void setUserId(Long userId) {
+			this.userId = userId;
+		}
+		public Date getUserGmtCreate() {
+			return userGmtCreate;
+		}
+		public void setUserGmtCreate(Date userGmtCreate) {
+			this.userGmtCreate = userGmtCreate;
+		}
+		public String getUserName() {
+			return userName;
+		}
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+		public String getLinKman() {
+			return linKman;
+		}
+		public void setLinKman(String linKman) {
+			this.linKman = linKman;
+		}
+		public String getEmail() {
+			return email;
+		}
+		public void setEmail(String email) {
+			this.email = email;
+		}
+		public Long getOrgId() {
+			return orgId;
+		}
+		public void setOrgId(Long orgId) {
+			this.orgId = orgId;
+		}
+		public Date getOrgGmtCreate() {
+			return orgGmtCreate;
+		}
+		public void setOrgGmtCreate(Date orgGmtCreate) {
+			this.orgGmtCreate = orgGmtCreate;
+		}
+		public String getOrgName() {
+			return orgName;
+		}
+		public void setOrgName(String orgName) {
+			this.orgName = orgName;
+		}
+		public Integer getOrgType() {
+			return orgType;
+		}
+		public void setOrgType(Integer orgType) {
+			if(orgType!=null){
+				setOrgTypeStr(OrganizationTypeEnum.getName(orgType));	
+			}
+			this.orgType = orgType;
+		}
+		public String getOrgTypeStr() {
+			return orgTypeStr;
+		}
+		public void setOrgTypeStr(String orgTypeStr) {
+			this.orgTypeStr = orgTypeStr;
+		}
+		public String getOrgPrincipal() {
+			return orgPrincipal;
+		}
+		public void setOrgPrincipal(String orgPrincipal) {
+			this.orgPrincipal = orgPrincipal;
+		}
+		public String getOrgAddress() {
+			return orgAddress;
+		}
+		public void setOrgAddress(String orgAddress) {
+			this.orgAddress = orgAddress;
+		}
+		public Long getOrgParentId() {
+			return orgParentId;
+		}
+		public void setOrgParentId(Long orgParentId) {
+			this.orgParentId = orgParentId;
+		}
+		public Integer getOrgSubNum() {
+			return orgSubNum;
+		}
+		public void setOrgSubNum(Integer orgSubNum) {
+			this.orgSubNum = orgSubNum;
+		}
+		public String getAutPosition() {
+			return autPosition;
+		}
+		public void setAutPosition(String autPosition) {
+			this.autPosition = autPosition;
+		}
+		public Integer getAutIsReject() {
+			return autIsReject;
+		}
+		public void setAutIsReject(Integer autIsReject) {
+			this.autIsReject = autIsReject;
+		}
+		public Integer getAutStatus() {
+			return autStatus;
+		}
+		public void setAutStatus(Integer autStatus) {
+			if(autStatus!=null){
+				setAutStatusStr(AuthStatusEnum.getName(autStatus));
+			}
+			this.autStatus = autStatus;
+		}
+		public static long getSerialversionuid() {
+			return serialVersionUID;
+		}
+		public String getAutStatusStr() {
+			return autStatusStr;
+		}
+		public void setAutStatusStr(String autStatusStr) {
+			this.autStatusStr = autStatusStr;
+		}
+		public List<UserAndProdutUDTO> getUserAndProdutUDTO() {
+			return userAndProdutUDTO;
+		}
+		public void setUserAndProdutUDTO(List<UserAndProdutUDTO> userAndProdutUDTO) {
+			this.userAndProdutUDTO = userAndProdutUDTO;
+		}
+
+}

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

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.AuthServiceClient;
+import com.diagbot.client.DiagbotmanService;
 import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutUDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrganProductDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
@@ -84,6 +87,8 @@ public class UserFacade extends UserServiceImpl {
     UserAuthenticationFacade userAuthenticationFacade;
     @Autowired
     PermissionFacade permissionFacade;
+    @Autowired
+    DiagbotmanService diagbotmanService;
 
     /**
      * 注册
@@ -351,7 +356,7 @@ public class UserFacade extends UserServiceImpl {
      * @param user 新建用户信息输入参数
      * @return 用户信息
      */
-    @CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
+    //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User saveUser(User user) {
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -368,7 +373,7 @@ public class UserFacade extends UserServiceImpl {
      * @param user 更新用户信息输入参数
      * @return 用户信息
      */
-    @CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
+    //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User updateUser(User user) {
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -386,7 +391,7 @@ public class UserFacade extends UserServiceImpl {
      * @return 用户信息
      */
     @Override
-    @Cacheable(value = CACHE_NAME, key = "'user:'+#p0")
+    //@Cacheable(value = CACHE_NAME, key = "'user:'+#p0")
     public User getById(Serializable id) {
         return super.getById(id);
     }
@@ -398,7 +403,7 @@ public class UserFacade extends UserServiceImpl {
      * @return 是否成功
      */
     @Override
-    @CacheEvict(value = CACHE_NAME, key = "'user:'+#p0")
+    //@CacheEvict(value = CACHE_NAME, key = "'user:'+#p0")
     public boolean removeById(Serializable id) {
         return super.removeById(id);
     }
@@ -668,4 +673,76 @@ public class UserFacade extends UserServiceImpl {
         }
         return RespDTO.onSuc(res);
     }
+    /**
+     * 
+     * @param page
+     * @param orgName
+     * @param autStatus
+     * @return 分页查询用户信息和机构信息开通产品
+     */
+    public RespDTO<UserOrganProductDTO> getUserOrganProductAlls(Page page, String orgName, Integer autStatus){
+    	
+    	 UserInfoDTO userInfo = new UserInfoDTO();
+         userInfo.setOrgName(orgName);
+         userInfo.setAutStatus(autStatus);
+         IPage<UserInfoDTO> user = selectUserInfoListPage(page, userInfo);
+         List<UserInfoDTO> userData = user.getRecords();
+         RespDTO<List<UserAndProdutUDTO>> InformationData = diagbotmanService.getInformationAvailableAll();
+         if(InformationData == null || !CommonErrorCode.OK.getCode().equals(InformationData.code) ) {
+             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                     "获取所有开通信息失败");
+         }
+         //获取所有用户开通的产品信息
+         List<UserAndProdutUDTO> dataList = InformationData.data;
+         
+        System.out.println("===================="+GsonUtil.toJson(dataList));
+        List<UserOrganProductDTO> userOrganProductList = new ArrayList<UserOrganProductDTO>();
+        for(int i =0;i<userData.size();i++){
+        	UserInfoDTO userInfoDate = userData.get(i);
+    		Long userInfoId = userInfoDate.getUserId();
+    		UserOrganProductDTO userOrgan=new UserOrganProductDTO();
+			userOrgan.setUserId(userInfoId);
+			userOrgan.setUserGmtCreate(userInfoDate.getUserGmtCreate());
+			userOrgan.setUserName(userInfoDate.getUserName());
+			userOrgan.setLinKman(userInfoDate.getLinKman());
+			userOrgan.setEmail(userInfoDate.getEmail());
+			userOrgan.setOrgId(userInfoDate.getOrgId());
+			userOrgan.setOrgGmtCreate(userInfoDate.getOrgGmtCreate());
+			userOrgan.setOrgName(userInfoDate.getOrgName());
+			userOrgan.setOrgType(userInfoDate.getOrgType());
+			userOrgan.setOrgTypeStr(userInfoDate.getOrgTypeStr());
+			userOrgan.setOrgPrincipal(userInfoDate.getOrgPrincipal());
+			userOrgan.setOrgAddress(userInfoDate.getOrgAddress());
+			userOrgan.setOrgParentId(userInfoDate.getOrgParentId());
+			userOrgan.setOrgSubNum(userInfoDate.getOrgSubNum());
+			userOrgan.setAutPosition(userInfoDate.getAutPosition());
+			userOrgan.setAutIsReject(userInfoDate.getAutIsReject());
+			userOrgan.setAutStatus(userInfoDate.getAutStatus());
+			userOrgan.setAutStatusStr(userInfoDate.getAutStatusStr());
+			List<UserAndProdutUDTO>  userProdList = new ArrayList<UserAndProdutUDTO>();
+        	 for(int j =0;j<dataList.size();j++ ){
+        	    UserAndProdutUDTO  userAndProdutData = dataList.get(i);
+             	Long userprodutId = userAndProdutData.getUserId();
+        		if(userprodutId==userInfoId){
+        			UserAndProdutUDTO produData = new UserAndProdutUDTO();
+        			produData.setId(userAndProdutData.getId());
+        			produData.setProductId(userAndProdutData.getProductId());
+        			produData.setUserId(userAndProdutData.getUserId());
+        			produData.setStartTime(userAndProdutData.getStartTime());
+        			produData.setEndTime(userAndProdutData.getEndTime());
+        			produData.setServiceStatus(userAndProdutData.getServiceStatus());
+        			produData.setAccessType(userAndProdutData.getAccessType());
+        			produData.setChargeType(userAndProdutData.getChargeType());
+        			produData.setProductName(userAndProdutData.getProductName());
+        			userProdList.add(produData);
+        		} 
+             	
+        	 }
+        	 userOrgan.setUserAndProdutUDTO(userProdList);
+        	 
+        	 userOrganProductList.add(userOrgan);
+        	
+        }
+    	return RespDTO.onSuc(userOrganProductList);
+    }
 }

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

@@ -27,7 +27,7 @@ public class TestController {
     @ApiOperation(value = "测试发送短信[by:gaodm]",
             notes = "测试发送短信")
     @PostMapping("/sms_send")
-    RespDTO testSmsSend() {
+    RespDTO<String> testSmsSend() {
         System.out.println("The time is now " + DateUtil.nowString());
         log.info("短信验证发送开始！");
         //String code="1234";

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

@@ -29,7 +29,7 @@ import java.util.Map;
  * @since 2018-09-13
  */
 @RestController
-@Api(value = "用户认证API", tags = { "用户认证API" })
+@Api(value = "用户账号认证API", tags = { "用户账号认证API" })
 @RequestMapping("/userAuthentication")
 @SuppressWarnings("unchecked")
 public class UserAuthenticationController {

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

@@ -34,7 +34,7 @@ import java.util.Map;
  * @time: 2018/8/2 13:56
  */
 @RestController
-@Api(value = "用户操作API", tags = { "用户操作API" })
+@Api(value = "用户账号注册等API", tags = { "用户账号注册等API" })
 @RequestMapping("/user")
 @SuppressWarnings("unchecked")
 public class UserController {

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.dto.UserOrganProductDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserAuthentication;
@@ -122,5 +123,12 @@ public class UserInfoController {
 
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
-
+    @ApiOperation(value = "用户信息和机构信息开通产品[by:wangfeng]", notes = "用户信息和机构信息开通产品")
+    @PostMapping("/getUserOrganProductAll")
+    @SysLogger("getUserOrganProductAll")
+    @Transactional
+    public RespDTO<UserOrganProductDTO> getUserOrganProductAll(Page page, String orgName, Integer autStatus) {
+       
+        return userFacade.getUserOrganProductAlls(page,orgName,autStatus);
+    }
 }