把param vo 都加上了ella的头

src/main/java/com/senthink/rmi/challenger/param/PagePermissionParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaPagePermissionParam.java

 package com.senthink.rmi.challenger.param;
 
 
-import io.swagger.annotations.ApiModelProperty;
-
 import java.util.List;
 
-public class PagePermissionParam extends PageParam {
+import io.swagger.annotations.ApiModelProperty;
+
+public class EllaPagePermissionParam extends PageParam {
 
     private static final long serialVersionUID = 1L;
 
@@ -70,7 +70,7 @@ public class PagePermissionParam extends PageParam {
     private String enName;
 
     @ApiModelProperty("子节点集")
-    private List<PagePermissionParam> children;
+	private List<EllaPagePermissionParam> children;
 
     public Integer getId() {
         return id;
@@ -152,11 +152,11 @@ public class PagePermissionParam extends PageParam {
         this.enName = enName;
     }
 
-    public List<PagePermissionParam> getChildren() {
+	public List<EllaPagePermissionParam> getChildren() {
         return children;
     }
 
-    public void setChildren(List<PagePermissionParam> children) {
+	public void setChildren(List<EllaPagePermissionParam> children) {
         this.children = children;
     }
 

src/main/java/com/senthink/rmi/challenger/param/RoleParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaRoleParam.java

@@ -3,7 +3,7 @@ package com.senthink.rmi.challenger.param;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class RoleParam extends PageParam {
+public class EllaRoleParam extends PageParam {
 
     @ApiModelProperty("模糊查询")
     private String search;

src/main/java/com/senthink/rmi/challenger/param/SubsystemParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaSubsystemParam.java

 package com.senthink.rmi.challenger.param;
 
-import io.swagger.annotations.ApiModelProperty;
-
 import java.util.List;
 
-public class SubsystemParam extends PageParam {
+import io.swagger.annotations.ApiModelProperty;
+
+public class EllaSubsystemParam extends PageParam {
 
 	@ApiModelProperty("模糊查询")
     private String search;
@@ -34,7 +34,7 @@ public class SubsystemParam extends PageParam {
 	private String enName;
 
 	@ApiModelProperty("权限集")
-	private List<PagePermissionParam> permissions;
+	private List<EllaPagePermissionParam> permissions;
 
 
 
@@ -54,11 +54,11 @@ public class SubsystemParam extends PageParam {
 		this.enName = enName;
 	}
 
-	public List<PagePermissionParam> getPermissions() {
+	public List<EllaPagePermissionParam> getPermissions() {
 		return permissions;
 	}
 
-	public void setPermissions(List<PagePermissionParam> permissions) {
+	public void setPermissions(List<EllaPagePermissionParam> permissions) {
 		this.permissions = permissions;
 	}
 

src/main/java/com/senthink/rmi/challenger/param/SubsystemSyncParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaSubsystemSyncParam.java

@@ -3,7 +3,7 @@ package com.senthink.rmi.challenger.param;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class SubsystemSyncParam extends PageParam {
+public class EllaSubsystemSyncParam extends PageParam {
 
     @ApiModelProperty("模糊查询")
     private String search;

src/main/java/com/senthink/rmi/challenger/param/UserExtendsParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaUserExtendsParam.java

@@ -3,7 +3,7 @@ package com.senthink.rmi.challenger.param;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class UserExtendsParam extends PageParam {
+public class EllaUserExtendsParam extends PageParam {
 
     @ApiModelProperty("模糊查询")
     private String search;

src/main/java/com/senthink/rmi/challenger/param/UserOrgParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaUserOrgParam.java

@@ -2,7 +2,7 @@ package com.senthink.rmi.challenger.param;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class UserOrgParam extends PageParam {
+public class EllaUserOrgParam extends PageParam {
 
     @ApiModelProperty("模糊查询")
     private String search;

src/main/java/com/senthink/rmi/challenger/param/UserRoleParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaUserRoleParam.java

@@ -2,7 +2,7 @@ package com.senthink.rmi.challenger.param;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class UserRoleParam extends PageParam {
+public class EllaUserRoleParam extends PageParam {
 
     @ApiModelProperty("模糊查询")
     private String search;

src/main/java/com/senthink/rmi/challenger/param/UserTypeParam.java → src/main/java/com/senthink/rmi/challenger/param/EllaUserTypeParam.java

@@ -2,7 +2,7 @@ package com.senthink.rmi.challenger.param;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class UserTypeParam extends PageParam {
+public class EllaUserTypeParam extends PageParam {
 
     @ApiModelProperty("模糊查询")
     private String search;

src/main/java/com/senthink/rmi/challenger/response/Message.java

-package com.senthink.columbiarmi.response;
+package com.senthink.rmi.challenger.response;
 
 
 import java.util.HashMap;

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

-/**
- * 
- */
-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @ClassName           : AirAdressHystrix
- * @Description         :
- * @Author              : xujialin
- * @CreationDate        : 2016年12月23日下午3:08:15
- */
-public abstract class AirAdressHystrix implements AirAdressRemoteService {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.senthink.columbiarmi.rmi.AirAdressRemoteService#editAdress(com.
-	 * senthink.columbiarmi.vo.AircubeAdressVo)
-	 */
-	@Override
-	public abstract Message editAdress(@RequestBody AircubeAdressVo airAdress);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.senthink.columbiarmi.rmi.AirAdressRemoteService#getAdress(java.lang.
-	 * Integer)
-	 */
-	@Override
-	public abstract Message getAdress(@PathVariable(value = "id")Integer id);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.senthink.columbiarmi.rmi.AirAdressRemoteService#getAdressByCubeId(
-	 * java.lang.Integer)
-	 */
-	@Override
-	public abstract Message getAdressByCubeId(@PathVariable(value = "cubeid")Integer cubeid);
-
-}

src/main/java/com/senthink/rmi/challenger/rmi/AirAdressRemoteService.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 com.senthink.columbiarmi.response.Message;
-
-import io.swagger.annotations.ApiOperation;
-
-/**
- * @ClassName           : AirAdressRemoteService
- * @Description         :
- * @Author              : xujialin
- * @CreationDate        : 2016年12月23日下午3:08:40
- */
-@FeignClient(value = "columbia", fallback = AirAdressHystrix.class)
-public interface AirAdressRemoteService {
-	@ApiOperation(value = "地址插入", notes = "userId airId 必传 ，地址插入或更新")
-	@RequestMapping("/columbia/h5/adress/add")
-	Message editAdress(@RequestBody AircubeAdressVo airAdress);
-
-	@ApiOperation(value = "获取要编辑的adress", notes = "根据id获取要更新的adress")
-	@RequestMapping("/columbia/h5/adress/edit/{id}")
-	Message getAdress(@PathVariable(value = "id") Integer id);
-
-	@ApiOperation(value = "获取当前魔方启用的地址", notes = "根据魔方id获取要当前的adress")
-	@RequestMapping("/columbia/h5/air/getAdress/{cubeid}")
-	Message getAdressByCubeId(@PathVariable(value = "cubeid") Integer cubeid);
-
-
-}

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

-/**
- * 
- */
-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @ClassName           : AirInfoHystrix
- * @Description         :
- * @Author              : xujialin
- * @CreationDate        : 2016年12月19日下午4:30:43
- */
-public abstract class AirInfoHystrix implements AirInfoRemoteService {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.senthink.columbiarmi.rmi.AirInfoRemoteService#addAircube(com.senthink
-	 * .columbiarmi.vo.AircubeInfoVo)
-	 */
-	@Override
-	public abstract Message addAircube(@RequestBody AircubeInfoVo airvo);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.senthink.columbiarmi.rmi.AirInfoRemoteService#getaircube(java.lang.
-	 * Integer)
-	 */
-	@Override
-	public abstract Message getaircube(@PathVariable(value = "id")Integer id);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.senthink.columbiarmi.rmi.AirInfoRemoteService#getTicketByMac(java.
-	 * lang.String)
-	 */
-	@Override
-	public abstract Message getTicketByMac(@PathVariable(value = "mac")String mac);
-
-}

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

-/**
- * 
- */
-package com.senthink.columbiarmi.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 com.senthink.columbiarmi.response.Message;
-
-import io.swagger.annotations.ApiOperation;
-
-/**
- * @ClassName           : AirInfoRemoteService
- * @Description         :
- * @Author              : xujialin
- * @CreationDate        : 2016年12月19日下午4:31:41
- */
-@FeignClient(value = "columbia", fallback = AirInfoHystrix.class)
-public interface AirInfoRemoteService {
-	@ApiOperation(value = "更新或插入魔方信息", notes = "更新或插入魔方信息")
-	@RequestMapping("/columbia/h5/air/addOrUpdate")
-	Message addAircube(@RequestBody AircubeInfoVo airvo);
-
-	@ApiOperation(value = "根据魔方id获取要修改的魔方信息", notes = "根据魔方id获取要修改的魔方信息")
-	@RequestMapping("/columbia/h5/air/edit/{id}")
-	Message getaircube(@PathVariable(value = "id") Integer id);
-
-	@ApiOperation(value = "通过Mac获取二维码信息", notes = "通过Mac获取二维码信息")
-	@RequestMapping(value = "/columbia/h5/air/getTicket/{mac}")
-	Message getTicketByMac(@PathVariable(value = "mac") String mac);
-
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @Project : Columbia
- * @Package Name  : com.senthink.columbiarmi.rmi
- * @Description :
- * @Author : wanwt@senthink.com
- * @Creation Date : 2016年12月30日 上午8:50
- * @ModificationHistory Who        When          What
- * --------   ----------    -----------------------------------
- */
-public abstract class AircubeUserHystrix implements AircubeUserRemoteService {
-
-    public abstract Message registAndAuthorizeDvc(@RequestBody AircubeAuthorizeVo aircubeAuthorizeVo);
-
-    public abstract Message sendMsgToDvc(@RequestBody DvcMsgVo dvcMsg);
-
-    public abstract Message sign4JsApi(@PathVariable(value = "url") String url, @PathVariable(value = "code") String code, @PathVariable(value = "state") String state);
-
-    public abstract Message getUserOpenid(@PathVariable(value = "code") String code);
-
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Project : Columbia
- * @Package Name  : com.senthink.columbiarmi.rmi
- * @Description : 
供前台和设备厂商调用的部分接口
- * @Author : wanwt@senthink.com
- * @Creation Date : 2016年12月30日 上午8:51
- * @ModificationHistory Who        When          What
- * --------   ----------    -----------------------------------
- */
-@FeignClient(name = "columbia", fallback = AircubeUserHystrix.class)
-public interface AircubeUserRemoteService {
-    @ApiOperation(value = "通过Mac地址添加设备信息及微信认证", notes = "生产线调用该接口进行设备认证,该接口只接受同一型号产品的批量认证")
-    @RequestMapping(value = "/columbia/user/registAndAuthorizeDvc", method = RequestMethod.POST)
-    Message registAndAuthorizeDvc(@RequestBody AircubeAuthorizeVo aircubeAuthorizeVo);
-
-    @ApiOperation(value = "主动发消息给设备", notes = "默认为给设备发送请求历史数据指令，返回通道为微信服务器")
-    @RequestMapping(value = "/columbia/user/sendMsgToDvc", method = RequestMethod.POST)
-    Message sendMsgToDvc(@RequestBody DvcMsgVo dvcMsg);
-
-    @ApiOperation(value = "前台调用jsapi验证签名", notes = "前台页面调用jsapi时需请求后台证书验证签名,将微信跳转的链接前台拆分后分三个字段请求,防止符号转码")
-    @RequestMapping(value = "/columbia/user/sign4JsApi/{url}/{code}/{state}", method = RequestMethod.GET)
-    Message sign4JsApi(@PathVariable(value = "url") String url, @PathVariable(value = "code") String code, @PathVariable(value = "state") String state);
-
-    @ApiOperation(value = "oauth2获取用户openid", notes = "微信内页面跳转项目页面时返回的code用以获取该用户基本信息")
-    @RequestMapping(value = "/columbia/user/getUserOpenid/{code}", method = RequestMethod.GET)
-    Message getUserOpenid(@PathVariable(value = "code") String code);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * Created by Leaves on 2016/12/20.
- */
-public abstract class DvcBaseHystrix implements DvcBaseRemoteService {
-
-    public abstract Message list(@RequestBody(required = false) BumpDvcBaseParam bumpDvcBaseParam);
-
-    public abstract Message detail(@PathVariable(value = "dvcId") Integer dvcId);
-
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-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;
-
-/**
- * Created by Leaves on 2016/12/20.
- */
-@FeignClient(value = "columbia", fallback = DvcBaseHystrix.class)
-public interface DvcBaseRemoteService {
-
-    /**
-     * 设备查询、搜索
-     *
-     * @param bumpDvcBaseParam
-     * @return
-     */
-    @ApiOperation(value = "设备列表", notes = "设备列表分页展示、设备搜索，搜索关键词search（VCU编号、名称、车主账号、条码编号（车架号）、SIM卡号（IMSI））、searchBgnTime、searchEndTime")
-    @RequestMapping(value = "/columbia/dvcBase/list", method = RequestMethod.POST)
-    Message list(@RequestBody(required = false) BumpDvcBaseParam bumpDvcBaseParam);
-
-    /**
-     * 设备详情页
-     * 根据设备条码编号（车架号）查询设备详情，包括设备基本信息，设备使用情况，车主信息
-     *
-     * @param dvcId
-     * @return
-     */
-    @ApiOperation(value = "设备详情", notes = "根据设备 Id 查看设备详情（未包含车主信息），如返回false，则表示该条记录不存在")
-    @RequestMapping(value = {"/columbia/dvcBase/detail/{dvcId}"}, method = RequestMethod.GET)
-    Message detail(@PathVariable(value = "dvcId") Integer dvcId);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by Leaves on 2016/12/20.
- */
-public abstract class DvcCodeidHystrix implements DvcCodeidRemoteService {
-
-
-    public abstract Message list(@RequestBody(required = false) BumpDvcCodeidParam bumpDvcCodeidParam);
-
-    public abstract Message dvcCodeidAddAndEdit(@RequestBody(required = true) DvcCodeidVo dvcCodeidVo);
-
-    public abstract Message dvcCodeidEdit(@RequestParam Integer id);
-
-    public abstract Message deleteCodeidById(@PathVariable(value = "id") Integer id);
-
-    public abstract Message importExcel(HttpServletRequest httpServletRequest);
-
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by Leaves on 2016/12/20.
- */
-@FeignClient(value = "columbia", fallback = DvcCodeidHystrix.class)
-public interface DvcCodeidRemoteService {
-
-    /**
-     * 条码列表首页
-     *
-     * @param bumpDvcCodeidParam
-     * @return
-     */
-    @ApiOperation(value = "条码列表", notes = "条码列表分页展示、条码搜索，搜索关键词search（条码编号、VCU编号）")
-    @RequestMapping(value = "/columbia/code/list", method = RequestMethod.POST)
-    Message list(@RequestBody(required = false) BumpDvcCodeidParam bumpDvcCodeidParam);
-
-    /**
-     * 条码添加、更新
-     *
-     * @param dvcCodeidVo
-     * @return
-     */
-    @ApiOperation(value = "条码添加、更新", notes = "条码添加，输入信息（条码编号、VCU编号、Id=0）；更新数据，输入信息（条码编号、VCU编号、Id 为数据库实际 Id 值）")
-    @RequestMapping(value = "/columbia/code/addAndEdit", method = RequestMethod.POST)
-    Message dvcCodeidAddAndEdit(@RequestBody(required = true) DvcCodeidVo dvcCodeidVo);
-
-    /**
-     * 条码修改
-     *
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "条码修改", notes = "条码修改，根据 Id 返回需要修改的条码的原始数据，如返回 false，则表示该条记录不存在")
-    @RequestMapping(value = "/columbia/code/edit/{id}", method = RequestMethod.GET)
-    Message dvcCodeidEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * 删除条码
-     *
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "条码删除", notes = "条码删除，根据 Id 删除条码，如果该设备已经注册，则无法删除")
-    @RequestMapping(value = "/columbia/code/delete/{id}", method = RequestMethod.DELETE)
-    Message deleteCodeidById(@PathVariable(value = "id") Integer id);
-
-    /**
-     * 条码设置excel导入
-     *
-     * @param httpServletRequest
-     * @return
-     */
-    @ApiOperation(value = "条码批量导入", notes = "条码批量导入，<br/>Excel 数据格式：一共2列，需加上列名，第1列（条码编号(车架号)），第2列（设备ID），第2行开始为连续的若干行数据，其中 Excel 的 Sheet 名字为“设备条码导入”，Excel 文件名为“dataExcel.xls”；<br/>数据通过表单上传，enctype 等于 multipart/form-data；<br/>返回数据：导入数据总数，导入成功条数，导入失败数据具体位置；<br/>测试文件下载地址：http://10.18.11.16:9437/dataExcel.xls")
-    @RequestMapping(value = "/columbia/code/importExcel", method = RequestMethod.POST)
-    Message importExcel(HttpServletRequest httpServletRequest);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.validation.Valid;
-
-/**
- * The type Dvc type hystrix.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : ${CLASS_NAME}
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月16日 下午3:19
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-public abstract class DvcTypeHystrix implements DvcTypeRemoteService {
-    /**
-     * Index string.
-     *
-     * @param param the param
-     * @return the string
-     */
-    public abstract Message index(@RequestBody(required = false) BumpDvcTypeParam param);
-
-    /**
-     * Dvc type to edit string.
-     *
-     * @param id the id
-     * @return the string
-     */
-    public abstract Message dvcTypeToEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * Dvc type do edit string.
-     *
-     * @param vo the vo
-     * @return the string
-     */
-    public abstract Message dvcTypeDoEdit(@RequestBody @Valid BumpDvcTypeVo vo);
-
-    /**
-     * dvcTypeDelete
-     * @return the string
-     */
-    public abstract Message dvcTypeDelete(@PathVariable(value = "ids") String ids);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
-
-/**
- * The interface Dvc type remote service.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : DvcTypeRemoteService
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月16日 下午3:18
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-@FeignClient(name = "columbia", fallback = DvcTypeHystrix.class)
-public interface DvcTypeRemoteService {
-
-
-    /**
-     * 模型类别首页
-     *
-     * @param param the param
-     * @return string string
-     */
-    @ApiOperation(value = "模型类别", notes = "分页显示模型类别", position = 6)
-    @RequestMapping(value = {"/columbia/dvcType/list"}, method = RequestMethod.POST)
-    Message index(@RequestBody(required = false) BumpDvcTypeParam param);
-
-    /**
-     * 模型类别修改
-     *
-     * @param id the id
-     * @return string string
-     */
-    @ApiOperation(value = "编辑", notes = "编辑模型类别", position = 5)
-    @RequestMapping(value = "/columbia/dvcType/edit/{id}", method = RequestMethod.GET)
-    Message dvcTypeToEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * 模型类别新增或修改执行
-     *
-     * @param vo the vo
-     * @return string string
-     */
-    @ApiOperation(value = "编辑或者新增", notes = "执行编辑或者新增", position = 4)
-    @RequestMapping(value = "/columbia/dvcType/doSave", method = RequestMethod.POST)
-    Message dvcTypeDoEdit(@RequestBody @Valid BumpDvcTypeVo vo);
-
-    /**
-     * 删除模型类别
-     * @return the string
-     */
-    @ApiOperation(value = "删除", notes = "执行删除", position = 3)
-    @RequestMapping(value = {"/columbia/dvcType/delete/{ids}"}, method = RequestMethod.GET)
-    Message dvcTypeDelete(@PathVariable(value = "ids") String ids);
-}

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

-/**
- * 
- */
-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-
-/**
- * @ClassName           : ExternalAPIRemoteService
- * @Description         :
- * @Author              : xujialin
- * @CreationDate        : 2016年12月26日下午5:07:50
- */
-public abstract class ExternalAPIHystrix implements ExternalAPIRemoteService {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.senthink.columbiarmi.rmi.ExternalAPIRemoteService#getweather(java.
-	 * lang.Integer)
-	 */
-	@Override
-	public abstract Message getweather(Integer airId);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.senthink.columbiarmi.rmi.ExternalAPIRemoteService#getTicket()
-	 */
-	@Override
-	public abstract Message getTicket();
-
-}

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

-/**
- * 
- */
-package com.senthink.columbiarmi.rmi;
-
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.senthink.columbiarmi.response.Message;
-
-import io.swagger.annotations.ApiOperation;
-
-/**
- * @ClassName           : ExternalAPIHystrix
- * @Description         :
- * @Author              : xujialin
- * @CreationDate        : 2016年12月26日下午5:08:11
- */
-public interface ExternalAPIRemoteService {
-	@ApiOperation(value = "天气api调用", notes = "天气Api调用 返回status 与 天气数据")
-	@RequestMapping("/columbia/h5/api/weather/{airId}")
-	public Message getweather(@PathVariable Integer airId);
-
-	@ApiOperation(value = "操作ticket获取", notes = "操作ticket获取")
-	@RequestMapping("/columbia/h5/ticket/get")
-	public Message getTicket();
-
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.validation.Valid;
-
-/**
- * @Project : Columbia
- * @Package Name  : com.senthink.www.rmi
- * @Class Name    : MetaHystrix
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月16日 下午3:36
- * @ModificationHistory Who        When          What
- * --------   ----------    -----------------------------------
- */
-public abstract class MetaHystrix implements  MetaRemoteService{
-
-    public abstract Message index();
-
-    public abstract Message toEdit(@Valid @RequestBody BumpMetaVo vo);
-
-    public abstract Message edit(@PathVariable(value = "id") Integer id);
-
-    public abstract Message doDelete(@PathVariable(value = "ids") String ids);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * The interface Meta remote service.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : MetaRemoteService
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月16日 下午3:35
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-@FeignClient(name = "columbia", fallback = MetaHystrix.class)
-public interface MetaRemoteService {
-
-    /**
-     * 模型创建首页
-     *
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "模型", notes = "显示模型")
-    @RequestMapping(value = {"/columbia/meta/index"}, method = RequestMethod.GET)
-     Message index();
-
-    /**
-     * 模型创建新增和修改
-     *
-     * @param vo the vo
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "新增或修改", notes = "新增或修改模型")
-    @RequestMapping(value = "/columbia/meta/doEdit", method = RequestMethod.POST)
-     Message toEdit(@Valid @RequestBody BumpMetaVo vo);
-    /**
-     * 模型创建新增和修改
-     *
-     * @return jsonStr
-     */
-    @ApiOperation(value = "进入修改", notes = "进入修改模型")
-    @RequestMapping(value = "/columbia/meta/edit/{id}", method = RequestMethod.GET)
-     Message edit(@PathVariable(value = "id") Integer id);
-    /**
-     * 模型删除
-     *
-     * @param id the id
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "删除", notes = "删除模型")
-    @RequestMapping(value = "/columbia/meta/doDelete/{ids}", method = RequestMethod.DELETE)
-     Message doDelete(@PathVariable(value = "ids") String ids);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.validation.Valid;
-
-/**
- * The type Protocol analyze hystrix.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : ${CLASS_NAME}
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月16日 下午3:25
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-public abstract class ProtocolAnalyzeHystrix implements ProtocolAnalyzeRemoteService{
-    /**
-     * Index string.
-     *
-     * @param bpap the bpap
-     * @return the string
-     */
-    public abstract Message index(@RequestBody(required = false) BumpProtocolAnalyzeParam bpap);
-
-    /**
-     * Panalyze to add string.
-     *
-     * @return the string
-     */
-    public abstract Message panalyzeToAdd();
-
-    /**
-     * Panalyze to edit string.
-     *
-     * @param id the id
-     * @return the string
-     */
-    public abstract Message panalyzeToEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * Panalyze do add string.
-     *
-     * @param vo the vo
-     * @return the string
-     */
-    public abstract Message panalyzeDoAdd(@Valid @RequestBody BumpProtocolAnalyzeVo vo);
-
-    /**
-     * Panalyze delete string.
-     *
-     * @param id the id
-     * @return the string
-     */
-    public abstract Message panalyzeDelete(@PathVariable(value = "ids") String ids);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * The interface Protocol analyze remote service.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : ${CLASS_NAME}
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月16日 下午3:24
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-@FeignClient(name = "columbia", fallback = ProtocolAnalyzeHystrix.class)
-public interface ProtocolAnalyzeRemoteService {
-
-    /**
-     * 命令解析首页
-     *
-     * @param bpap the bpap
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "协议解析", notes = "分页显示协议解析")
-    @RequestMapping(value = {"/columbia/panalyze/list"}, method = RequestMethod.POST)
-    Message index(@RequestBody(required = false) BumpProtocolAnalyzeParam bpap);
-
-    /**
-     * 命令解析添加
-     *
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "添加", notes = "协议解析")
-    @RequestMapping(value = "/columbia/panalyze/add", method = RequestMethod.POST)
-    Message panalyzeToAdd();
-
-    /**
-     * 命令解析修改
-     *
-     * @param id the id
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "修改", notes = "协议解析修改")
-    @RequestMapping(value = "/columbia/panalyze/edit/{id}", method = RequestMethod.GET)
-    Message panalyzeToEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * 命令解析添加或修改执行
-     *
-     * @param vo the vo
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "添加或修改执行", notes = "协议解析执行添加或修改")
-    @RequestMapping(value = "/columbia/panalyze/doAdd", method = RequestMethod.POST)
-    Message panalyzeDoAdd(@Valid @RequestBody BumpProtocolAnalyzeVo vo);
-
-    /**
-     * 删除命令解析
-     *
-     * @param ids the ids
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "删除", notes = "协议解析删除")
-    @RequestMapping(value = {"/columbia/panalyze/delete/{ids}"}, method = RequestMethod.GET)
-    Message panalyzeDelete(@PathVariable(value = "ids") String ids);
-
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * The type Protocol framework hystrix.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : ProtocolFrameworkHystrix
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月15日 下午4:56
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-public abstract class ProtocolFrameworkHystrix  implements  ProtocolFrameworkRemoteService{
-
-    public abstract Message index(@RequestBody(required = false) BumpProtocolFrameworkParam bpfp);
-
-    /**
-     * Pframework to add string.
-     *
-     * @return the string
-     */
-    public abstract Message pframeworkToAdd();
-
-    /**
-     * Pframework to edit string.
-     *
-     * @param id the id
-     * @return the string
-     */
-    public abstract Message pframeworkToEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * Pframework do add string.
-     *
-     * @param pfkv the pfkv
-     * @return the string
-     */
-    public abstract Message pframeworkDoAdd(@RequestBody ProtocolFrameworkVo pfkv);
-
-    /**
-     * Pframework do edit string.
-     *
-     * @param vo the vo
-     * @return the string
-     */
-    public abstract Message pframeworkDoEdit(@RequestBody ProtocolFrameworkVo vo);
-
-    /**
-     * Pframework delete string.
-     *
-     * @param id the id
-     * @return the string
-     */
-    public abstract Message pframeworkDelete(@PathVariable(value = "ids") String ids);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * The interface Protocol framework remote service.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : ProtocolFrameworkRemoteService
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月15日 下午4:25
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-@FeignClient(name = "columbia", fallback = ProtocolFrameworkHystrix.class)
-public interface ProtocolFrameworkRemoteService {
-
-    /**
-     * 协议定义首页
-     *
-     * @param bpfp the bpfp
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "显示电车协议", notes = "分页返回电车协议", position = 6)
-    @RequestMapping(value = {"/columbia/pframework/list"}, method = RequestMethod.POST)
-    Message index(@RequestBody(required = false) BumpProtocolFrameworkParam bpfp);
-
-    /**
-     * 协议定义添加
-     *
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "添加", notes = "添加电车协议", position = 5)
-    @RequestMapping(value = "/columbia/pframework/add", method = RequestMethod.POST)
-    Message pframeworkToAdd();
-
-    /**
-     * 协议定义修改
-     *
-     * @param id the id
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "编辑", notes = "编辑电车协议", position = 4)
-    @RequestMapping(value = "/columbia/pframework/edit/{id}", method = RequestMethod.GET)
-    Message pframeworkToEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * 协议定义添加执行
-     *
-     * @param pfkv the pfkv
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "执行添加", notes = "协议定义添加执行", position = 3)
-    @RequestMapping(value = "/columbia/pframework/doAdd", method = RequestMethod.POST)
-    Message pframeworkDoAdd(@RequestBody ProtocolFrameworkVo pfkv);
-
-    /**
-     * 协议定义修改执行
-     *
-     * @param vo the vo
-     * @return string string
-     */
-    @ApiOperation(value = "执行修改", notes = "协议定义修改执行", position = 2)
-    @RequestMapping(value = "/columbia/pframework/doEdit", method = RequestMethod.POST)
-    Message pframeworkDoEdit(@RequestBody ProtocolFrameworkVo vo);
-
-    /**
-     * 删除协议定义
-     *
-     * @param id the id
-     * @return jsonStr string
-     */
-    @ApiOperation(value = "执行删除", notes = "删除协议定义", position = 1)
-    @RequestMapping(value = {"/columbia/pframework/delete/{ids}"}, method = RequestMethod.GET)
-    Message pframeworkDelete(@PathVariable(value = "ids") String ids);
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.validation.Valid;
-
-/**
- * The type Protocol param hystrix.
- *
- * @Project : Columbia
- * @Package Name : com.senthink.www.rmi
- * @Class Name : ${CLASS_NAME}
- * @Description :
- * @Author : lingcy@lierda.com
- * @Creation Date : 2016年12月16日 下午3:30
- * @ModificationHistory Who When          What --------   ----------    -----------------------------------
- */
-public abstract class ProtocolParamHystrix implements ProtocolParamRemoteService {
-
-    public abstract Message index(@RequestBody(required = false) BumpProtocolParamParam param);
-
-    /**
-     * Pparam to add string.
-     *
-     * @return the string
-     */
-    public abstract Message pparamToAdd();
-
-    /**
-     * Pparam to edit string.
-     *
-     * @param id the id
-     * @return the string
-     */
-    public abstract Message pparamToEdit(@PathVariable(value = "id") Integer id);
-
-    /**
-     * Pparam do add string.
-     *
-     * @param vo the vo
-     * @return the string
-     */
-    public abstract Message pparamDoAdd(@Valid @RequestBody ProtocolParamVo vo);
-
-    /**
-     * Pparam delete string.
-     * @return the string
-     */
-    public abstract Message pparamDelete(@PathVariable(value = "ids") String ids);
-
-    /**
-     * Select metas by framework id string.
-     *
-     * @param id the id
-     * @return the string
-     */
-    public abstract Message selectMetasByFrameworkId(@PathVariable(value = "id") Integer id);
-}

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

-package com.senthink.columbiarmi.rmi;
import com.senthink.columbiarmi.response.Message;import io.swagger.annotations.ApiOperation;import org.springframework.cloud.netflix.feign.FeignClient;import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
 * @Project : Columbia
 * @Package Name  : com.senthink.www.rmi
 * @Class Name    : ProtocolParamRemoteService
 * @Description :
 * @Author : lingcy@lierda.com
 * @Creation Date : 2016年12月16日 下午3:29
 * @ModificationHistory Who        When          What
 * --------   ----------    -----------------------------------
 */@FeignClient(name = "columbia", fallback = ProtocolParamHystrix.class)public interface ProtocolParamRemoteService {

    /**
     * 协议参数首页
     *
     * @param param
     * @return
     */
    @ApiOperation(value = "协议参数", notes = "分页显示协议参数")
    @RequestMapping(value = {"/columbia/pparam/list"}, method = RequestMethod.POST)
    Message index(@RequestBody(required = false) BumpProtocolParamParam param);

    /**
     * 协议参数添加
     *
     * @return
     */
    @ApiOperation(value = "添加", notes = "协议参数添加")
    @RequestMapping(value = "/columbia/pparam/add", method = RequestMethod.GET)
    Message pparamToAdd();

    /**
     * 协议参数修改
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "编辑", notes = "协议参数编辑")
    @RequestMapping(value = "/columbia/pparam/edit/{id}", method = RequestMethod.POST)
    Message pparamToEdit(@PathVariable(value = "id") Integer id);

    /**
     * 协议参数执行添加或修改
     *
     * @param vo
     * @return
     */
    @ApiOperation(value = "执行添加或者修改", notes = "协议参数执行添加或者修改")
    @RequestMapping(value = "/columbia/pparam/doAdd", method = RequestMethod.POST)
    Message pparamDoAdd(@Valid @RequestBody ProtocolParamVo vo);

    /**
     * 删除协议参数
     */
    @ApiOperation(value = "删除", notes = "协议参数删除")
    @RequestMapping(value = {"/columbia/pparam/delete/{ids}"}, method = RequestMethod.GET)
    Message pparamDelete(@PathVariable(value = "ids") String ids);


    @RequestMapping(value = "/columbia/pparam/getMetas/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "查询", notes = "查询所属模块或者结果赋值模块")
    Message selectMetasByFrameworkId(@PathVariable(value = "id") Integer id);
}
\ No newline at end of file

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Project : Columbia
- * @Package Name  : com.senthink.columbiarmi.rmi
- * @Description : 
微信接口抽象类
- * @Author : wanwt@senthink.com
- * @Creation Date : 2016年12月26日 下午5:16
- * @ModificationHistory Who        When          What
- * --------   ----------    -----------------------------------
- */
-public abstract class WechaMsgtHystrix {
-
-    public abstract Message receiveMsg(HttpServletRequest request, HttpServletResponse response);
-
-    public abstract Message receiveDvcMsg(HttpServletRequest request, HttpServletResponse response);
-
-}

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

-package com.senthink.columbiarmi.rmi;
-
-import com.senthink.columbiarmi.response.Message;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Project : Columbia
- * @Package Name  : com.senthink.columbiarmi.rmi
- * @Description : 
微信相关接口
- * @Author : wanwt@senthink.com
- * @Creation Date : 2016年12月26日 下午5:18
- * @ModificationHistory Who        When          What
- * --------   ----------    -----------------------------------
- */
-@FeignClient(name = "columbia", fallback = WechaMsgtHystrix.class)
-public interface WechatMsgRemoteService {
-
-    @ApiOperation(value = "微信回调接口", notes = "微信回调信息(用户关注，上报地理位置，绑定设备等事件)都转发到该接口")
-    @RequestMapping(value = "/columbia/reply/receiveMsg", method = RequestMethod.POST)
-    Message receiveMsg(HttpServletRequest request, HttpServletResponse response);
-
-    @ApiOperation(value = "微信硬件回调接口（仅公众平台启用时有效）", notes = "微信硬件回调信息(设备发送消息到服务器，绑定设备等事件)都转发到该接口")
-    @RequestMapping(value = "/columbia/reply/receiveDvcMsg", method = RequestMethod.POST)
-    Message receiveDvcMsg(HttpServletRequest request, HttpServletResponse response);
-
-}

src/main/java/com/senthink/rmi/challenger/vo/OrgStructureVo.java → src/main/java/com/senthink/rmi/challenger/vo/EllaOrgStructureVo.java

@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 
 import java.io.Serializable;
 
-public class OrgStructureVo implements Serializable {
+public class EllaOrgStructureVo implements Serializable {
 
     private static final long serialVersionUID = -5620497436811285836L;
 	private Integer id;

src/main/java/com/senthink/rmi/challenger/vo/PagePermissionVo.java → src/main/java/com/senthink/rmi/challenger/vo/EllaPagePermissionVo.java

@@ -5,7 +5,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
-public class PagePermissionVo extends Entity implements Serializable{
+public class EllaPagePermissionVo extends Entity implements Serializable{
 
     private static final long serialVersionUID = -7961685214504407072L;
 /**

src/main/java/com/senthink/rmi/challenger/vo/RoleVo.java → src/main/java/com/senthink/rmi/challenger/vo/EllaRoleVo.java

@@ -6,7 +6,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
-public class RoleVo extends Entity implements Serializable {
+public class EllaRoleVo extends Entity implements Serializable {
 
 	private static final long serialVersionUID = -2100630863868299080L;
 	

src/main/java/com/senthink/rmi/challenger/vo/SubsystemSyncVo.java → src/main/java/com/senthink/rmi/challenger/vo/EllaSubsystemSyncVo.java

@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.NotBlank;
 
 import java.io.Serializable;
 
-public class SubsystemSyncVo extends Entity implements Serializable {
+public class EllaSubsystemSyncVo extends Entity implements Serializable {
 
     private static final long serialVersionUID = -4888387947052885316L;
 /**

src/main/java/com/senthink/rmi/challenger/vo/SubsystemVo.java → src/main/java/com/senthink/rmi/challenger/vo/EllaSubsystemVo.java

@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 
 import java.io.Serializable;
 
-public class SubsystemVo extends Entity implements Serializable {
+public class EllaSubsystemVo extends Entity implements Serializable {
 
     private static final long serialVersionUID = -3691640953750630217L;
 /**

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

@@ -6,7 +6,7 @@ import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.util.Date;
 
-public class UserBaseVo implements Serializable {
+public class EllaUserBaseVo implements Serializable {
 
     private static final long serialVersionUID = -3641762319070709334L;
     

src/main/java/com/senthink/rmi/challenger/vo/UserExtendsVo.java → src/main/java/com/senthink/rmi/challenger/vo/EllaUserExtendsVo.java

@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 
 import java.io.Serializable;
 
-public class UserExtendsVo extends Entity implements Serializable {
+public class EllaUserExtendsVo extends Entity implements Serializable {
 
     private static final long serialVersionUID = -1480244651888427349L;
     /**

src/main/java/com/senthink/rmi/challenger/vo/UserTypeVo.java → src/main/java/com/senthink/rmi/challenger/vo/EllaUserTypeVo.java

@@ -6,7 +6,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 
 import java.io.Serializable;
 
-public class UserTypeVo extends Entity implements Serializable{
+public class EllaUserTypeVo extends Entity implements Serializable{
 
     private static final long serialVersionUID = -3642681516157405674L;
 /**