rmi补完

src/main/java/com/senthink/rmi/challenger/rmi/EllaAppVersionHystrix.java

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaAppVersionVo;
+
+/**
+ * @ClassName : EllaAppVersionHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaAppVersionHystrix implements EllaAppVersionRemoteService {
+
+	public abstract Message appVersionSearch(@RequestBody EllaAppVersionVo av);
+
+	public abstract Message appVersionToupdate(@PathVariable(value = "id") Integer id);
+
+	public abstract Message appVersionDoUpdateOrAdd(@RequestBody EllaAppVersionVo av);
+
+	public abstract Message appVersiondelete(@PathVariable(value = "id") Integer id);
+
+}
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaAppVersionRemoteService.java

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaAppVersionVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaAppVersionRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaAppVersionHystrix.class)
+public interface EllaAppVersionRemoteService {
+
+	@ApiOperation("查询接口，参数search")
+	@RequestMapping(value = "appversion/getPage", method = RequestMethod.POST)
+	Message appVersionSearch(@RequestBody EllaAppVersionVo av);
+
+	@ApiOperation("编辑查找实体接口，参数id")
+	@RequestMapping(value = "appversion/toUpdate/{id}", method = RequestMethod.GET)
+	Message appVersionToupdate(@PathVariable(value = "id") Integer id);
+
+	@ApiOperation("保存接口")
+	@RequestMapping(value = "appversion/doAddOrUpdate", method = RequestMethod.POST)
+	Message appVersionDoUpdateOrAdd(@RequestBody EllaAppVersionVo av);
+
+	@ApiOperation("删除接口，参数id")
+	@RequestMapping(value = "appversion/delete/{id}", method = RequestMethod.GET)
+	Message appVersiondelete(@PathVariable(value = "id") Integer id);
+
+}
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaRoleHystrix.java

@@ -19,7 +19,8 @@ public abstract class EllaRoleHystrix implements EllaRoleRemoteService {
 
 	public abstract Message roleToAdd(@PathVariable Integer id);
 
-	public abstract Message roleToUpdate(@PathVariable Integer roleId, String loginName);
+	public abstract Message roleToUpdate(@PathVariable(value = "roleId") Integer roleId,
+			@PathVariable(value = "userId") String userId);
 
 	public abstract Message roleDoAddOrUpdate(@RequestBody EllaRoleVo vo);
 

src/main/java/com/senthink/rmi/challenger/rmi/EllaRoleRemoteService.java

@@ -31,8 +31,9 @@ public interface EllaRoleRemoteService {
 	Message roleToAdd(@PathVariable Integer id);
 
 	@ApiOperation("更新角色时获取该角色对象")
-	@RequestMapping(value = "/challenger/role/toUpdate/{roleId}", method = RequestMethod.GET)
-	Message roleToUpdate(@PathVariable Integer roleId, String loginName);
+	@RequestMapping(value = "/role/toUpdate/{roleId}/{userId}", method = RequestMethod.GET)
+	public Message roleToUpdate(@PathVariable(value = "roleId") Integer roleId,
+			@PathVariable(value = "userId") String userId);
 
 	@ApiOperation("更新角色")
 	@RequestMapping(value = "/challenger/role/doAddOrUpdate", method = RequestMethod.POST)

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseHystrix.java

@@ -19,11 +19,12 @@ public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
 
 	public abstract Message adminPage(@RequestBody EllaUserBaseVo vo);
 
-	public abstract Message userBaseToAdd();
+	public abstract Message userToAdd(@PathVariable(value = "userId") Integer userId);
 
-	public abstract Message userBaseToUpdate(@PathVariable Integer userId);
+	public abstract Message userToUpdate(@PathVariable(value = "id") Integer id,
+			@PathVariable(value = "userId") Integer userId);
 
-	public abstract Message userBaseDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
+	public abstract Message userDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
 
 	public abstract Message douploadfiles(MultipartFile file);
 
@@ -37,4 +38,8 @@ public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
 
 	public abstract Message passCheck(@RequestBody EllaUserBaseVo vo);
 
+	public abstract Message deleteAdminUser(@PathVariable(value = "id") Integer id);
+
+	public abstract Message passwordReset(@PathVariable(value = "id") Integer id);
+
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseRemoteService.java

@@ -24,43 +24,50 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaUserBaseRemoteService {
 
 	@ApiOperation(value = "用户查询页面，用户列表初始化页面")
-	@RequestMapping(value = { "/challenger/admin/user/list", "/challenger/back/user/list",
-			"/challenger/user/index" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "admin/user/list", "/back/user/list", "/user/index" }, method = RequestMethod.POST)
 	Message adminPage(@RequestBody EllaUserBaseVo vo);
 
 	@ApiOperation(value = "点击添加，返回用户类型，角色列表及组织架构信息")
-	@RequestMapping(value = "/challenger/user/toAdd", method = RequestMethod.GET)
-	Message userBaseToAdd();
+	@RequestMapping(value = "/user/toAdd/{userId}", method = RequestMethod.GET)
+	Message userToAdd(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation(value = "编辑，根据用户id返回用户信息")
-	@RequestMapping(value = "/challenger/user/toUpdate/{userId}", method = RequestMethod.GET)
-	Message userBaseToUpdate(@PathVariable Integer userId);
+	@RequestMapping(value = "/user/toUpdate/{id}/{userId}", method = RequestMethod.GET)
+	Message userToUpdate(@PathVariable(value = "id") Integer id, @PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation(value = "用户存储或更新操作")
-	@RequestMapping(value = "/challenger/user/doAddOrUpdate", method = RequestMethod.POST)
-	Message userBaseDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
+	@RequestMapping(value = "/user/doAddOrUpdate", method = RequestMethod.POST)
+	Message userDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
 
 	@ApiOperation(value = "文件上传")
-	@RequestMapping(value = "/challenger/file/upload", method = RequestMethod.POST)
+	@RequestMapping(value = "/file/upload", method = RequestMethod.POST)
 	Message douploadfiles(MultipartFile file);
 
 	@ApiOperation(value = "文件删除")
-	@RequestMapping(value = "/challenger/file/delete/{fileName}", method = RequestMethod.GET)
+	@RequestMapping(value = "/file/delete/{fileName}", method = RequestMethod.GET)
 	Message deletefiles(@PathVariable(value = "fileName") String fileName);
 
 	@ApiOperation(value = " 禁用某个用户")
-	@RequestMapping(value = "/challenger/user/disable/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/user/disable/{id}", method = RequestMethod.GET)
 	Message disableUser(@PathVariable Integer id);
 
 	@ApiOperation(value = " 启用某个用户")
-	@RequestMapping(value = "/challenger/user/enable/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/user/enable/{id}", method = RequestMethod.GET)
 	Message enableUser(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation(value = " 修改登录密码")
-	@RequestMapping(value = "/challenger/user/updatePass", method = RequestMethod.POST)
+	@RequestMapping(value = "/user/updatePass", method = RequestMethod.POST)
 	Message updatePass(@RequestBody UserUpdatePwdVo vo);
 
-	@RequestMapping(value = "/challenger/user/passCheck", method = RequestMethod.POST)
+	@RequestMapping(value = "/user/passCheck", method = RequestMethod.POST)
 	Message passCheck(@RequestBody EllaUserBaseVo vo);
 
+	@ApiOperation(value = " 删除用户仅测试使用")
+	@RequestMapping(value = "/user/test/delete/{id}", method = RequestMethod.GET)
+	Message deleteAdminUser(@PathVariable(value = "id") Integer id);
+
+	@ApiOperation(value = "重置密码")
+	@RequestMapping(value = "/user/password/reset/{id}", method = RequestMethod.GET)
+	Message passwordReset(@PathVariable(value = "id") Integer id);
+
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserExtendsHystrix.java

 
 package com.senthink.rmi.challenger.rmi;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import com.senthink.rmi.challenger.response.Message;
 import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
@@ -17,16 +16,16 @@ import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
  */
 public abstract class EllaUserExtendsHystrix implements EllaUserExtendsRemoteService {
 
-	public abstract Message userExSearchList(EllaUserExtendsVo vo);
+	public abstract Message userExSearchList(@RequestBody EllaUserExtendsVo vo);
 
-	public abstract Message userExIndex(@PathVariable Integer userTypeId);
+	public abstract Message userExIndex(@PathVariable(value = "userTypeId") Integer userTypeId);
 
-	public abstract Message userExToAdd(@PathVariable Integer userTypeId);
+	public abstract Message userExToAdd(@PathVariable(value = "userTypeId") Integer userTypeId);
 
-	public abstract Message userExDoAdd(@Valid EllaUserExtendsVo vo);
+	public abstract Message userExDoAdd(@RequestBody @Validated EllaUserExtendsVo vo);
 
-	public abstract Message userExDoDelete(HttpServletRequest request);
+	public abstract Message userExDoDelete(@PathVariable(value = "id") Integer id);
 
-	public abstract Message getByUserTypeId(@Valid Integer userTypeId);
+	public abstract Message getByUserTypeId(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserExtendsRemoteService.java

 
 package com.senthink.rmi.challenger.rmi;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
 import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -22,28 +21,29 @@ import io.swagger.annotations.ApiOperation;
  */
 @FeignClient(value = "challenger", fallback = EllaUserExtendsHystrix.class)
 public interface EllaUserExtendsRemoteService {
+
 	@ApiOperation("分页查询")
-	@RequestMapping(value = { "/challenger/userextends/searchList" }, method = RequestMethod.POST)
-	Message userExSearchList(EllaUserExtendsVo vo);
+	@RequestMapping(value = "/userextends/searchList", method = RequestMethod.POST)
+	Message userExSearchList(@RequestBody EllaUserExtendsVo vo);
 
 	@ApiOperation("根据用户类型查询扩展属性")
-	@RequestMapping(value = { "/challenger/userextends/list/{userTypeId}" }, method = RequestMethod.GET)
-	Message userExIndex(@PathVariable Integer userTypeId);
+	@RequestMapping(value = "/userextends/list/{userTypeId}", method = RequestMethod.GET)
+	Message userExIndex(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 	@ApiOperation("添加时获取所有的用户类型")
-	@RequestMapping(value = "/challenger/userextends/toAdd/{userTypeId}", method = RequestMethod.GET)
-	Message userExToAdd(@PathVariable Integer userTypeId);
+	@RequestMapping(value = "/userextends/toAdd/{userTypeId}", method = RequestMethod.GET)
+	Message userExToAdd(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 	@ApiOperation("添加扩展属性")
-	@RequestMapping("/challenger/userextends/doAdd")
-	Message userExDoAdd(@Valid EllaUserExtendsVo vo);
+	@RequestMapping(value = "/userextends/doAdd", method = RequestMethod.POST)
+	Message userExDoAdd(@RequestBody @Validated EllaUserExtendsVo vo);
 
 	@ApiOperation("删除扩展属性")
-	@RequestMapping(value = { "/challenger/userextends/doDelete" }, method = RequestMethod.POST)
-	Message userExDoDelete(HttpServletRequest request);
+	@RequestMapping(value = "/userextends/doDelete/{id}", method = RequestMethod.GET)
+	Message userExDoDelete(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation("根据用户类型获取对应的扩展属性")
-	@RequestMapping(value = "/challenger/userextends/getByUserTypeId", method = RequestMethod.POST)
-	Message getByUserTypeId(@Valid Integer userTypeId);
+	@RequestMapping(value = "/userextends/getByUserTypeId/{userTypeId}", method = RequestMethod.GET)
+	Message getByUserTypeId(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserLeaseHystrix.java

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.LeaseCheckRealNameVo;
+import com.senthink.rmi.challenger.vo.LeaseUserLoginInfoVo;
+import com.senthink.rmi.challenger.vo.NormalUserSearchVo;
+import com.senthink.rmi.challenger.vo.YunyingUserSearchVo;
+
+/**
+ * @ClassName : EllaUserLeaseHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaUserLeaseHystrix implements EllaUserLeaseRemoteService {
+
+	public abstract Message getLoginCodeByPhone(@PathVariable(value = "phone") String phone);
+
+	public abstract Message signInByPhoneAndCode(@RequestBody LeaseUserLoginInfoVo vo);
+
+	public abstract Message loginByPhoneAndCode(@RequestBody LeaseUserLoginInfoVo vo);
+
+	public abstract Message wechatUserSaveOpenId(@PathVariable(value = "openId") String openId,
+			@PathVariable(value = "nickName") String nickName);
+
+	public abstract Message checkNameByIdCard(@RequestBody LeaseCheckRealNameVo vo);
+
+	public abstract Message inviteCodeCreate(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message inviteReWard(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message getProductIdByUserId(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message getOrgCodeByUserId(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message getUserTypeCodeByUserId(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message nomalUserBaseDetail(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message nomalUserGetPage(@RequestBody NormalUserSearchVo vo);
+
+	public abstract Message operatorUserGetPage(@RequestBody YunyingUserSearchVo vo);
+
+	public abstract Message operatorUserBaseDetail(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message enableOperator(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message disableOperator(@PathVariable(value = "userId") Integer userId);
+
+	public abstract Message userIdAndLoginNameChange(@RequestParam(value = "userId", required = false) Integer userId,
+			@RequestParam(value = "loginName", required = false) String loginName);
+
+	public abstract Message userCancle(@PathVariable(value = "userId") Integer userId);
+
+}
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserLeaseRemoteService.java

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.LeaseCheckRealNameVo;
+import com.senthink.rmi.challenger.vo.LeaseUserLoginInfoVo;
+import com.senthink.rmi.challenger.vo.NormalUserSearchVo;
+import com.senthink.rmi.challenger.vo.YunyingUserSearchVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaUserLeaseRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaUserLeaseHystrix.class)
+public interface EllaUserLeaseRemoteService {
+
+	@ApiOperation("租赁用户登录获取验证码")
+	@RequestMapping(value = "lease/getcodeByPhone/{phone}", method = RequestMethod.GET)
+	Message getLoginCodeByPhone(@PathVariable(value = "phone") String phone);
+
+	@ApiOperation("租赁用户根据手机验证码注册")
+	@RequestMapping(value = "lease/signinByphone", method = RequestMethod.POST)
+	Message signInByPhoneAndCode(@RequestBody LeaseUserLoginInfoVo vo);
+
+	@ApiOperation("租赁用户根据手机验证码登录")
+	@RequestMapping(value = "lease/loginByphone", method = RequestMethod.POST)
+	Message loginByPhoneAndCode(@RequestBody LeaseUserLoginInfoVo vo);
+
+	@ApiOperation("租赁微信用户关注时保存openId")
+	@RequestMapping(value = "lease/wechat/saveopenId/{openId}/{nickName}", method = RequestMethod.GET)
+	Message wechatUserSaveOpenId(@PathVariable(value = "openId") String openId,
+			@PathVariable(value = "nickName") String nickName);
+
+	@ApiOperation("租赁微信用户实名认证并开户")
+	@RequestMapping(value = "lease/check/realname", method = RequestMethod.POST)
+	Message checkNameByIdCard(@RequestBody LeaseCheckRealNameVo vo);
+
+	@ApiOperation("生成邀请码并保存")
+	@RequestMapping(value = "lease/inviteCode/crate/{userId}", method = RequestMethod.GET)
+	Message inviteCodeCreate(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("根据userId获取生成InvitCouponsVo，请求lease生成奖券")
+	@RequestMapping(value = "lease/inviteCoupons/{userId}", method = RequestMethod.GET)
+	Message inviteReWard(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("根据userId获取productId")
+	@RequestMapping(value = "lease/productId/get/{userId}", method = RequestMethod.GET)
+	Message getProductIdByUserId(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("根据userId获取orgCode")
+	@RequestMapping(value = "lease/orgCode/get/{userId}", method = RequestMethod.GET)
+	Message getOrgCodeByUserId(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("根据userId获取用户类型code")
+	@RequestMapping(value = "lease/userTypeCode/get/{userId}", method = RequestMethod.GET)
+	Message getUserTypeCodeByUserId(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("普通用户----根据userId获取普通用户的详细信息")
+	@RequestMapping(value = "lease/normalUser/detail/{userId}", method = RequestMethod.GET)
+	Message nomalUserBaseDetail(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("普通用户----普通用户分页查询")
+	@RequestMapping(value = "lease/normalUser/page", method = RequestMethod.POST)
+	Message nomalUserGetPage(@RequestBody NormalUserSearchVo vo);
+
+	@ApiOperation("运营商/代理商/服务商----运营商分页查询")
+	@RequestMapping(value = "lease/operatorUser/page", method = RequestMethod.POST)
+	Message operatorUserGetPage(@RequestBody YunyingUserSearchVo vo);
+
+	@ApiOperation("运营商/代理商/服务商----根据userId获取普通用户的详细信息")
+	@RequestMapping(value = "lease/operatorUser/detail/{userId}", method = RequestMethod.GET)
+	Message operatorUserBaseDetail(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("运营商/代理商/服务商----根据userId启用")
+	@RequestMapping(value = "lease/operator/enable/{userId}", method = RequestMethod.GET)
+	Message enableOperator(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("运营商/代理商/服务商----根据userId禁用")
+	@RequestMapping(value = "lease/operator/disable/{userId}", method = RequestMethod.GET)
+	Message disableOperator(@PathVariable(value = "userId") Integer userId);
+
+	@ApiOperation("userId与loginNanem相互转换")
+	@RequestMapping(value = "lease/userIdOrLoginName/get", method = RequestMethod.POST)
+	Message userIdAndLoginNameChange(@RequestParam(value = "userId", required = false) Integer userId,
+			@RequestParam(value = "loginName", required = false) String loginName);
+
+	@ApiOperation("普通用户注销")
+	@RequestMapping(value = "lease/user/cancel/{userId}", method = RequestMethod.POST)
+	Message userCancle(@PathVariable(value = "userId") Integer userId);
+
+}
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserParkHystrix.java

+
+package com.senthink.rmi.challenger.rmi;
+
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.LeaseUserParkAuth;
+import com.senthink.rmi.challenger.vo.ParkVo;
+
+/**
+ * @ClassName : EllaUserParkHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaUserParkHystrix implements EllaUserParkRemoteService {
+
+	public abstract Message getUserIdAndOrgByPid(@PathVariable(value = "pid") Integer pid);
+
+	public abstract Message zoomAuth(@PathVariable(value = "userId") Integer userId,
+			@PathVariable(value = "search") String search);
+
+	public abstract Message parkAuth(@RequestBody @Valid ParkVo vo);
+
+	public abstract Message zoomAuthSave(@RequestBody LeaseUserParkAuth vo);
+
+}
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserParkRemoteService.java

+
+package com.senthink.rmi.challenger.rmi;
+
+import javax.validation.Valid;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.LeaseUserParkAuth;
+import com.senthink.rmi.challenger.vo.ParkVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaUserParkRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaUserParkHystrix.class)
+public interface EllaUserParkRemoteService {
+
+	@ApiOperation("根据pid获取userId与orgCode")
+	@RequestMapping(value = "lease/getUserIdAndOrg/{pid}", method = RequestMethod.GET)
+	Message getUserIdAndOrgByPid(@PathVariable(value = "pid") Integer pid);
+
+	@ApiOperation("进入区域授权页")
+	@RequestMapping(value = "lease/zoom/auth/{userId}/{search}", method = RequestMethod.GET)
+	Message zoomAuth(@PathVariable(value = "userId") Integer userId, @PathVariable(value = "search") String search);
+
+	@ApiOperation("进入停车场授权页")
+	@RequestMapping(value = "lease/park/auth", method = RequestMethod.POST)
+	Message parkAuth(@RequestBody @Valid ParkVo vo);
+
+	@ApiOperation("区域授权")
+	@RequestMapping(value = "lease/zoom/auth/save", method = RequestMethod.POST)
+	Message zoomAuthSave(@RequestBody LeaseUserParkAuth vo);
+
+}
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserTypeHystrix.java

@@ -17,10 +17,10 @@ public abstract class EllaUserTypeHystrix implements EllaUserTypeRemoteService {
 
 	public abstract Message userTSearchList(@RequestBody EllaUserTypeVo vo);
 
-	public abstract Message userTToUpdate(@PathVariable Integer userTypeId);
+	public abstract Message userTToUpdate(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 	public abstract Message userTDoAddOrUpdate(@RequestBody EllaUserTypeVo vo);
 
-	public abstract Message userTDoDelete(@PathVariable Integer id);
+	public abstract Message userTDoDelete(@PathVariable(value = "id") Integer id);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserTypeRemoteService.java

@@ -20,21 +20,21 @@ import io.swagger.annotations.ApiOperation;
  */
 @FeignClient(value = "challenger", fallback = EllaUserTypeHystrix.class)
 public interface EllaUserTypeRemoteService {
+
 	@ApiOperation("条件查询用户类型")
-	@RequestMapping(value = { "/challenger/usertype/searchList",
-			"/challenger/back/usertype/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/usertype/searchList", "/back/usertype/list" }, method = RequestMethod.POST)
 	Message userTSearchList(@RequestBody EllaUserTypeVo vo);
 
 	@ApiOperation("根据id获取要跟新的usertype对象")
-	@RequestMapping(value = "/challenger/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET)
-	Message userTToUpdate(@PathVariable Integer userTypeId);
+	@RequestMapping(value = "/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET)
+	Message userTToUpdate(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 	@ApiOperation(" 存储或更新用户类型操作")
-	@RequestMapping(value = "/challenger/usertype/doAddOrUpdate", method = RequestMethod.POST)
+	@RequestMapping(value = "/usertype/doAddOrUpdate", method = RequestMethod.POST)
 	Message userTDoAddOrUpdate(@RequestBody EllaUserTypeVo vo);
 
 	@ApiOperation("删除用户类型操作")
-	@RequestMapping(value = { "/challenger/usertype/doDelete/{id}" }, method = RequestMethod.GET)
-	Message userTDoDelete(@PathVariable Integer id);
+	@RequestMapping(value = "/usertype/doDelete/{id}", method = RequestMethod.GET)
+	Message userTDoDelete(@PathVariable(value = "id") Integer id);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/vo/NormalUserSearchVo.java

+/**
+ * 
+ */
+package com.senthink.rmi.challenger.vo;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName : NormalUserSearchVo
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年3月23日上午10:22:13
+ */
+@ApiModel("普通用户查询")
+public class NormalUserSearchVo extends PageVo {
+	@ApiModelProperty("当前登录用户的userId")
+	@NotNull(message = "当前登录用户的userId不能为空")
+	private Integer userId;
+	@ApiModelProperty("手机号即登录名")
+	private String loginName;
+	@ApiModelProperty("用户类型")
+	private String userType;
+	@ApiModelProperty("状态")
+	private Integer state;
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public String getUserType() {
+		return userType;
+	}
+
+	public void setUserType(String userType) {
+		this.userType = userType;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+}

src/main/java/com/senthink/rmi/challenger/vo/ParkVo.java

+/**
+ * 
+ */
+package com.senthink.rmi.challenger.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName : ParkVo
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年3月16日下午3:18:42
+ */
+@ApiModel("停车场授权")
+public class ParkVo {
+	@ApiModelProperty("查询")
+	private String search;
+	@ApiModelProperty("业务类型0换电池1维修")
+	private String businessType;
+	@ApiModelProperty("用户id")
+	private Integer userId;
+
+	private Integer zoomId;
+
+	public Integer getZoomId() {
+		return zoomId;
+	}
+
+	public void setZoomId(Integer zoomId) {
+		this.zoomId = zoomId;
+	}
+
+	public String getSearch() {
+		return search;
+	}
+
+	public void setSearch(String search) {
+		this.search = search;
+	}
+
+	public String getBusinessType() {
+		return businessType;
+	}
+
+	public void setBusinessType(String businessType) {
+		this.businessType = businessType;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+}

src/main/java/com/senthink/rmi/challenger/vo/YunyingUserSearchVo.java

+/**
+ * 
+ */
+package com.senthink.rmi.challenger.vo;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName : YunyingUserSearchVo
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年3月24日上午10:10:16
+ */
+@ApiModel("运营商查询")
+public class YunyingUserSearchVo extends PageVo {
+	@ApiModelProperty("状态")
+	private Integer state;
+	@ApiModelProperty("0:运营商列表，1:代理商列表，2:服务商列表")
+	@NotNull(message = "用户类型不能为空")
+	private Integer theUserType;
+	@ApiModelProperty("所属上级id")
+	private Integer parentId;
+	@ApiModelProperty("0:直属，1:不直属")
+	private Integer direct;
+
+	private Integer userTypeId;
+
+	private Integer directId;
+
+	private Integer businessTypeId;
+
+	private Integer businessType;
+
+	private Integer userId;
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public Integer getUserTypeId() {
+		return userTypeId;
+	}
+
+	public void setUserTypeId(Integer userTypeId) {
+		this.userTypeId = userTypeId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	private String orgCode;
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public Integer getBusinessType() {
+		return businessType;
+	}
+
+	public void setBusinessType(Integer businessType) {
+		this.businessType = businessType;
+	}
+
+	public Integer getDirectId() {
+		return directId;
+	}
+
+	public void setDirectId(Integer directId) {
+		this.directId = directId;
+	}
+
+	public Integer getBusinessTypeId() {
+		return businessTypeId;
+	}
+
+	public void setBusinessTypeId(Integer businessTypeId) {
+		this.businessTypeId = businessTypeId;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public Integer getTheUserType() {
+		return theUserType;
+	}
+
+	public void setTheUserType(Integer theUserType) {
+		this.theUserType = theUserType;
+	}
+
+	public Integer getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(Integer parentId) {
+		this.parentId = parentId;
+	}
+
+	public Integer getDirect() {
+		return direct;
+	}
+
+	public void setDirect(Integer direct) {
+		this.direct = direct;
+	}
+
+}