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

# Conflicts:
#	diagbotman-service/src/main/java/com/diagbot/mapper/OpenedProductsMapper.java
#	diagbotman-service/src/main/java/com/diagbot/service/impl/OpenedProductsServiceImpl.java
#	diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java
#	diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

diagbotman-service/src/main/java/com/diagbot/dto/UserAndProdutDTO.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月21日 上午10:32:52
+ */
+
+@Getter
+@Setter
+public class UserAndProdutDTO {
+	
+	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;//产品名称
+
+}

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

@@ -23,7 +23,7 @@ public class UserOrgDTO implements Serializable{
 	    private String email;// 邮箱
 	    private Long orgId;//机构ID
 	    private String orgName;//机构名称
-		private String isReject; //是否通过认证
+		private Integer isReject; //是否通过认证
 		private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
@@ -73,6 +74,16 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      */
     int getConsoleOnTrialCount(Long userId);
 
+    //根据用户id查询已开通的功能
+    public List<UserAndProdutDTO> getInformationAvailableByUserId(Long userId);
+    //根据用户id和产品id，启用和停用功能
+    public boolean startAndendByuserId(OpenedProducts openedProducts);
+	  //根据用户id和产品id，删除开通信息", notes = "删除开通信息")
+    public boolean delInformationAvailable(OpenedProducts openedProducts);
+     //根据用户id和产品id，修改开通时间", notes = "修改开通时间")
+    public boolean modifyOpeningTime(OpenedProducts openedProducts);
+
+
     /**
      * @Description: 根据产品id查询所有开通用户信息
      * @Author: wangyu

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

@@ -3,6 +3,7 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
@@ -40,6 +41,15 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @Date: 2018/9/20 15:23
      */
     List<OpenedProducts> getByAppkeyAndSecret(Map<String,Object> map);
+    
+    //根据用户id查询已开通的功能
+    public List<UserAndProdutDTO> getInformationAvailableByUserId(Long userId);
+    //根据用户id和产品id，启用和停用功能
+    public boolean startAndendByuserId(OpenedProducts openedProducts);
+	  //根据用户id和产品id，删除开通信息", notes = "删除开通信息")
+    public boolean delInformationAvailable(OpenedProducts openedProducts);
+     //根据用户id和产品id，修改开通时间", notes = "修改开通时间")
+    public boolean modifyOpeningTime(OpenedProducts openedProducts);
 
     /**
      * @Description: 根据产品id查询所有开通用户信息

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

@@ -3,6 +3,7 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
@@ -47,6 +48,30 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
         return openedProductsMapper.getByAppkeyAndSecret(map);
     }
 
+	@Override
+	public List<UserAndProdutDTO> getInformationAvailableByUserId(Long userId) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.getInformationAvailableByUserId(userId);
+	}
+
+	@Override
+	public boolean startAndendByuserId(OpenedProducts openedProducts) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.startAndendByuserId(openedProducts);
+	}
+
+	@Override
+	public boolean delInformationAvailable(OpenedProducts openedProducts) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.delInformationAvailable(openedProducts);
+	}
+
+	@Override
+	public boolean modifyOpeningTime(OpenedProducts openedProducts) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.modifyOpeningTime(openedProducts);
+	}
+
     @Override
     public List<OpendProductWrapper> getByProductId(OpenedProductsIndex openedProductsIndex) {
         return baseMapper.getByProductId(openedProductsIndex);

diagbotman-service/src/main/java/com/diagbot/vo/ModifyOpeningTimeVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 据用户id和产品id，修改启用时间入参
+ * @author wangfeng
+ * @date 2018年9月21日 上午10:57:03
+ */
+@Getter
+@Setter
+public class ModifyOpeningTimeVO {
+	
+	private Date startTime;
+	private Date endTime;
+	private Long userId;
+	private Long productId;
+
+}

diagbotman-service/src/main/java/com/diagbot/vo/StartAndendByUserIdVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 据用户id和产品id，启用和停用功能入参
+ * @author wangfeng
+ * @date 2018年9月21日 上午10:57:03
+ */
+@Getter
+@Setter
+public class StartAndendByUserIdVO {
+	
+	private Integer serviceStatus;
+	private Long userId;
+	private Long productId;
+
+}

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

@@ -10,6 +10,7 @@ import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.vo.OppendedProductVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,6 +27,7 @@ import java.util.List;
  * @Date: 15:46 2018/9/17
  */
 @RestController
+@Api(value="朗通产品API", tags={"朗通产品API"})
 @RequestMapping("/diagLantoneProduct")
 public class DiagLantoneProductController {
     @Autowired

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

@@ -7,6 +7,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.facade.OrderDetailsFacade;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/diagOrderDetails")
+@Api(value="订单明细API", tags={"订单明细API"})
 public class DiagOrderDetailsController {
     @Autowired
     private OrderDetailsFacade orderDetailsFacade;

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

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @time: 2018/9/17 18:28
  */
 @RestController
-@Api(value="diagbot更多服务 前端控制器", tags={"diagbot更多服务 前端控制器"})
+@Api(value="diagbot更多服务API", tags={"diagbot更多服务API"})
 @RequestMapping("/morServices")
 public class MoreServiceController {
     @Autowired

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

@@ -14,9 +14,14 @@ import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutDTO;
+import com.diagbot.entity.OpenedProducts;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
+import com.diagbot.vo.StartAndendByUserIdVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +31,7 @@ import io.swagger.annotations.ApiOperation;
  * @author rgb
  *
  */
-@Api(value="控制台-产品操作", tags={"控制台-产品操作"})
+@Api(value="控制台-产品操作API", tags={"控制台-产品操作API"})
 @RestController
 @RequestMapping("/productOrder")
 public class ProductOrderController {
@@ -71,5 +76,58 @@ public class ProductOrderController {
 		return RespDTO.onSuc(openedProductsFacade.enShowOption());
 	}
 	
+	   
+    @ApiOperation(value = "根据用户id查询已开通的功能", notes = "已开通信息")
+    @PostMapping("/getInformationAvailableByUserId")
+    @SysLogger("getInformationAvailableByUserId")
+    public RespDTO  getInformationAvailableByUserId(Long userId){
+    	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(userId);
+    	return RespDTO.onSuc(UserAndProdutData);
+    }
+
+	@ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
+	@PostMapping("/startAndendByuserId")
+	@SysLogger("startAndendByuserId")
+	public RespDTO<StartAndendByUserIdVO> startAndendByuserId(StartAndendByUserIdVO startAndendByUserIdVO) {
+		OpenedProducts openedProducts = new OpenedProducts();
+		openedProducts.setUserId(startAndendByUserIdVO.getUserId());
+		openedProducts.setProductId(startAndendByUserIdVO.getProductId());
+		openedProducts.setCreator("");
+		openedProducts.setGmtCreate(DateUtil.now());
+		openedProducts.setServiceStatus(startAndendByUserIdVO.getServiceStatus());
+		openedProductsFacade.startAndendByuserId(openedProducts);
+		return RespDTO.onSuc("");
+	}
+
+	// TODO
+	@ApiOperation(value = "根据用户id和产品id，删除开通信息", notes = "删除开通信息")
+	@PostMapping("/delInformationAvailable")
+	@SysLogger("delInformationAvailable")
+	public RespDTO delInformationAvailable(Long userId, Long productId) {
+		OpenedProducts openedProducts = new OpenedProducts();
+		openedProducts.setUserId(userId);
+		openedProducts.setProductId(productId);
+		openedProducts.setCreator("");
+		openedProducts.setGmtCreate(DateUtil.now());
+		openedProductsFacade.delInformationAvailable(openedProducts);
+		return RespDTO.onSuc("");
+	}
+
+	// TODO
+	@ApiOperation(value = "根据用户id和产品id，修改开通时间", notes = "修改开通时间")
+	@PostMapping("/modifyOpeningTime")
+	@SysLogger("modifyOpeningTime")
+	public RespDTO<ModifyOpeningTimeVO> modifyOpeningTime(ModifyOpeningTimeVO modifyOpeningTimeVO) {
+		OpenedProducts openedProducts = new OpenedProducts();
+		openedProducts.setUserId(modifyOpeningTimeVO.getUserId());
+		openedProducts.setProductId(modifyOpeningTimeVO.getProductId());
+		openedProducts.setStartTime(modifyOpeningTimeVO.getStartTime());
+		openedProducts.setEndTime(modifyOpeningTimeVO.getEndTime());
+		openedProducts.setCreator("");
+		openedProducts.setGmtCreate(DateUtil.now());
+		openedProductsFacade.modifyOpeningTime(openedProducts);
+		return RespDTO.onSuc("");
+	}
+
 
 }

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

@@ -17,6 +17,7 @@ import java.util.List;
  * @Date: 2018/9/18 14:40
  */
 @RestController
+@ApiIgnore
 @RequestMapping("/service_filter")
 public class ServiceFilterController {
 

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

@@ -110,6 +110,61 @@
 		and c.user_id=#{userId}
 		and a.id not in (SELECT product_id FROM diag_opened_products where user_id=#{userId})
     </select>
+<select id="getInformationAvailableByUserId" parameterType = "long" resultType = "com.diagbot.dto.UserAndProdutDTO">
+
+	SELECT
+	a.id as Id,
+	a.product_id as productId,
+	a.user_id as userId,
+	a.start_time as startTime,
+	a.end_time as endTime,
+	a.service_status as serviceStatus,
+	a.access_type as accessType,
+	a.charge_type as chargeType,
+	b.name as  productName
+	FROM diag_opened_products a JOIN diag_lantone_product b
+	ON a.product_id=b.id
+	WHERE
+	a.is_deleted = "N"
+	AND  a.user_id = #{userId}
+</select>
+
+<update id="startAndendByuserId" parameterType = "com.diagbot.entity.OpenedProducts">
+	UPDATE diag_opened_products a
+	<trim prefix="set" suffixOverrides=",">
+	<if test="gmtModified !=null">a.gmt_modified=#{gmtModified},</if>
+	<if test="modifier != null">a.modifier=#{modifier},</if>
+	<if test="serviceStatus != null">a.service_status =#{serviceStatus}</if>
+	</trim>
+	WHERE
+	a.user_id = #{userId}
+	AND a.product_id = #{productId}
+</update>
+
+<update id="delInformationAvailable" parameterType = "com.diagbot.entity.OpenedProducts" >
+	UPDATE diag_opened_products a
+	<trim prefix="set" suffixOverrides=",">
+	a.is_deleted = "Y",
+	<if test="gmtModified !=null">a.gmt_modified=#{gmtModified},</if>
+	<if test="modifier != null">a.modifier=#{modifier}</if>
+	</trim>
+	WHERE
+	a.user_id = #{userId}
+	AND a.product_id = #{productId}
+</update>
+
+<update id="modifyOpeningTime" parameterType="com.diagbot.entity.OpenedProducts">
+	UPDATE diag_opened_products a
+	<trim prefix="set" suffixOverrides=",">
+	<if test="gmtModified !=null">a.gmt_modified=#{gmtModified},</if>
+	<if test="modifier != null">a.modifier=#{modifier}</if>
+	<if test="startTime != null">a.start_time = #{startTime},</if>
+	<if test="endTime != null">a.end_time = #{endTime} </if>
+	</trim>
+	WHERE
+	a.user_id = #{userId}
+	AND a.product_id = #{productId}
+</update>
 
     <select id="getByProductId" parameterType="com.diagbot.entity.OpenedProductsIndex" resultMap="BaseResultWrapper">
         SELECT a.*,b.time  order_time from diag_opened_products a

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

@@ -14,7 +14,7 @@ public class QueryAuthProgressDTO {
    
 	private Integer status;
 	
-	private String isReject;
+	private Integer isReject;
 	
 	private String rejectComment;
 	

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

@@ -23,7 +23,7 @@ public class UserOrgDTO implements Serializable{
 	    private String email;// 邮箱
 	    private Long orgId;//机构ID
 	    private String orgName;//机构名称
-		private String isReject; //是否通过认证
+		private Integer isReject; //是否通过认证
 		private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 
 }

user-service/src/main/java/com/diagbot/entity/UserAuthentication.java

@@ -59,9 +59,9 @@ public class UserAuthentication implements Serializable {
     private String position;
 
     /**
-     * 是否通过认证 N:未通过，Y:已通过
+     * 是否通过认证 0:未通过，1:已通过
      */
-    private String isReject;
+    private Integer isReject;
 
     /**
      * 未通过类型
@@ -148,11 +148,11 @@ public class UserAuthentication implements Serializable {
         this.position = position;
     }
 
-    public String getIsReject() {
+    public Integer getIsReject() {
         return isReject;
     }
 
-    public void setIsReject(String isReject) {
+    public void setIsReject(Integer isReject) {
         this.isReject = isReject;
     }
 

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

@@ -79,17 +79,17 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
             userAuthentication.setCreator(userId.toString());
             userAuthentication.setGmtCreate(new Date());
             userAuthentication.setUserId(userId);
-        } else if (userAuthentication.getStatus() == 1) {
+        } else if (userAuthentication.getStatus().equals(AuthStatusEnum.Authorized.getKey())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "用户【" + user.getUsername() + "】已认证，不允许重复认证");
-        } else if (userAuthentication.getStatus() == 2) {
+        } else if (userAuthentication.getStatus().equals(AuthStatusEnum.Authorizing.getKey())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "认证申请已提交，无需重复提交");
         }
         userAuthentication.setModifier(userId.toString());
         userAuthentication.setGmtModified(new Date());
         userAuthentication.setPosition(userAuthenticationVO.getPosition());
-        userAuthentication.setStatus(2);  //状态设为认证中
+        userAuthentication.setStatus(AuthStatusEnum.Authorizing.getKey());  //状态设为认证中
         this.saveOrUpdate(userAuthentication);
 
         userAuthenticationDTO.setUser(user);
@@ -133,20 +133,20 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
             map.put(99, "当前用户没有认证信息");
         } else {
             Integer status = userAuthentication.getStatus();
-            String statusName = "";
-            switch (status) {
-                case 0:
-                    statusName = AuthStatusEnum.Unauthorized.getName();
-                    break;
-                case 1:
-                    statusName = AuthStatusEnum.Authorized.getName();
-                    break;
-                case 2:
-                    statusName = AuthStatusEnum.Authorizing.getName();
-                    break;
-                default:
-                    break;
-            }
+            String statusName = AuthStatusEnum.getName(status);
+//            switch (status) {
+//                case 0:
+//                    statusName = AuthStatusEnum.Unauthorized.getName();
+//                    break;
+//                case 1:
+//                    statusName = AuthStatusEnum.Authorized.getName();
+//                    break;
+//                case 2:
+//                    statusName = AuthStatusEnum.Authorizing.getName();
+//                    break;
+//                default:
+//                    break;
+//            }
             map.put(status, statusName);
         }
         return map;

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

@@ -19,7 +19,7 @@ import lombok.Setter;
 @Setter
 public class UserInfoAuditVO {
 	  @Pattern(regexp = "[YN]",message = "参数类型 错误")
-	  private String isReject;//是否通过认证 N:未通过，Y:已通过
+	  private Integer isReject;//是否通过认证 N:未通过，Y:已通过
 	  private Integer rejectType;//未通过类型
 	  private String rejectComment;//认证被拒理由
 	  private String status;//认证状态（0：未认证，1：已认证，2：认证中）

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

@@ -10,6 +10,7 @@ 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;
@@ -39,6 +40,7 @@ public class UserAuthenticationController {
                     "organization：组织机构，必填<br>")
     @PostMapping("/userAuthentication")
     @SysLogger("userAuthentication")
+    @Transactional
     public RespDTO<UserAuthenticationDTO> userAuthentication(@RequestBody @Valid UserAuthenticationVO userAuthenticationVO) {
         UserAuthenticationDTO userAuthenticationDTO = userAuthenticationFacade.userAuthentication(userAuthenticationVO);
         return RespDTO.onSuc(userAuthenticationDTO);

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

@@ -1,7 +1,5 @@
 package com.diagbot.web;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.ResultModelDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
@@ -32,7 +29,6 @@ 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;
@@ -47,202 +43,171 @@ import io.swagger.annotations.ApiOperation;
  * @time: 2018年9月17日 下午1:53:53
  */
 @RestController
-@Api(value="用户信息和机构信息API", tags={"用户信息和机构信息API"})
+@Api(value = "用户信息和机构信息API", tags = { "用户信息和机构信息API" })
 @RequestMapping("/userInfo")
 public class UserInfoController {
-	
+
 	@Autowired
-    private UserFacade userFacade;
+	private UserFacade userFacade;
 	@Autowired
 	OrganizationFacade organizationFacade;
 	@Autowired
 	UserOrganizationFacade userOrganizationFacade;
 	@Autowired
 	UserAuthenticationFacade userAuthenticationFacade;
-	
-	private final String MSG_SUCCESS = "操作成功!";
-    private final String MSG_ERROR = "操作失败!";
-	
-	    @ApiOperation(value = "分页查询获取用户信息", notes = "根据每页显示条数，默认 10，和当前页")
-	    @PostMapping("/getUserInfoPag")
-	    @SysLogger("getUserInfoPag")
-//	    @ApiIgnore
-	    public RespDTO<UserInfoDTO> getUserInfoPag(Page page, String orgName, String autStatus ){
-	    	UserInfoDTO userInfo =new UserInfoDTO();
-	    	userInfo.setOrgName(orgName);
-	    	userInfo.setAutStatus(autStatus);
-	        IPage<UserInfoDTO> user=  userFacade.selectUserInfoListPage(page,userInfo);
-	        return RespDTO.onSuc(user);
-	    }
-	    
-	    @ApiOperation(value = "修改用户信息和机构信息以", notes = "用户信息和机构信息")
-	    @PostMapping("/updateUserInfoAll")
-	    @SysLogger("updateUserInfoAll")
-	    public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(@Valid  @RequestBody UserInfoOrganizationsVO userInfo){
-	         int res = userFacade.updateUserInfoAll(userInfo);
-	         
-	         if(res!=0){
-		    		return RespDTO.onSuc("修改用户信息成功！");
-		    	}
-		    	return RespDTO.onSuc("修改用户信息失败！");
-	    }
-	    
-	    @ApiOperation(value = "审核用户信息和机构信息", notes = "审核用户信息和机构信息")
-	    @PostMapping("/auditUserInfoAll")
-	    @SysLogger("auditUserInfoAll")
-	    public RespDTO<UserInfoAuditVO> auditUserInfoAll(@Valid @RequestBody 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,Object> map = new HashMap<String, Object>();
-	    	map.put("userId", userId);
-	    	//TODO map.put("modifier",UserUtils.getCurrentPrincipleID());
-	    	map.put("modifier","5");
-	    	map.put("gmtModified",DateUtil.now());
-	    	 int res= userFacade.updateDeleted(map);
-	    	 return RespDTO.onSuc("刪除成功"+res);
-	    }
-	    
-	    @ApiOperation(value = "模糊查询机构信息", notes = "机构信息")
-	    @PostMapping("/findOrganization")
-	    @SysLogger("findOrganization")
-	    public RespDTO findOrganization(@RequestParam String  organizationName){
-	    	//TODO 返回机构Id和机构
-	    	List<Organization> organization = organizationFacade.findOrganization(organizationName);
-	    	
-	    	 return RespDTO.onSuc(organization);
-	    }
-	    
-	    @ApiOperation(value = "添加构信息", notes = "机构信息")
-	    @PostMapping("/addOrganization")
-	    @SysLogger("addOrganization")
-	    public RespDTO<OrganizationVO> addOrganization(@Valid @RequestBody OrganizationVO  organizationVO){
-	    	//TODO
-	    	String organizationName = organizationVO.getOrganizationName();
-	    	List<Organization> organizationList = organizationFacade.findOrganization(organizationName);
-	    	if(organizationList.size()>0){
-	    		return RespDTO.onSuc("该机构存在");
-	    	}
-	    	Organization organization = new Organization();
-	    	organization.setName(organizationVO.getOrganizationName());
-	    	organization.setType(organizationVO.getType());
-	    	organization.setPrincipal(organizationVO.getPrincipal());
-	    	organization.setSubNum(organizationVO.getSubNum());
-	    	organization.setAddress(organizationVO.getAddress());
-	    	organization.setGmtCreate(DateUtil.now());
-	    	//TODO organization.setModifier(UserUtils.getCurrentPrincipleID());
-	    	organization.setCreator("5");
-	    	
-	    	boolean res = organizationFacade.save(organization);
-	    	
-	    	//System.out.println(GsonUtil.toJson(organization));
-	    	if(res ==true){
-	    		return RespDTO.onSuc("增加机构信息成功！");
-	    	}
-	    	return RespDTO.onSuc("增加机构信息失败！");
-	    }
-	    
-	    @ApiOperation(value = "添加用户信息和机构信息管理员", notes = "用户信息和机构信息的绑定")
-	    @PostMapping("/addUserInfo")
-	    @SysLogger("addUserInfo")
-	    public RespDTO<UserAndOrganizationVO> addUserInfo(@Valid @RequestBody UserAndOrganizationVO  userAndOrganizationVO){
-	    	//TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
-	    	//User user = new User();
-	    	//验证用户是否存在
-	    	 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("该机构绑定了用户！");
-	    	 }
-	    	 
-	    	 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("/getInformationAvailableByUserId")
-	    @SysLogger("getInformationAvailableByUserId")*/
-	    
-	  //TODO
-	   /* 
-	    @ApiOperation(value = "根据用户id和产品id，启用和停用功能", notes = "开通信息")
-	    @PostMapping("/startAndendByuserId")
-	    @SysLogger("startAndendByuserId")*/
-	    
-	  //TODO
-	   /* @ApiOperation(value = "根据用户id和产品id，删除开通信息", notes = "删除开通信息")
-	    @PostMapping("/delInformationAvailable")
-	    @SysLogger("delInformationAvailable")*/
-	  //TODO
-	/* @ApiOperation(value = "根据用户id和产品id，修改开通时间", notes = "修改开通时间")
-	   @PostMapping("/delInformationAvailable")
-	   @SysLogger("delInformationAvailable")*/
-
-	    
-	    
-	    
-	    
-	    
-	    
 
-}
+	@ApiOperation(value = "分页查询获取用户信息", notes = "根据每页显示条数，默认 10，和当前页")
+	@PostMapping("/getUserInfoPag")
+	@SysLogger("getUserInfoPag")
+	// @ApiIgnore
+	public RespDTO<UserInfoDTO> getUserInfoPag(Page page, String orgName, String autStatus) {
+		UserInfoDTO userInfo = new UserInfoDTO();
+		userInfo.setOrgName(orgName);
+		userInfo.setAutStatus(autStatus);
+		IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(page, userInfo);
+		return RespDTO.onSuc(user);
+	}
+
+	@ApiOperation(value = "修改用户信息和机构信息", notes = "用户信息和机构信息")
+	@PostMapping("/updateUserInfoAll")
+	@SysLogger("updateUserInfoAll")
+	public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(@Valid @RequestBody UserInfoOrganizationsVO userInfo) {
+		int res = userFacade.updateUserInfoAll(userInfo);
+
+		if (res != 0) {
+			return RespDTO.onSuc("修改用户信息成功！");
+		}
+		return RespDTO.onSuc("修改用户信息失败！");
+	}
+
+	@ApiOperation(value = "审核用户信息和机构信息", notes = "审核用户信息和机构信息")
+	@PostMapping("/auditUserInfoAll")
+	@SysLogger("auditUserInfoAll")
+	public RespDTO<UserInfoAuditVO> auditUserInfoAll(@Valid @RequestBody 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, Object> map = new HashMap<String, Object>();
+		map.put("userId", userId);
+		// TODO map.put("modifier",UserUtils.getCurrentPrincipleID());
+		map.put("modifier", "5");
+		map.put("gmtModified", DateUtil.now());
+		int res = userFacade.updateDeleted(map);
+		return RespDTO.onSuc("刪除成功" + res);
+	}
+
+	@ApiOperation(value = "模糊查询机构信息", notes = "机构信息")
+	@PostMapping("/findOrganization")
+	@SysLogger("findOrganization")
+	public RespDTO findOrganization(@RequestParam String organizationName) {
+		// TODO 返回机构Id和机构
+		List<Organization> organization = organizationFacade.findOrganization(organizationName);
+
+		return RespDTO.onSuc(organization);
+	}
+
+	@ApiOperation(value = "添加构信息", notes = "机构信息")
+	@PostMapping("/addOrganization")
+	@SysLogger("addOrganization")
+	public RespDTO<OrganizationVO> addOrganization(@Valid @RequestBody OrganizationVO organizationVO) {
+		// TODO
+		String organizationName = organizationVO.getOrganizationName();
+		List<Organization> organizationList = organizationFacade.findOrganization(organizationName);
+		if (organizationList.size() > 0) {
+			return RespDTO.onSuc("该机构存在");
+		}
+		Organization organization = new Organization();
+		organization.setName(organizationVO.getOrganizationName());
+		organization.setType(organizationVO.getType());
+		organization.setPrincipal(organizationVO.getPrincipal());
+		organization.setSubNum(organizationVO.getSubNum());
+		organization.setAddress(organizationVO.getAddress());
+		organization.setGmtCreate(DateUtil.now());
+		// TODO organization.setModifier(UserUtils.getCurrentPrincipleID());
+		organization.setCreator("5");
 
+		boolean res = organizationFacade.save(organization);
+
+		// System.out.println(GsonUtil.toJson(organization));
+		if (res == true) {
+			return RespDTO.onSuc("增加机构信息成功！");
+		}
+		return RespDTO.onSuc("增加机构信息失败！");
+	}
+
+	@ApiOperation(value = "添加用户信息和机构信息管理员", notes = "用户信息和机构信息的绑定")
+	@PostMapping("/addUserInfo")
+	@SysLogger("addUserInfo")
+	public RespDTO<UserAndOrganizationVO> addUserInfo(@Valid @RequestBody UserAndOrganizationVO userAndOrganizationVO) {
+		// TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
+		// User user = new User();
+		// 验证用户是否存在
+		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("该机构绑定了用户！");
+		}
+
+		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(1);// 是否通过认证 0:未通过，1:已通过
+			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("绑定成功");
+	}
+
+}

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

@@ -234,24 +234,5 @@
 
 </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>