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

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

@@ -7,11 +7,20 @@ import lombok.Setter;
 @Setter
 public class AuthDetailDTO {
 	
-	private String productName;
+	/**
+     * 产品名称
+     */
+    private String name;
 	
-	private Integer auditStatus;
+    /**
+     * 是否通过审核,N:未通过，Y:已通过
+     */
+    private String auditStatus;
 	
-	private String auditStatusMessage;
+    /**
+     * 不通过原因
+     */
+    private String rejectReason;
 	
 
 }

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

@@ -14,8 +14,14 @@ import lombok.Setter;
 @Setter
 public class ProductAuthProgressDTO {
 
+    /**
+     * 订单编号
+     */
 	private String num;
-	
-	List<AuthDetailDTO> products;
+
+	/**
+	 * 订单详情
+	 */
+	private List<AuthDetailDTO> products;
 	
 }

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

@@ -1,194 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description: 订单明细实体类
- * @Author: wangyu
- * @Date: 15:40 2018/9/17
- */
-public class DiagOrderDetails implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 订单明细id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 订单编号
-     */
-    private String orderNum;
-
-    /**
-     * 产品id
-     */
-    private Integer productId;
-
-    /**
-     * 用户id
-     */
-    private Integer userId;
-
-    /**
-     * 是否通过审核,N:未通过，Y:已通过
-     */
-    private String auditStatus;
-
-    /**
-     * 单个服务的价钱
-     */
-    private BigDecimal unitPrice;
-
-    /**
-     * 订单状态 Y：已付款，N未付款
-     */
-    private String status;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public String getAuditStatus() {
-        return auditStatus;
-    }
-
-    public void setAuditStatus(String auditStatus) {
-        this.auditStatus = auditStatus;
-    }
-
-    public BigDecimal getUnitPrice() {
-        return unitPrice;
-    }
-
-    public void setUnitPrice(BigDecimal unitPrice) {
-        this.unitPrice = unitPrice;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        return "DiagOrderDetails{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", orderNum=" + orderNum +
-        ", productId=" + productId +
-        ", userId=" + userId +
-        ", auditStatus=" + auditStatus +
-        ", unitPrice=" + unitPrice +
-                ", status=" + status +
-        "}";
-    }
-}

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

@@ -1,166 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description: 订单实体类
- * @Author: wangyu
- * @Date: 15:41 2018/9/17
- */
-public class DiagProductOrder implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 订单id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 订单编号
-     */
-    private String num;
-
-    /**
-     * 用户id
-     */
-    private Integer userId;
-
-    /**
-     * 下单时间（申请时间）
-     */
-    private Date time;
-
-    /**
-     * 订单总价
-     */
-    private BigDecimal totalPrices;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getNum() {
-        return num;
-    }
-
-    public void setNum(String num) {
-        this.num = num;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Date getTime() {
-        return time;
-    }
-
-    public void setTime(Date time) {
-        this.time = time;
-    }
-
-    public BigDecimal getTotalPrices() {
-        return totalPrices;
-    }
-
-    public void setTotalPrices(BigDecimal totalPrices) {
-        this.totalPrices = totalPrices;
-    }
-
-    @Override
-    public String toString() {
-        return "DiagProductOrder{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", num=" + num +
-        ", userId=" + userId +
-        ", time=" + time +
-        ", totalPrices=" + totalPrices +
-        "}";
-    }
-}

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

@@ -2,7 +2,6 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.ProductServiceRespDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
@@ -15,16 +14,14 @@ import com.diagbot.service.impl.ProductServiceServiceImpl;
 import com.diagbot.util.GuidUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ProductServiceSaveVO;
-import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 /**
  * @Description:产品与用户端关联业务层
@@ -42,6 +39,11 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     @Autowired
     private OpenedProductsFacade openedProductsFacade;
 
+    /**
+     * @Description:建立产品服务端关联并生成令牌
+     * @author: zhaops
+     * @time: 2018/9/18 16:33
+     */
     public ProductServiceRespDTO genProductService(ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceRespDTO productServiceRespDTO = new ProductServiceRespDTO();
         Calendar calendar = Calendar.getInstance();
@@ -80,49 +82,48 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         // 生成令牌
         // 如果已有令牌，先删除原令牌，再重新生成
         // 试用产品 type=3 需生成7天有效期，重新生成令牌，有效期继承，超出有效期不允许再生成令牌
-        // 接入方式 accessType=3 online模式不需要生成令牌
         ServiceToken old_serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
         //删除原有token
         if (old_serviceToken != null) {
             serviceTokenFacade.deleteByProductServiceId(old_serviceToken.getProductSeviceId());
         }
 
-        String[] accessType = lantoneProduct.getAccessType().split(",");
-        if (accessType.length == 1 && accessType[0].equals("3")) {
-            productServiceRespDTO.setMsg("online模式不需要生成令牌！");
-        } else {
-            ServiceToken serviceToken = new ServiceToken();
-            serviceToken.setCreator(userId.toString());
-            serviceToken.setGmtCreate(new Date());
-            serviceToken.setProductSeviceId(productService.getId());
-            serviceToken.setType(productServiceSaveVO.getType());
-            serviceToken.setAppKeyId(GuidUtil.App_key());
-            serviceToken.setAppKeySecret(GuidUtil.App_screct());
-            serviceToken.setStatus(1);
-            if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial)) {
-                //如果试用已过期，不允许再生成
-                if (calendar.after(old_serviceToken.getExpiringDate())) {
-                    productServiceRespDTO.setMsg("当前试用账号已过期，不允许再生成令牌");
-                    return productServiceRespDTO;
-                }
-                serviceToken.setStartingDate(old_serviceToken.getStartingDate());
-                serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
-            } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial)) {
-                serviceToken.setStartingDate(new Date());
-                calendar.clear();
-                calendar.setTime(new Date());
-                calendar.add(Calendar.DAY_OF_MONTH, 7);
-                serviceToken.setExpiringDate(calendar.getTime());
+        ServiceToken serviceToken = new ServiceToken();
+        serviceToken.setCreator(userId.toString());
+        serviceToken.setGmtCreate(new Date());
+        serviceToken.setProductSeviceId(productService.getId());
+        serviceToken.setType(productServiceSaveVO.getType());
+        serviceToken.setAppKeyId(GuidUtil.App_key());
+        serviceToken.setAppKeySecret(GuidUtil.App_screct());
+        serviceToken.setStatus(1);
+        if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial.getKey())) {
+            //如果试用已过期，不允许再生成
+            if (calendar.after(old_serviceToken.getExpiringDate())) {
+                productServiceRespDTO.setMsg("当前试用账号已过期，不允许再生成令牌");
+                return productServiceRespDTO;
             }
-            serviceTokenFacade.save(serviceToken);
-            productServiceRespDTO.setServiceToken(serviceToken);
-            productServiceRespDTO.setMsg("令牌生成成功！");
+            serviceToken.setStartingDate(old_serviceToken.getStartingDate());
+            serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
+        } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial.getKey())) {
+            serviceToken.setStartingDate(new Date());
+            calendar.clear();
+            calendar.setTime(new Date());
+            calendar.add(Calendar.DAY_OF_MONTH, 7);
+            serviceToken.setExpiringDate(calendar.getTime());
         }
+        serviceTokenFacade.save(serviceToken);
+        productServiceRespDTO.setServiceToken(serviceToken);
+        productServiceRespDTO.setMsg("令牌生成成功！");
 
         productServiceRespDTO.setProductService(productService);
         return productServiceRespDTO;
     }
 
+    /**
+     * @Description:删除产品服务端关联，级联删除令牌
+     * @author: zhaops
+     * @time: 2018/9/18 16:33
+     */
     public ProductServiceRespDTO deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceRespDTO productServiceRespDTO = new ProductServiceRespDTO();
         Calendar calendar = Calendar.getInstance();
@@ -143,18 +144,28 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         return productServiceRespDTO;
     }
 
-    public IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page) {
+    /**
+     * @Description:获取当前用户产品服务关联列表
+     * @author: zhaops
+     * @time: 2018/9/18 16:33
+     */
+    public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        ProductServiceWrapper productServiceVO=new ProductServiceWrapper();
+        ProductServiceWrapper productServiceVO = new ProductServiceWrapper();
         productServiceVO.setUserId(userId);
         IPage<ProductServiceWrapper> psPage = this.selectProductServiceByUserIdPage(page, productServiceVO);
         List<ProductServiceWrapper> psList = psPage.getRecords();
         for (ProductServiceWrapper productService : psList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("userId", userId);
+            map.put("productId", productService.getProductId());
             LantoneProduct lantoneProduct = lantoneProductFacade.getById(productService.getProductId());
-            //OpenedProducts openedProducts=openedProductsFacade.
+            List<OpenedProducts> openedProductsList = openedProductsFacade.selectOpenedProducts(map);
+            OpenedProducts openedProducts = openedProductsList.size() == 0 ? null : openedProductsList.get(0);
             ServiceInfo serviceInfo = serviceInfoFacade.getById(productService.getServiceId());
             ServiceToken serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
             productService.setLantoneProduct(lantoneProduct);
+            productService.setOpenedProducts(openedProducts);
             productService.setServiceInfo(serviceInfo);
             productService.setServiceToken(serviceToken);
         }

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

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.OpenedProducts;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 已开通产品 Mapper 接口
@@ -21,4 +24,11 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @return
      */
     IPage<OpenedProducts> selectOpendInfoByUserId(Page page, @Param("userId") int userId);
+
+    /**
+     * 查询已开通产品
+     * @param map 查询条件
+     * @return
+     */
+    List<OpenedProducts> selectOpenedProducts(Map<String,Object>map);
 }

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.OpenedProducts;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 已开通产品 服务类
@@ -20,4 +23,11 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @return
      */
     IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, int userId);
+
+    /**
+     * 查询已开通产品
+     * @param map 查询条件
+     * @return
+     */
+    List<OpenedProducts> selectOpenedProducts(Map<String,Object> map);
 }

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

@@ -8,6 +8,9 @@ import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 已开通产品 服务实现类
@@ -22,4 +25,13 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     public IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, int userId) {
         return baseMapper.selectOpendInfoByUserId(page,userId);
     }
+
+    /**
+     * 查询已开通产品
+     * @param map 查询条件
+     * @return
+     */
+    public List<OpenedProducts> selectOpenedProducts(Map<String,Object> map){
+        return baseMapper.selectOpenedProducts(map);
+    }
 }

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

@@ -3,7 +3,6 @@ package com.diagbot.web;
 import java.util.List;
 
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,14 +12,15 @@ import com.diagbot.dto.ProductAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ProductOrderFacade;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * 订单操作
  * 
  * @author rgb
  *
  */
+@Api(value="控制台-产品操作", tags={"控制台-产品操作"})
 @RestController
 @RequestMapping("/productOrder")
 public class ProductOrderController {
@@ -28,10 +28,9 @@ public class ProductOrderController {
 	@Autowired
 	private ProductOrderFacade productOrderFacade;
 
-	@ApiOperation(value = "产品认证进度")
+	@ApiOperation(value = "控制台-产品认证进度",notes="控制台-产品认证进度")
 	@PostMapping("/productAuthProgress")
 	@SysLogger("productAuthProgress")
-	@Transactional
 	public RespDTO<List<ProductAuthProgressDTO>> productAuthProgress() {
 		return RespDTO.onSuc(productOrderFacade.productAuthProgress());
 	}

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

@@ -64,7 +64,7 @@ public class ProductServiceController {
     @PostMapping("/getProductServiceByCurrentUser")
     @SysLogger("getProductServiceByCurrentUser")
     public RespDTO getProductServiceByCurrentUser(Page page) {
-        IPage<ProductServiceWrapper> psPage = productServiceFacade.selectProductServiceByUserIdPage(page);
+        IPage<ProductServiceWrapper> psPage = productServiceFacade.selectProductServiceByCurrentUserPage(page);
         return RespDTO.onSuc(psPage);
     }
 }

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.DiagOrderDetailsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.DiagOrderDetails">
-        <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="order_num" property="orderNum" />
-        <result column="product_id" property="productId" />
-        <result column="user_id" property="userId" />
-        <result column="audit_status" property="auditStatus" />
-        <result column="unit_price" property="unitPrice" />
-        <result column="status" property="status" />
-    </resultMap>
-
-</mapper>

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

@@ -22,4 +22,14 @@
     <select id="selectOpendInfoByUserId" resultMap="BaseResultMap" parameterType="java.util.List">
         SELECT opend.* FROM diag_opened_products opend WHERE user_id = #{userId}
     </select>
+
+    <select id="selectOpenedProducts" resultMap="BaseResultMap" parameterMap="java.util.Map">
+        SELECT t.* FROM diag_opened_products t WHERE t.is_deleted='N'
+        <if test="userId != null and userId != ''">
+        and t.user_id = #{userId}
+        </if>
+        <if test="productId != null and productId != ''">
+        and t.product_id=#{productId}
+        </if>
+    </select>
 </mapper>

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

@@ -25,8 +25,8 @@
 	<select id="getOrderDetails" parameterType="string" resultType="com.diagbot.dto.AuthDetailDTO">
 		select
 			b.audit_status as auditStatus,
-			c.name as productName,
-			case when b.audit_status is null then '未开通' when b.audit_status=='0' then '不通过' when when b.audit_status=='1' then "通过" end as auditStatusMessage
+			c.name as name,
+			b.reject_reason as rejectReason
 		from diag_product_order a join diag_order_details b on a.num=b.order_num
 		join diag_lantone_product c on b.product_id=c.id
 		where a.is_deleted = 'N' and  b.is_deleted = 'N' and  c.is_deleted = 'N'

diagbotman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -55,7 +55,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "diag_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "diag_product_order","diag_order_details","diag_opened_products" ,"diag_lantone_product"}); // 需要生成的表
+        strategy.setInclude(new String[] { "diag_product_order"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

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

@@ -32,10 +32,14 @@ public interface UserMapper extends BaseMapper<User> {
     
     public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);
     
-    public Integer updateDeleted(@Param("map") Map<String ,String> map);
+    public Integer updateDeleted(@Param("map") Map<String,Object> map);
 
     public List<User> getByIds(List<Long> ids);
 
     public List<UserOrgDTO> getUserOrgDTOByIds(List<Long> ids);
+    
+    public boolean auditUserInfoAll(@Param("auditMap") Map<String,Object> auditMap);
+    
+    public Integer updateById(Map<String,String> map);
 
 }

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

@@ -1,5 +1,9 @@
 package com.diagbot.mapper;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.entity.UserOrganization;
 
@@ -9,5 +13,12 @@ import com.diagbot.entity.UserOrganization;
  * @Date: 2018/9/13 17:19
  */
 public interface UserOrganizationMapper extends BaseMapper<UserOrganization> {
+	
+	/**
+	 * 
+	 * @param organizationId 根据机构id查绑定的用户
+	 * @return
+	 */
+	 public List<UserOrganization> getAgencyPersonnel(@Param("userORG") UserOrganization userORG);
 
 }

user-service/src/main/java/com/diagbot/service/UserOrganizationService.java

@@ -19,4 +19,6 @@ public interface UserOrganizationService extends IService<UserOrganization> {
      * @Date: 2018/9/17 15:16
      */
     public List<UserOrganization> selectByMap(Map map);
+    
+    public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG);
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -29,11 +29,13 @@ public interface UserService extends IService<User> {
     
     public Integer updateUserInfoAll(UserInfoOrganizationsVO userInfo);
 
-	Integer updateDeleted(Map<String, String> map);
+	Integer updateDeleted(Map<String,Object> map);
 
     IPage<User> indexPage(Page<User> page, User user);
 
     public List<User> getByIds(List<Long> ids);
 
     public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds);
+
+    public boolean auditUserInfoAll(Map<String,Object> auditMap);
 }

user-service/src/main/java/com/diagbot/service/impl/UserOrganizationServiceImpl.java

@@ -25,4 +25,9 @@ public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMap
     public List<UserOrganization> selectByMap(Map map) {
         return userOrganizationMapper.selectByMap(map);
     }
+    @Override
+    public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG){
+    	return userOrganizationMapper.getAgencyPersonnel(userORG);
+    	
+    }
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -49,7 +49,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		
 	}
 	@Override
-	public Integer updateDeleted(Map<String,String> map){
+	public Integer updateDeleted(Map<String,Object> map){
 		return baseMapper.updateDeleted(map);
 		
 	}
@@ -68,6 +68,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds) {
         return userMapper.getUserOrgDTOByIds(userIds);
     }
-
+    @Override
+    public boolean auditUserInfoAll(Map<String,Object> auditMap) {
+	    // TODO Auto-generated method stub
+	    return baseMapper.auditUserInfoAll(auditMap);
+    }
 
 }

user-service/src/main/java/com/diagbot/vo/UserInfoAuditVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+/**
+ * 
+ * @Description: 用户认证
+ * @author wangfeng
+ * @date 2018年9月20日 下午1:41:56
+ */
+
+@Getter
+@Setter
+public class UserInfoAuditVO {
+	
+	 private String isReject;//是否通过认证 N:未通过，Y:已通过
+	  private Integer rejectType;//未通过类型
+	  private String rejectComment;//认证被拒理由
+	  private String status;//认证状态（0：未认证，1：已认证，2：认证中）
+	  private Long userId;//用户id
+
+}

user-service/src/main/java/com/diagbot/vo/UserInfoOrganizationsVO.java

@@ -23,20 +23,5 @@ public class UserInfoOrganizationsVO implements Serializable {
 	  private String address;//单位地址
 	  private Integer type;//机构属性
 	  private String position;//岗位部门
-	  private String isReject;//是否通过认证 N:未通过，Y:已通过
-	  private Integer rejectType;//未通过类型
-	  private String rejectComment;//认证被拒理由
-	  private String status;//认证状态（0：未认证，1：已认证，2：认证中）
 	  private Long userId;//用户id
-	
-	@Override
-	public String toString() {
-		return "UserInfoOrganizations [gmtModified=" + gmtModified + ", modifier="
-				+ modifier + ", email=" + email + ", principal=" + principal + ", address=" + address + ", type=" + type
-				+ ", position=" + position + ", isReject=" + isReject + ", rejectType=" + rejectType
-				+ ", rejectComment=" + rejectComment + ", status=" + status + ", userId=" + userId + "]";
-	}
-	  
-	  
-
 }

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

@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,11 +22,17 @@ import com.diagbot.dto.ResultModelDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserAuthentication;
+import com.diagbot.entity.UserOrganization;
 import com.diagbot.facade.OrganizationFacade;
+import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
+import com.diagbot.facade.UserOrganizationFacade;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.GsonUtil;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
+import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
 
 import io.swagger.annotations.Api;
@@ -44,6 +52,10 @@ public class UserInfoController {
     private UserFacade userFacade;
 	@Autowired
 	OrganizationFacade organizationFacade;
+	@Autowired
+	UserOrganizationFacade userOrganizationFacade;
+	@Autowired
+	UserAuthenticationFacade userAuthenticationFacade;
 	
 	private final String MSG_SUCCESS = "操作成功!";
     private final String MSG_ERROR = "操作失败!";
@@ -69,15 +81,36 @@ public class UserInfoController {
 	        return RespDTO.onSuc("修改成功"+res);
 	    }
 	    
+	    @ApiOperation(value = "审核用户信息和机构信息", notes = "审核用户信息和机构信息")
+	    @PostMapping("/auditUserInfoAll")
+	    @SysLogger("auditUserInfoAll")
+	    public RespDTO<UserInfoAuditVO> auditUserInfoAll( UserInfoAuditVO userInfoAuditVO){
+	    	Map<String,Object> auditMap = new HashMap<String, Object>();
+	    	auditMap.put("userId", userInfoAuditVO.getUserId());
+	    	//TODO auditMap.put("modifier",UserUtils.getCurrentPrincipleID());
+	    	auditMap.put("modifier","5");
+	    	auditMap.put("gmtModified",DateUtil.now());
+	    	auditMap.put("isReject",userInfoAuditVO.getIsReject());
+	    	auditMap.put("rejectComment",userInfoAuditVO.getRejectComment());
+	    	auditMap.put("rejectType",userInfoAuditVO.getRejectType());
+	    	//TODO 审核前先验证该用户的的认证状态
+	          boolean res = userFacade.auditUserInfoAll(auditMap);
+	         
+	          if(res ==true){
+		    		return RespDTO.onSuc("审核通过！");
+		    	}
+		    	return RespDTO.onSuc("审核失败！");
+	    }
+	    
 	    @ApiOperation(value = "删除用户信息和机构信息", notes = "用户信息和机构信息")
 	    @PostMapping("/updateDeleted")
 	    @SysLogger("updateDeleted")
 	    public RespDTO updateDeleted(@RequestParam String  userId){
-	    	Map<String,String> map = new HashMap<String, String>();
+	    	Map<String,Object> map = new HashMap<String, Object>();
 	    	map.put("userId", userId);
 	    	//TODO map.put("modifier",UserUtils.getCurrentPrincipleID());
 	    	map.put("modifier","5");
-	    	map.put("gmtModified",DateUtil.DATE_TIME_FORMAT);
+	    	map.put("gmtModified",DateUtil.now());
 	    	 int res= userFacade.updateDeleted(map);
 	    	 return RespDTO.onSuc("刪除成功"+res);
 	    }
@@ -97,12 +130,10 @@ public class UserInfoController {
 	    @SysLogger("addOrganization")
 	    public RespDTO<OrganizationVO> addOrganization(OrganizationVO  organizationVO){
 	    	//TODO
-	    	ResultModelDTO resultMode = new ResultModelDTO();
 	    	String organizationName = organizationVO.getOrganizationName();
 	    	List<Organization> organizationList = organizationFacade.findOrganization(organizationName);
 	    	if(organizationList.size()>0){
-	    		resultMode.setMessage("该机构存在");
-	    		return RespDTO.onSuc(resultMode);
+	    		return RespDTO.onSuc("该机构存在");
 	    	}
 	    	Organization organization = new Organization();
 	    	organization.setName(organizationVO.getOrganizationName());
@@ -114,10 +145,13 @@ public class UserInfoController {
 	    	//TODO organization.setModifier(UserUtils.getCurrentPrincipleID());
 	    	organization.setCreator("5");
 	    	
-	    	boolean op = organizationFacade.save(organization);
+	    	boolean res = organizationFacade.save(organization);
 	    	
-	    	resultMode.setMessage(op+"");
-	    	 return RespDTO.onSuc(resultMode);
+	    	//System.out.println(GsonUtil.toJson(organization));
+	    	if(res ==true){
+	    		return RespDTO.onSuc("增加机构信息成功！");
+	    	}
+	    	return RespDTO.onSuc("增加机构信息失败！");
 	    }
 	    
 	    @ApiOperation(value = "添加用户信息和机构信息管理员", notes = "用户信息和机构信息的绑定")
@@ -126,20 +160,73 @@ public class UserInfoController {
 	    public RespDTO<UserAndOrganizationVO> addUserInfo(UserAndOrganizationVO  userAndOrganizationVO){
 	    	//TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
 	    	//User user = new User();
-	    	ResultModelDTO resultMode = new ResultModelDTO();
-	    	String username = userAndOrganizationVO.getUserName();
-	    	 User user=  userFacade.getUserInfo(username);
-	    	 System.out.println(user);
-	    	 if(user!=null){
-	    		 resultMode.setMessage("该用户存在");
-		         return RespDTO.onSuc(resultMode); 
+	    	//验证用户是否存在
+	    	 String username = userAndOrganizationVO.getUserName();
+	    	 User userData=  userFacade.getUserInfo(username);
+	    	 //System.out.println(user);
+	    	 if(userData!=null){
+		         return RespDTO.onSuc("该用户存在"); 
 	    	 }
+	    	 //验证机构是否被绑定
+	    	 UserOrganization userORG =new  UserOrganization();
+	    	 userORG.setOrganizationId(userAndOrganizationVO.getOrganizationid());
 	    	 
+	    	 List<UserOrganization> userOrganizationData = userOrganizationFacade.getAgencyPersonnel(userORG);
+	    	 if(userOrganizationData.size()>0){
+	    		 return RespDTO.onSuc("该机构绑定了用户！");
+	    	 }
 	    	 
-	    	 
-	    	 resultMode.setMessage("用户不存在"); 
-	    	 return RespDTO.onSuc(resultMode);
+	    	 User user =new User();
+	    	 user.setCreator("5");
+	    	 user.setUsername(userAndOrganizationVO.getUserName());
+	    	 PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+	         String entryPassword= passwordEncoder.encode(userAndOrganizationVO.getPassWord());
+	         user.setPassword(entryPassword);
+	         user.setLinkman(userAndOrganizationVO.getLinkman());
+	         user.setGmtCreate(DateUtil.now());
+	         user.setEmail(userAndOrganizationVO.getEmail());
+	         boolean res = userFacade.save(user);
+	    	 if(res==true){
+	    		 Long userId =user.getId();
+	    		 //用户信息的认证
+	    		 UserAuthentication userAuthentication = new UserAuthentication();
+	    		 userAuthentication.setCreator("5");//创建人Id
+	    		 userAuthentication.setGmtCreate(DateUtil.now());//记录创建时间
+	    		 userAuthentication.setPosition(userAndOrganizationVO.getPosition());//岗位信息
+	    		 userAuthentication.setUserId(userId);//用户id
+	    		 userAuthentication.setIsReject("Y");//是否通过认证 N:未通过，Y:已通过
+	    		 userAuthentication.setStatus(1);//认证状态（0：未认证，1：已认证，2：认证中）
+	    		 userAuthenticationFacade.save(userAuthentication);
+	    		 
+	    		 //用户信息和机构信息的绑定
+	    		 UserOrganization userOrganization = new UserOrganization();
+	    		 userOrganization.setCreator("5");//创建人Id
+	    		 userOrganization.setGmtCreate(DateUtil.now());
+	    		 userOrganization.setOrganizationId(userAndOrganizationVO.getOrganizationid());//机构id
+	    		 userOrganization.setUserId(userId);//用户id
+	    		 
+	    		 userOrganizationFacade.save(userOrganization);
+	    	 }
+	         
+	    	 return RespDTO.onSuc("绑定成功");
 	    } 
+	    //TODO
+/*	    @ApiOperation(value = "根据用户id查询已开通的功能", notes = "已开通信息")
+	    @PostMapping("/addOrganization")
+	    @SysLogger("addOrganization")*/
+	    
+	  //TODO
+	   /* 
+	    @ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
+	    @PostMapping("/addOrganization")
+	    @SysLogger("addOrganization")*/
+	    
+	  //TODO
+	   /* @ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
+	    @PostMapping("/addOrganization")
+	    @SysLogger("addOrganization")*/
 	    
 	    
+
 }
+

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

@@ -135,65 +135,66 @@
 	     ORDER BY  u.gmt_create DESC
 	</select>
 	
-	<update id="updateUserInfoAll" parameterType="com.diagbot.vo.UserInfoOrganizationsVO" >
-		UPDATE sys_user u ,sys_user_organization a ,
-		sys_organization b ,sys_user_authentication c
-		SET  u.remark = "0"
-		<if test="email != null">
-			<if test="gmtModified !=null">
-			  ,u.gmt_modified=#{gmtModified}
-		   </if>
-		   <if test="modifier != modifier">
-			  ,u.modifier=#{modifier}
-		   </if>
-		  ,u.email=#{email}
+<update id="updateUserInfoAll" parameterType="com.diagbot.vo.UserInfoOrganizationsVO" >
+	UPDATE sys_user u ,sys_user_organization a ,
+	sys_organization b ,sys_user_authentication c
+	SET  u.remark = "0" 
+	<if test="email != null">
+	    <if test="gmtModified !=null"> 
+	      ,u.gmt_modified=#{gmtModified}
+	   </if>
+	   <if test="modifier != modifier">
+	      ,u.modifier=#{modifier}
+	   </if>
+	  ,u.email=#{email}
+	</if>
+	<if test="principal != null || address != null || type != null">
+	     <if test="gmtModified !=null"> 
+	       ,b.gmt_modified=#{gmtModified}
+	     </if>
+	     <if test="modifier != null">
+	      ,b.modifier=#{modifier}
+	     </if>
+		<if test="principal != null">
+		  ,b.principal=#{principal}
 		</if>
-		<if test="principal != null || address != null || type != null">
-			 <if test="gmtModified !=null">
-			   ,b.gmt_modified=#{gmtModified}
-			 </if>
-			 <if test="modifier != null">
-			  ,b.modifier=#{modifier}
-			 </if>
-			<if test="principal != null">
-			  ,b.principal=#{principal}
-			</if>
-			<if test="address != null">
-			  ,b.address=#{address}
-			</if>
-			<if test="type != null">
-			  ,b.type=#{type}
-			</if>
+		<if test="address != null">
+		  ,b.address=#{address}
 		</if>
-
-		<if test="position != null || isReject != null || rejectType !=null || rejectComment !=null || status != null">
-			<if test="gmtModified !=null">
-			  ,c.gmt_modified=#{gmtModified}
-			</if>
-			<if test="modifier != null">
-			  ,c.modifier=#{modifier}
-			</if>
-			<if test="position != null">
-			  ,c.position=#{position}
-			</if>
-			<if test="isReject != null">
-			 ,c.is_reject=#{isReject}
-			</if>
-			<if test="rejectType !=null">
-			  ,c.reject_type=#{rejectType}
-			</if>
-			<if test="rejectComment !=null">
-			  ,c.reject_comment=#{rejectComment}
-			</if>
-			<if test="status != null">
-			  ,c.status = #{status}
-			</if>
+		<if test="type != null">
+		  ,b.type=#{type}
 		</if>
-		WHERE u.id = #{userId}
-		AND c.user_id= #{userId}
-		AND a.user_id = #{userId}
-		AND a.organization_id =b.id
-	</update>
+	</if>
+	
+	<!-- <if test="position != null || isReject != null || rejectType !=null || rejectComment !=null || status != null"> -->
+	   <if test="position != null">
+	    <if test="gmtModified !=null">
+		  ,c.gmt_modified=#{gmtModified}
+		</if>
+		<if test="modifier != null">
+		  ,c.modifier=#{modifier}
+		</if>
+		  ,c.position=#{position}
+		</if>
+		<!-- <if test="isReject != null">
+		 ,c.is_reject=#{isReject}
+		</if>
+		<if test="rejectType !=null">
+		  ,c.reject_type=#{rejectType}
+		</if>
+		<if test="rejectComment !=null">
+		  ,c.reject_comment=#{rejectComment}
+		</if>
+		<if test="status != null">
+		  ,c.status = #{status}
+		</if> -->
+	<!-- </if> -->
+	WHERE u.id = #{userId} 
+	AND c.user_id= #{userId} 
+	AND a.user_id = #{userId} 
+	AND a.organization_id =b.id
+</update>
+	
 
 	 <update id="updateDeleted" parameterType="java.util.Map">
 		UPDATE sys_user u ,sys_user_organization a ,
@@ -214,6 +215,40 @@
 		AND a.user_id = #{map.userId}
 		AND a.organization_id =b.id
 	</update>
-
+<update id="auditUserInfoAll" parameterType="java.util.Map">
+	UPDATE sys_user_authentication
+	<trim prefix="set" suffixOverrides=",">
+		<if test="auditMap.gmtModified !=null">gmt_modified=#{auditMap.gmtModified},</if>
+		<if test="auditMap.modifier != null">modifier=#{auditMap.modifier},</if>
+		<if test="auditMap.isReject != null">is_reject = #{auditMap.isReject} ,</if>
+		<if test="auditMap.rejectType != null">reject_type =#{auditMap.rejectType},</if>
+		<if test="auditMap.rejectComment != null">reject_comment= #{auditMap.rejectComment},</if>
+		<if test="auditMap.status != null">STATUS= #{auditMap.status}</if>
+	</trim>
+	WHERE
+	user_id = #{auditMap.userId}
+	AND is_deleted = "N"
+
+</update>
+
+ <update id="updateDeleted" parameterType="java.util.Map">
+	UPDATE sys_user u ,sys_user_organization a ,
+	 sys_organization b,sys_user_authentication c
+	SET u.is_deleted = "Y",a.is_deleted= "Y",b.is_deleted= "Y",c.is_deleted="Y"
+	<if test="map.gmtModified !=null">
+	,u.gmt_modified=#{map.gmtModified}
+	,b.gmt_modified=#{map.gmtModified}
+	,c.gmt_modified=#{map.gmtModified}
+	</if>
+	<if test="map.modifier != null">
+	,u.modifier=#{map.modifier}
+	,b.modifier=#{map.modifier}
+	,c.modifier=#{map.modifier}
+	</if>
+	WHERE u.id = #{map.userId} 
+	AND c.user_id= #{map.userId} 
+	AND a.user_id = #{map.userId} 
+	AND a.organization_id =b.id
+</update>
 
 </mapper>

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

@@ -14,4 +14,13 @@
         <result column="organization_id" property="organizationId" />
     </resultMap>
 
+	<select id="getAgencyPersonnel"  resultType="com.diagbot.entity.UserOrganization">
+		SELECT * FROM 
+		sys_user_organization 
+		WHERE 
+		is_deleted = "N" AND
+		organization_id = #{userORG.organizationId} 
+		AND user_id !=0
+	</select>
+
 </mapper>