Merge branch 'master' of git-server.lierdapark.com:JasonGroup/challenger-rmi

Conflicts:
	src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseHystrix.java
	src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseRemoteService.java
	src/main/java/com/senthink/rmi/challenger/vo/EllaUserBaseVo.java

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

@@ -17,10 +17,10 @@ public abstract class EllaOrgStructureHystrix implements EllaOrgStructureRemoteS
 
 	public abstract Message index();
 
-	public abstract Message toUpdate(@RequestBody EllaOrgStructureVo vo);
+	public abstract Message orgToUpdate(@RequestBody EllaOrgStructureVo vo);
 
-	public abstract Message doAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
+	public abstract Message orgDoAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
 
-	public abstract Message doDelete(@PathVariable Integer id);
+	public abstract Message orgDoDelete(@PathVariable Integer id);
 
 }
\ No newline at end of file

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

@@ -27,13 +27,13 @@ public interface EllaOrgStructureRemoteService {
 
 	@ApiOperation(value = "获取组织架构单个节点的信息")
 	@RequestMapping(value = "/challenger/org/toUpdate/", method = RequestMethod.GET)
-	Message toUpdate(@RequestBody EllaOrgStructureVo vo);
+	Message orgToUpdate(@RequestBody EllaOrgStructureVo vo);
 
 	@ApiOperation(value = "保存或更新该节点信息")
 	@RequestMapping(value = "/challenger/org/doAddOrUpdate", method = RequestMethod.POST)
-	Message doAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
+	Message orgDoAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
 
 	@RequestMapping(value = "/challenger/org/doDelete/{id}", method = RequestMethod.GET)
-	Message doDelete(@PathVariable Integer id);
+	Message orgDoDelete(@PathVariable Integer id);
 
 }
\ No newline at end of file

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

@@ -15,12 +15,12 @@ import com.senthink.rmi.challenger.vo.EllaPagePermissionVo;
  */
 public abstract class EllaPagePermissionHystrix implements EllaPagePermissionRemoteService {
 
-	public abstract Message index();
+	public abstract Message perIndex();
 
-	public abstract Message toUpdate(@RequestBody EllaPagePermissionVo pageperVo);
+	public abstract Message perToUpdate(@RequestBody EllaPagePermissionVo pageperVo);
 
-	public abstract Message doAddOrUpdate(@RequestBody EllaPagePermissionVo vo);
+	public abstract Message perDoAddOrUpdate(@RequestBody EllaPagePermissionVo vo);
 
-	public abstract Message doDelete(@PathVariable Integer id);
+	public abstract Message perDoDelete(@PathVariable Integer id);
 
 }
\ No newline at end of file

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

@@ -24,18 +24,18 @@ public interface EllaPagePermissionRemoteService {
 	@ApiOperation(value = "获取权限列表")
 	@RequestMapping(value = { "/challenger/pageper/index", "/challenger/pageper/list",
 			"/challenger/back/pageper/list" }, method = RequestMethod.POST)
-	Message index();
+	Message orgDoDelete();
 
 	@ApiOperation(value = "获取当前节点信息，或插入")
 	@RequestMapping(value = "/challenger/pageper/toUpdate", method = RequestMethod.POST)
-	Message toUpdate(@RequestBody EllaPagePermissionVo pageperVo);
+	Message perToUpdate(@RequestBody EllaPagePermissionVo pageperVo);
 
 	@ApiOperation("更新节点信息")
 	@RequestMapping(value = "/challenger/pageper/doAddOrUpdate", method = RequestMethod.POST)
-	Message doAddOrUpdate(@RequestBody EllaPagePermissionVo vo);
+	Message perDoAddOrUpdate(@RequestBody EllaPagePermissionVo vo);
 
 	@ApiOperation("删除当前节点")
 	@RequestMapping(value = "/challenger/pageper/doDelete/{id}", method = RequestMethod.GET)
-	Message doDelete(@PathVariable Integer id);
+	Message perDoDelete(@PathVariable Integer id);
 
 }
\ No newline at end of file

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

@@ -15,16 +15,16 @@ import com.senthink.rmi.challenger.vo.EllaRoleVo;
  */
 public abstract class EllaRoleHystrix implements EllaRoleRemoteService {
 
-	public abstract Message searchList(@RequestBody EllaRoleVo vo);
+	public abstract Message roleSearchList(@RequestBody EllaRoleVo vo);
 
-	public abstract Message toAdd(@PathVariable Integer id);
+	public abstract Message roleToAdd(@PathVariable Integer id);
 
-	public abstract Message toUpdate(@PathVariable Integer roleId, String loginName);
+	public abstract Message roleToUpdate(@PathVariable Integer roleId, String loginName);
 
-	public abstract Message doAddOrUpdate(@RequestBody EllaRoleVo vo);
+	public abstract Message roleDoAddOrUpdate(@RequestBody EllaRoleVo vo);
 
-	public abstract Message doDelete(@PathVariable Integer id);
+	public abstract Message roleDoDelete(@PathVariable Integer id);
 
-	public abstract Message toDetail(@PathVariable Integer roleId);
+	public abstract Message roleToDetail(@PathVariable Integer roleId);
 
 }
\ No newline at end of file

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

@@ -24,26 +24,26 @@ public interface EllaRoleRemoteService {
 	@ApiOperation("角色列表")
 	@RequestMapping(value = { "/challenger/role/searchList",
 			"/challenger/back/role/list" }, method = RequestMethod.POST)
-	Message searchList(@RequestBody EllaRoleVo vo);
+	Message roleSearchList(@RequestBody EllaRoleVo vo);
 
 	@ApiOperation("添加时获取权限树")
 	@RequestMapping(value = "/challenger/role/toAdd/{id}", method = RequestMethod.GET)
-	Message toAdd(@PathVariable Integer id);
+	Message roleToAdd(@PathVariable Integer id);
 
 	@ApiOperation("更新角色时获取该角色对象")
 	@RequestMapping(value = "/challenger/role/toUpdate/{roleId}", method = RequestMethod.GET)
-	Message toUpdate(@PathVariable Integer roleId, String loginName);
+	Message roleToUpdate(@PathVariable Integer roleId, String loginName);
 
 	@ApiOperation("更新角色")
 	@RequestMapping(value = "/challenger/role/doAddOrUpdate", method = RequestMethod.POST)
-	Message doAddOrUpdate(@RequestBody EllaRoleVo vo);
+	Message roleDoAddOrUpdate(@RequestBody EllaRoleVo vo);
 
 	@ApiOperation("根据id删除角色")
 	@RequestMapping(value = "/challenger/role/doDelete/{id}", method = RequestMethod.GET)
-	Message doDelete(@PathVariable Integer id);
+	Message roleDoDelete(@PathVariable Integer id);
 
 	@ApiOperation("角色详情")
 	@RequestMapping(value = "/challenger/role/toDetail/{roleId}", method = RequestMethod.GET)
-	Message toDetail(@PathVariable Integer roleId);
+	Message roleToDetail(@PathVariable Integer roleId);
 
 }
\ No newline at end of file

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

@@ -15,12 +15,12 @@ import com.senthink.rmi.challenger.vo.EllaSubsystemVo;
  */
 public abstract class EllaSubsystemHystrix implements EllaSubsystemRemoteService {
 
-	public abstract Message searchList(@RequestBody EllaSubsystemVo vo);
+	public abstract Message subSearchList(@RequestBody EllaSubsystemVo vo);
 
-	public abstract Message toUpdate(@PathVariable Integer subsystemId);
+	public abstract Message subToUpdate(@PathVariable Integer subsystemId);
 
-	public abstract Message doAddOrUpdate(@RequestBody EllaSubsystemVo vo);
+	public abstract Message subDoAddOrUpdate(@RequestBody EllaSubsystemVo vo);
 
-	public abstract Message doDelete(@PathVariable Integer id);
+	public abstract Message subDoDelete(@PathVariable Integer id);
 
 }
\ No newline at end of file

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

@@ -22,19 +22,20 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaSubsystemRemoteService {
 
 	@ApiOperation("查询")
-	@RequestMapping(value = { "/challenger/subsystem/searchList", "/challenger/back/subsystem/list" }, method = RequestMethod.POST)
-	Message searchList(@RequestBody EllaSubsystemVo vo);
+	@RequestMapping(value = { "/challenger/subsystem/searchList",
+			"/challenger/back/subsystem/list" }, method = RequestMethod.POST)
+	Message subSearchList(@RequestBody EllaSubsystemVo vo);
 
 	@ApiOperation("根据id获取要更新的系统信息")
 	@RequestMapping(value = "/challenger/subsystem/toUpdate/{subsystemId}", method = RequestMethod.GET)
-	Message toUpdate(@PathVariable Integer subsystemId);
+	Message subToUpdate(@PathVariable Integer subsystemId);
 
 	@ApiOperation("更新或插入操作")
 	@RequestMapping(value = "/challenger/subsystem/doAddOrUpdate", method = RequestMethod.POST)
-	Message doAddOrUpdate(@RequestBody EllaSubsystemVo vo);
+	Message subDoAddOrUpdate(@RequestBody EllaSubsystemVo vo);
 
 	@ApiOperation("删除操作")
 	@RequestMapping(value = "/challenger/subsystem/doDelete/{id}", method = RequestMethod.GET)
-	Message doDelete(@PathVariable Integer id);
+	Message subDoDelete(@PathVariable Integer id);
 
 }
\ No newline at end of file

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

@@ -16,14 +16,14 @@ import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo;
  */
 public abstract class EllaSubsystemSyncHystrix implements EllaSubsystemSyncRemoteService {
 
-	public abstract Message index();
+	public abstract Message subsIndex();
 
-	public abstract Message toUpdate(@PathVariable Integer subsystemId);
+	public abstract Message subsToUpdate(@PathVariable Integer subsystemId);
 
-	public abstract Message doAddOrUpdate(@Valid EllaSubsystemSyncVo vo);
+	public abstract Message subsDoAddOrUpdate(@Valid EllaSubsystemSyncVo vo);
 
-	public abstract Message doDelete(@PathVariable Integer id);
+	public abstract Message subsDoDelete(@PathVariable Integer id);
 
-	public abstract Message searchList(EllaSubsystemSyncVo vo);
+	public abstract Message subsSearchList(EllaSubsystemSyncVo vo);
 
 }
\ No newline at end of file

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

@@ -25,22 +25,22 @@ public interface EllaSubsystemSyncRemoteService {
 	@ApiOperation("子系统同步信息首页")
 	@RequestMapping(value = { "/challenger/subsystemsync/list",
 			"/challenger/back/subsystemsync/list" }, method = RequestMethod.POST)
-	Message index();
+	Message subsIndex();
 
 	@ApiOperation("编辑页面初始化")
 	@RequestMapping(value = "/challenger/subsystemsync/toUpdate/{subsystemId}", method = RequestMethod.GET)
-	Message toUpdate(@PathVariable Integer subsystemId);
+	Message subsToUpdate(@PathVariable Integer subsystemId);
 
 	@ApiOperation("添加或者编辑子系统同步信息")
 	@RequestMapping(value = { "/challenger/subsystemsync/doAddOrUpdate" }, method = RequestMethod.POST)
-	Message doAddOrUpdate(@Valid EllaSubsystemSyncVo vo);
+	Message subsDoAddOrUpdate(@Valid EllaSubsystemSyncVo vo);
 
 	@ApiOperation("子系统同步删除")
 	@RequestMapping(value = "/challenger/subsystemsync/doDelete/{id}", method = RequestMethod.GET)
-	Message doDelete(@PathVariable Integer id);
+	Message subsDoDelete(@PathVariable Integer id);
 
 	@ApiOperation("按条件查询")
 	@RequestMapping(value = { "/challenger/subsystemsync/searchList" }, method = RequestMethod.POST)
-	Message searchList(EllaSubsystemSyncVo vo);
+	Message subsSearchList(EllaSubsystemSyncVo vo);
 
 }
\ No newline at end of file

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

@@ -17,15 +17,15 @@ import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
  */
 public abstract class EllaUserExtendsHystrix implements EllaUserExtendsRemoteService {
 
-	public abstract Message searchList(EllaUserExtendsVo vo);
+	public abstract Message userExSearchList(EllaUserExtendsVo vo);
 
-	public abstract Message index(@PathVariable Integer userTypeId);
+	public abstract Message userExIndex(@PathVariable Integer userTypeId);
 
-	public abstract Message toAdd(@PathVariable Integer userTypeId);
+	public abstract Message userExToAdd(@PathVariable Integer userTypeId);
 
-	public abstract Message doAdd(@Valid EllaUserExtendsVo vo);
+	public abstract Message userExDoAdd(@Valid EllaUserExtendsVo vo);
 
-	public abstract Message doDelete(HttpServletRequest request);
+	public abstract Message userExDoDelete(HttpServletRequest request);
 
 	public abstract Message getByUserTypeId(@Valid Integer userTypeId);
 

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

@@ -24,23 +24,23 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaUserExtendsRemoteService {
 	@ApiOperation("分页查询")
 	@RequestMapping(value = { "/challenger/userextends/searchList" }, method = RequestMethod.POST)
-	Message searchList(EllaUserExtendsVo vo);
+	Message userExSearchList(EllaUserExtendsVo vo);
 
 	@ApiOperation("根据用户类型查询扩展属性")
 	@RequestMapping(value = { "/challenger/userextends/list/{userTypeId}" }, method = RequestMethod.GET)
-	Message index(@PathVariable Integer userTypeId);
+	Message userExIndex(@PathVariable Integer userTypeId);
 
 	@ApiOperation("添加时获取所有的用户类型")
 	@RequestMapping(value = "/challenger/userextends/toAdd/{userTypeId}", method = RequestMethod.GET)
-	Message toAdd(@PathVariable Integer userTypeId);
+	Message userExToAdd(@PathVariable Integer userTypeId);
 
 	@ApiOperation("添加扩展属性")
 	@RequestMapping("/challenger/userextends/doAdd")
-	Message doAdd(@Valid EllaUserExtendsVo vo);
+	Message userExDoAdd(@Valid EllaUserExtendsVo vo);
 
 	@ApiOperation("删除扩展属性")
 	@RequestMapping(value = { "/challenger/userextends/doDelete" }, method = RequestMethod.POST)
-	Message doDelete(HttpServletRequest request);
+	Message userExDoDelete(HttpServletRequest request);
 
 	@ApiOperation("根据用户类型获取对应的扩展属性")
 	@RequestMapping(value = "/challenger/userextends/getByUserTypeId", method = RequestMethod.POST)

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

@@ -15,12 +15,12 @@ import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
  */
 public abstract class EllaUserTypeHystrix implements EllaUserTypeRemoteService {
 
-	public abstract Message searchList(@RequestBody EllaUserTypeVo vo);
+	public abstract Message userTSearchList(@RequestBody EllaUserTypeVo vo);
 
-	public abstract Message toUpdate(@PathVariable Integer userTypeId);
+	public abstract Message userTToUpdate(@PathVariable Integer userTypeId);
 
-	public abstract Message doAddOrUpdate(@RequestBody EllaUserTypeVo vo);
+	public abstract Message userTDoAddOrUpdate(@RequestBody EllaUserTypeVo vo);
 
-	public abstract Message doDelete(@PathVariable Integer id);
+	public abstract Message userTDoDelete(@PathVariable Integer id);
 
 }
\ No newline at end of file

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

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

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

@@ -3,6 +3,8 @@
  */
 package com.senthink.rmi.challenger.vo;
 
+import javax.validation.constraints.NotNull;
+
 import org.hibernate.validator.constraints.NotEmpty;
 
 import io.swagger.annotations.ApiModel;
@@ -17,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel("改变绑定mail或tel的vo")
 public class EllaUserBaseChangeMailTelVo {
 	@ApiModelProperty("用户id")
-	@NotEmpty(message = "用户id不能为空")
+	@NotNull
 	private Integer userId;
 
 	@ApiModelProperty("旧的mail地址")
@@ -32,7 +34,7 @@ public class EllaUserBaseChangeMailTelVo {
 	@ApiModelProperty("新的手机号")
 	private String newTel;
 	@ApiModelProperty("验证码")
-	@NotEmpty(message = "用户id不能为空", groups = change.class)
+	@NotEmpty(message = "验证码不能为空", groups = change.class)
 	private String code;
 
 	public interface change {

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

@@ -18,6 +18,8 @@ public class EllaUserBaseVo extends PageVo {
 
 	private Integer id;
 
+	private String name;
+
 	/**
 	 * 手机端登录时传过来的手机名
 	 */
@@ -165,11 +167,18 @@ public class EllaUserBaseVo extends PageVo {
 	public String getVcuNo() {
 		return vcuNo;
 	}
-
 	public void setVcuNo(String vcuNo) {
 		this.vcuNo = vcuNo;
 	}
 	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public String getOrgs() {
 		return orgs;
 	}