Merge branch 'dmp_dev' of http://gitlab.ioubuy.cn/yaobenzhang/jz-dmp-service into dmp_dev

pom.xml

@@ -262,6 +262,16 @@
 			<artifactId>httpclient</artifactId>
 			<version>4.5.3</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
+		<!-- 引入boot-security权限框架 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+	    <dependency>
+	        <groupId>org.springframework.security</groupId>
+	        <artifactId>spring-security-test</artifactId>
+	        <scope>test</scope>
+	    </dependency>
 	</dependencies>
 	<build>
 		<finalName>jz-dmp-service</finalName>

src/main/java/com/jz/common/bean/BaseBeanResponse.java

+package com.jz.common.bean;
+
+import java.util.List;
+
+/**
+ * @author ybz
+ *
+ */
+public class BaseBeanResponse<T> extends BaseResponse {
+	
+	private T data;
+	
+	private List<T> datas;
+	
+	public BaseBeanResponse(){
+		super();
+	}
+	
+	public BaseBeanResponse(String code, T data) {
+		super(code);
+		this.data = data;
+	}
+	
+	public BaseBeanResponse(String code, List<T> datas) {
+		super(code);
+		this.datas = datas;
+	}
+	
+	public BaseBeanResponse(String code, String message, T data) {
+		super(code, message);
+		this.data = data;
+	}
+	
+	public BaseBeanResponse(String code, String message, List<T> datas) {
+		super(code, message);
+		this.datas = datas;
+	}
+
+	public T getData() {
+		return data;
+	}
+
+	public void setData(T data) {
+		this.data = data;
+	}
+
+	public List<T> getDatas() {
+		return datas;
+	}
+
+	public void setDatas(List<T> datas) {
+		this.datas = datas;
+	}
+	
+}

src/main/java/com/jz/common/bean/BaseResponse.java

+package com.jz.common.bean;
+
+/**
+ * @author ybz
+ *
+ */
+public class BaseResponse {
+	//错误码
+	private String code;
+	//错误消息
+	private String message;
+	
+	public BaseResponse() {}
+	
+	public BaseResponse(String code) {
+		this.code = code;
+	}
+	
+	public BaseResponse(String code, String message) {
+		this.code = code;
+		this.message = message;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	
+}

src/main/java/com/jz/common/bean/PageInfoResponse.java

+package com.jz.common.bean;
+
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @author ybz
+ *
+ */
+public class PageInfoResponse<T> extends BaseResponse {
+	
+	private PageInfo<T> data;
+
+	public PageInfo<T> getData() {
+		return data;
+	}
+
+	public void setData(PageInfo<T> data) {
+		this.data = data;
+	}
+
+}

src/main/java/com/jz/common/interceptor/CustomUserService.java

+package com.jz.common.interceptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import com.jz.dmp.modules.model.DmpMember;
+import com.jz.dmp.modules.service.sys.DmpMemberService;
+
+@Service
+public class CustomUserService implements UserDetailsService {
+	
+	//@Autowired
+	//DmpMemberprojectrole projectMemberRoleDao;
+	@Autowired
+	DmpMemberService dmpMemberService;
+
+	@Override
+	public UserDetails loadUserByUsername(String userName) {
+		DmpMember user = null;
+		try {
+			user = dmpMemberService.findByUserName(userName);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		if (user != null) {
+			
+			List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
+			//List<DmpPermission> permissions = permissionDao.getDmpDefaultPermission();
+			/*
+			 * DmpProjectMemberRole pmr = new DmpProjectMemberRole();
+			 * pmr.setMemberId(userName); List<DmpProjectMemberRole> mrs =
+			 * projectMemberRoleDao.getMemberProjectRole(pmr); for (DmpProjectMemberRole mr
+			 * : mrs) { if (mr != null) { GrantedAuthority grantedAuthority = new
+			 * CustomGrantedAuthority( mr.getProjectId().intValue(), mr.getRoleId());
+			 * grantedAuthorities.add(grantedAuthority); } }
+			 * user.setGrantedAuthorities(grantedAuthorities);
+			 */
+			
+			return user;
+		} else {
+			throw new UsernameNotFoundException("用户: " + userName + " 不存在!");
+		}
+	}
+}
\ No newline at end of file

src/main/java/com/jz/common/interceptor/MyAccessDecisionManager.java

+package com.jz.common.interceptor;
+
+import java.util.Collection;
+
+import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.stereotype.Component;
+
+/** 
+* @ClassName: MyAccessDecisionManager 
+* @Description: TODO(这里用一句话描述这个类的作用) 
+* @author ybz 
+* @date 2017年12月15日 下午5:16:30 
+*  
+*/
+@Component
+public class MyAccessDecisionManager implements AccessDecisionManager {
+
+	
+	/* (非 Javadoc) 
+	* <p>Title: decide</p> 
+	* <p>Description: </p> 
+	* @param arg0
+	* @param arg1
+	* @param arg2
+	* @throws AccessDeniedException
+	* @throws InsufficientAuthenticationException 
+	* @see org.springframework.security.access.AccessDecisionManager#decide(org.springframework.security.core.Authentication, java.lang.Object, java.util.Collection) 
+	*/
+	//decide 方法是判定是否拥有权限的决策方法。
+	//authentication 是UserDetailService实现中循环添加到GrantedAuthority对象中的权限信息集合
+	//object 包含客户端发起的请求的request信息，可转换为 HttpServletRequest request = ((FilterInvocation)object).getHttpRequest();
+	//configAttribute 为MyInvocationSecurityMetadataSource的getAttributes(Object object)这个方法返回的结果，此方法是为了判定用户请求的url
+	//是否在权限表中，如果在权限表中，则返回给decide方法，用来判定用户是否有此权限。如过不在权限表中则放行。
+	@Override
+	public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes)
+			throws AccessDeniedException, InsufficientAuthenticationException {
+		if (configAttributes==null || configAttributes.size()<=0) {
+			return ;
+		}
+		
+		String needRole;
+		for (ConfigAttribute configAttribute : configAttributes) {
+			needRole = configAttribute.getAttribute();
+			for (GrantedAuthority grantedAuthority : authentication.getAuthorities()) {
+				if (needRole.trim().equals(grantedAuthority.getAuthority())) {
+					return ;
+				}
+			}
+		}
+		
+		throw new AccessDeniedException("no right");
+		
+	}
+
+	@Override
+	public boolean supports(ConfigAttribute attribute) {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	@Override
+	public boolean supports(Class<?> clazz) {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+}

src/main/java/com/jz/common/interceptor/MyFilterSecurityInterceptor.java

+package com.jz.common.interceptor;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.SecurityMetadataSource;
+import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
+import org.springframework.security.access.intercept.InterceptorStatusToken;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
+import org.springframework.stereotype.Component;
+
+/** 
+* @ClassName: MyFilterSecurityInterceptor 
+* @Description: TODO(这里用一句话描述这个类的作用) 
+* @author ybz 
+* @date 2017年12月15日 下午5:08:09 
+*  
+*/
+@Component
+public class MyFilterSecurityInterceptor extends AbstractSecurityInterceptor implements Filter {
+	
+	@Autowired
+	private FilterInvocationSecurityMetadataSource securityMetadataSource;
+	
+	
+	@Autowired
+	public void setMyAccessDecisionManager(MyAccessDecisionManager myAccessDecisionManager){
+		super.setAccessDecisionManager(myAccessDecisionManager);
+	}
+	
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+			throws IOException, ServletException {
+		
+		FilterInvocation fi = new FilterInvocation(request, response, chain);
+		invoke(fi);
+	}  
+	
+	public void invoke(FilterInvocation fi)throws IOException, ServletException{
+		//fi里面存在一个被拦截的url
+		//里面调用MyInvocationSecurityMetedataSrouce的getAttributes(Object object)这个方法获取fi对应的所有权限
+		//再调用MyAccessDecisionManager的decide方法来检验用户的权限是否足够
+		
+		InterceptorStatusToken token = super.beforeInvocation(fi);
+		
+		try {
+			fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
+		} finally {
+			super.afterInvocation(token, null);
+		}
+		
+	}
+
+	@Override
+	public void destroy() {
+		
+	}
+
+	@Override
+	public Class<?> getSecureObjectClass() {
+		return FilterInvocation.class;
+	}
+
+	@Override
+	public SecurityMetadataSource obtainSecurityMetadataSource() {
+		return this.securityMetadataSource;
+	}
+
+}

src/main/java/com/jz/common/interceptor/MyInvocationSecurityMetadataSource.java

+package com.jz.common.interceptor;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.stereotype.Component;
+
+//import com.jz.dmp.web.ui.modules.sys.repository.domain.DmpSystemMenu;
+//import com.jz.dmp.web.ui.modules.sys.service.DmpSystemMenuService;
+
+/** 
+* @ClassName: MyInvocationSecurityMetadataSource
+* @Description: TODO(这里用一句话描述这个类的作用) 
+* @author ybz 
+* @date 2017年12月15日 下午5:54:15 
+*  
+*/
+@Component
+public class MyInvocationSecurityMetadataSource implements FilterInvocationSecurityMetadataSource {
+	
+	private static final Logger logger = LoggerFactory.getLogger(MyInvocationSecurityMetadataSource.class);
+	
+	private boolean isExpire;//加载资源是否过期
+	
+	//@Autowired
+	//private DmpSystemMenuService dspSystemMenuService;
+	
+	private Map<String, Collection<ConfigAttribute>> map = null;
+	
+	//加载权限表中所有权限
+	@SuppressWarnings("unused")
+	public void loadResourceDefine(){
+		map = new HashMap<>();
+		Collection<ConfigAttribute> configAttributes;
+		ConfigAttribute cfg;
+		
+		System.err.println("1234444444444444444--------------------");
+		/*List<DmpSystemMenu> resources = dspSystemMenuService.findAllList();
+		for (DmpSystemMenu dspSystemMenu : resources) {
+			configAttributes = new ArrayList<>();
+			cfg = new SecurityConfig(dspSystemMenu.getMenuTarget());
+			//此处只添加了用户的名字，其实还可以添加更多的权限信息，例如请求方法到ConfigAttribute的集合中去。
+			//此处添加的信息将会作为MyAccessDecisionManager类的decide的第三个参数。
+			configAttributes.add(cfg);
+			//用权限的getUrl()作为map的key，用configAttribute的集合作为value。
+			map.put(dspSystemMenu.getMenuHref(), configAttributes);
+			
+		}*/
+		
+	}
+
+	@Override
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	//此方法是为了判定用户请求的url是否在权限表中，如果在权限表中，则返回给decide方法，用来判定用户是否有此权限。如果不在权限表中则放行。
+	@Override
+	public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
+		
+		if (map == null || isExpire) {//如果map为null 或者资源过期，则重新加载资源
+			logger.info("资源重新加载...");
+			loadResourceDefine();
+			isExpire = false;
+		}
+		//object中包含用户请求的request信息
+		HttpServletRequest request = ((FilterInvocation)object).getHttpRequest();
+		AntPathRequestMatcher matcher;
+		String resUrl;
+		for (Entry<String, Collection<ConfigAttribute>> entry : map.entrySet()) {
+			resUrl = entry.getKey();
+			matcher = new AntPathRequestMatcher(resUrl);
+			if (matcher.matches(request)) {
+				return entry.getValue();
+			}
+		}
+		
+		return null;
+	}
+
+	@Override
+	public boolean supports(Class<?> arg0) {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	/** 
+	* @Title: setExpire 
+	* @Description: TODO(设置是否过期) 
+	* @param @param isExpire    设定文件 
+	* @return void    返回类型 
+	* @throws 
+	*/
+	public void setExpire(boolean isExpire) {
+		this.isExpire = isExpire;
+	}
+
+}

src/main/java/com/jz/common/interceptor/MyPasswordEncoder.java

+package com.jz.common.interceptor;
+
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
+/** 
+* @ClassName: MyPasswordEncoder 
+* @Description: TODO(这里用一句话描述这个类的作用) 
+* @author ybz 
+* @date 2017年12月21日 下午5:23:19 
+*  
+*/
+@Component
+public class MyPasswordEncoder implements PasswordEncoder{
+
+	@Override
+	public boolean matches(CharSequence rawPassword, String encodedPassword) {
+		// TODO Auto-generated method stub
+		return encodedPassword.equals(encodedPassword);
+	}
+	
+	@Override
+	public String encode(CharSequence rawPassword) {
+		// TODO Auto-generated method stub
+		return (String)rawPassword;
+	}
+
+}

src/main/java/com/jz/common/persistence/BaseService.java

@@ -9,6 +9,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+
 import java.math.BigDecimal;
 import java.security.Key;
 import java.util.Base64;
@@ -67,5 +69,16 @@ public class BaseService {
         }
         return str;
     }
+    
+    /**获取当前用户的主键
+     * @param httpRequest
+     * @return
+     * @throws Exception
+     */
+    public Integer getHttpRequestUserId(HttpServletRequest httpRequest)throws Exception{
+    	
+        
+        return null;
+    }
 
 }

src/main/java/com/jz/dmp/config/DataSourceConfig1.java

@@ -68,7 +68,7 @@ public class DataSourceConfig1 {
             sessionFactory.setConfigLocation(new ClassPathResource("mybatis-config.xml"));
             
     		sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
-    				.getResources("classpath:mapper/dmp/*.xml"));
+    				.getResources("classpath:mapper/*/*.xml"));
             return sessionFactory.getObject();  
         } catch (Exception e) {
             throw new RuntimeException(e);  

src/main/java/com/jz/dmp/config/SecurityConfiguration.java

+package com.jz.dmp.config;
+
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jz.common.interceptor.MyFilterSecurityInterceptor;
+
+@Configuration
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+	@Autowired
+	private MyFilterSecurityInterceptor myFilterSecurityInterceptor;
+
+  @Override
+  protected void configure(HttpSecurity http) throws Exception {
+      http
+      .csrf().disable()
+      .httpBasic().authenticationEntryPoint((request,response,authException) -> {
+			response.setContentType("application/json;charset=utf-8");
+			response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+			PrintWriter out = response.getWriter();
+			Map<String,Object> map = new HashMap<String,Object>();
+			map.put("code",403);
+			map.put("message","未登录");
+			out.write(JSONObject.toJSONString(map));
+			out.flush();
+			out.close();
+		})
+      .and()
+          .authorizeRequests()
+            .antMatchers("/login","/logout").permitAll()
+            .anyRequest().authenticated()
+            .and()
+            .formLogin().loginProcessingUrl("/login")
+            .failureHandler((request,response,ex) -> {
+				response.setContentType("application/json;charset=utf-8");
+				response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+				PrintWriter out = response.getWriter();
+				Map<String,Object> map = new HashMap<String,Object>();
+				map.put("code",401);
+				if (ex instanceof UsernameNotFoundException || ex instanceof BadCredentialsException) {
+					map.put("message","用户名或密码错误");
+				} else if (ex instanceof DisabledException) {
+					map.put("message","账户被禁用");
+				} else {
+					map.put("message","登录失败!");
+				}
+				out.write(JSONObject.toJSONString(map));
+				out.flush();
+				out.close();
+			})
+            //登录成功，返回json
+			.successHandler((request,response,authentication) -> {
+				Map<String,Object> map = new HashMap<String,Object>();
+				map.put("code",200);
+				map.put("message","登录成功");
+				map.put("data",authentication);
+				response.setContentType("application/json;charset=utf-8");
+				PrintWriter out = response.getWriter();
+				out.write(JSONObject.toJSONString(map));
+				out.flush();
+				out.close();
+			})
+			.and()
+			//.addFilter(myFilterSecurityInterceptor)
+			//.addFilterAfter(myFilterSecurityInterceptor, afterFilter)
+			.exceptionHandling()
+			//没有权限返回json
+			.accessDeniedHandler((request,response,ex) -> {
+				response.setContentType("application/json;charset=utf-8");
+				response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+				PrintWriter out = response.getWriter();
+				Map<String,Object> map = new HashMap<String,Object>();
+				map.put("code",403);
+				map.put("message", "权限不足");
+				out.write(JSONObject.toJSONString(map));
+				out.flush();
+				out.close();
+			})
+			.and()
+			.logout()
+			//退出成功，返回json
+			.logoutSuccessHandler((request,response,authentication) -> {
+				Map<String,Object> map = new HashMap<String,Object>();
+				map.put("code",200);
+				map.put("message","退出成功");
+				map.put("data",authentication);
+				response.setContentType("application/json;charset=utf-8");
+				PrintWriter out = response.getWriter();
+				out.write(JSONObject.toJSONString(map));
+				out.flush();
+				out.close();
+			})
+			.permitAll();
+  }
+  
+  
+
+  
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/DmpMemberController.java

+package com.jz.dmp.modules.controller.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.common.constant.ResultCode;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberRequest;
+import com.jz.dmp.modules.model.DmpMember;
+import com.jz.dmp.modules.service.sys.DmpMemberService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户表Controller
+ * @author ybz
+ *
+ */
+@RestController
+@RequestMapping("/dmp/member")
+@Api(tags = "用户表")
+public class DmpMemberController {
+	
+	@Autowired
+	private DmpMemberService dmpMemberService;
+	
+	/**列表查询用户表
+	 * @param dmpMemberRequest
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST, value = "/findList")
+	@ApiOperation(value = "列表查询用户表", notes = "列表查询用户表")
+	public PageInfoResponse<DmpMemberDto> findList(@RequestBody DmpMemberRequest dmpMemberRequest, HttpServletRequest httpRequest){
+		PageInfoResponse<DmpMemberDto> pageInfo = new PageInfoResponse<DmpMemberDto>();
+		try {
+			pageInfo = dmpMemberService.findList(dmpMemberRequest, httpRequest);
+		} catch (Exception e) {
+			pageInfo.setMessage("查询失败");
+			pageInfo.setCode(ResultCode.INTERNAL_SERVER_ERROR.val());
+			e.printStackTrace();
+		}
+		
+		return pageInfo;
+	}
+	
+	
+	/**主键查询用户表
+	 * @param dmpMemberRequest
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST, value = "/view")
+	@ApiOperation(value = "主键查询用户表", notes = "主键查询用户表")
+	public BaseBeanResponse<DmpMemberDto> view(@RequestBody DmpMemberRequest dmpMemberRequest, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpMemberDto> baseBeanResponse = new BaseBeanResponse<DmpMemberDto>();
+		try {
+			baseBeanResponse = dmpMemberService.findById(dmpMemberRequest, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("请求失败");
+			baseBeanResponse.setCode(ResultCode.INTERNAL_SERVER_ERROR.val());
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+	/**删除用户表
+	 * @param dmpMemberRequest
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST, value = "/delete")
+	@ApiOperation(value = "删除用户表", notes = "删除用户表")
+	public BaseResponse delete(@RequestBody DmpMemberRequest dmpMemberRequest, HttpServletRequest httpRequest){
+		BaseResponse baseResponse = new BaseResponse();
+		try {
+			baseResponse = dmpMemberService.deleteById(dmpMemberRequest, httpRequest);
+		} catch (Exception e) {
+			baseResponse.setMessage("删除失败");
+			baseResponse.setCode(ResultCode.INTERNAL_SERVER_ERROR.val());
+			e.printStackTrace();
+		}
+		
+		return baseResponse;
+	}
+	
+	/**新增用户表
+	 * @param dmpMemberRequest
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST, value = "/add")
+	@ApiOperation(value = "新增用户表", notes = "新增用户表")
+	public BaseBeanResponse<DmpMember> add(@RequestBody DmpMember dmpMember, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpMember> baseBeanResponse = new BaseBeanResponse<DmpMember>();
+		try {
+			baseBeanResponse = dmpMemberService.add(dmpMember, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("新增失败");
+			baseBeanResponse.setCode(ResultCode.INTERNAL_SERVER_ERROR.val());
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+	/**批量新增用户表
+	 * @param dmpMemberRequest
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST, value = "/addBatch")
+	@ApiOperation(value = "批量新增用户表", notes = "批量新增用户表")
+	public BaseBeanResponse<DmpMemberBatch> addBatch(@RequestBody DmpMemberBatch dmpMemberBatch, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpMemberBatch> baseBeanResponse = new BaseBeanResponse<DmpMemberBatch>();
+		try {
+			baseBeanResponse = dmpMemberService.addBatch(dmpMemberBatch, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("批量新增失败");
+			baseBeanResponse.setCode(ResultCode.INTERNAL_SERVER_ERROR.val());
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+	/**修改用户表
+	 * @param dmpMemberRequest
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST, value = "/edit")
+	@ApiOperation(value = "修改用户表", notes = "修改用户表")
+	public BaseBeanResponse<DmpMember> edit(@RequestBody DmpMember dmpMember, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpMember> baseBeanResponse = new BaseBeanResponse<DmpMember>();
+		try {
+			baseBeanResponse = dmpMemberService.edit(dmpMember, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("修改失败");
+			baseBeanResponse.setCode(ResultCode.INTERNAL_SERVER_ERROR.val());
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpCodeDictionaryBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpCodeDictionary;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpCodeDictionaryBatch {
+	
+	private List<DmpCodeDictionary> dmpCodeDictionarys;
+
+	public List<DmpCodeDictionary> getDmpCodeDictionarys() {
+		return dmpCodeDictionarys;
+	}
+
+	public void setDmpCodeDictionarys(List<DmpCodeDictionary> dmpCodeDictionarys) {
+		this.dmpCodeDictionarys = dmpCodeDictionarys;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpCodeDictionaryDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpCodeDictionary;
+
+import io.swagger.annotations.ApiModel;
+
+/**编码字典Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "编码字典Dto", description = "编码字典Dto")
+public class DmpCodeDictionaryDto extends DmpCodeDictionary {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpCodeDictionaryRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.Date;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**编码字典参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "编码字典参数请求封装", description = "编码字典参数请求封装")
+public class DmpCodeDictionaryRequest extends BasePageBean {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+	private Integer codeId;
+
+	/**
+	* 编码分类
+	*/
+	@ApiModelProperty(value = "编码分类")
+	private String codeType;
+
+	/**
+	* 编码CODE
+	*/
+	@ApiModelProperty(value = "编码CODE")
+	private String codeKey;
+
+	/**
+	* 编码值
+	*/
+	@ApiModelProperty(value = "编码值")
+	private String codeValue;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+	private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+	private Integer createUserId;
+
+	/**
+	* 创建时间起
+	*/
+	@ApiModelProperty(value = "创建时间起")
+	private Date createTimeStart;
+
+	/**
+	* 创建时间止
+	*/
+	@ApiModelProperty(value = "创建时间止")
+	private Date createTimeEnd;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+	private Integer updateUserId;
+
+	/**
+	* 修改时间起
+	*/
+	@ApiModelProperty(value = "修改时间起")
+	private Date updateTimeStart;
+
+	/**
+	* 修改时间止
+	*/
+	@ApiModelProperty(value = "修改时间止")
+	private Date updateTimeEnd;
+
+	public Integer getCodeId() {
+		return codeId;
+	}
+
+	public void setCodeId(Integer codeId) {
+		this.codeId = codeId;
+	}
+
+	public String getCodeType() {
+		return codeType;
+	}
+
+	public void setCodeType(String codeType) {
+		this.codeType = codeType;
+	}
+
+	public String getCodeKey() {
+		return codeKey;
+	}
+
+	public void setCodeKey(String codeKey) {
+		this.codeKey = codeKey;
+	}
+
+	public String getCodeValue() {
+		return codeValue;
+	}
+
+	public void setCodeValue(String codeValue) {
+		this.codeValue = codeValue;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTimeStart() {
+		return createTimeStart;
+	}
+
+	public void setCreateTimeStart(Date createTimeStart) {
+		this.createTimeStart = createTimeStart;
+	}
+
+	public Date getCreateTimeEnd() {
+		return createTimeEnd;
+	}
+
+	public void setCreateTimeEnd(Date createTimeEnd) {
+		this.createTimeEnd = createTimeEnd;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTimeStart() {
+		return updateTimeStart;
+	}
+
+	public void setUpdateTimeStart(Date updateTimeStart) {
+		this.updateTimeStart = updateTimeStart;
+	}
+
+	public Date getUpdateTimeEnd() {
+		return updateTimeEnd;
+	}
+
+	public void setUpdateTimeEnd(Date updateTimeEnd) {
+		this.updateTimeEnd = updateTimeEnd;
+	}
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpMember;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpMemberBatch {
+	
+	private List<DmpMember> dmpMembers;
+
+	public List<DmpMember> getDmpMembers() {
+		return dmpMembers;
+	}
+
+	public void setDmpMembers(List<DmpMember> dmpMembers) {
+		this.dmpMembers = dmpMembers;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpMember;
+
+import io.swagger.annotations.ApiModel;
+
+/**用户表Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户表Dto", description = "用户表Dto")
+public class DmpMemberDto extends DmpMember {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberProjectRoleBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpMemberProjectRole;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpMemberProjectRoleBatch {
+	
+	private List<DmpMemberProjectRole> dmpMemberProjectRoles;
+
+	public List<DmpMemberProjectRole> getDmpMemberProjectRoles() {
+		return dmpMemberProjectRoles;
+	}
+
+	public void setDmpMemberProjectRoles(List<DmpMemberProjectRole> dmpMemberProjectRoles) {
+		this.dmpMemberProjectRoles = dmpMemberProjectRoles;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberProjectRoleDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpMemberProjectRole;
+
+import io.swagger.annotations.ApiModel;
+
+/**用户项目角色表Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户项目角色表Dto", description = "用户项目角色表Dto")
+public class DmpMemberProjectRoleDto extends DmpMemberProjectRole {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberProjectRoleRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**用户项目角色表参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户项目角色表参数请求封装", description = "用户项目角色表参数请求封装")
+public class DmpMemberProjectRoleRequest extends BasePageBean {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+	private Integer memberProjectRoleId;
+
+	/**
+	* 用户ID
+	*/
+	@ApiModelProperty(value = "用户ID")
+	private Integer userId;
+
+	/**
+	* 项目ID
+	*/
+	@ApiModelProperty(value = "项目ID")
+	private Integer projectId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+	private Integer roleId;
+
+	public Integer getMemberProjectRoleId() {
+		return memberProjectRoleId;
+	}
+
+	public void setMemberProjectRoleId(Integer memberProjectRoleId) {
+		this.memberProjectRoleId = memberProjectRoleId;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Integer projectId) {
+		this.projectId = projectId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.Date;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**用户表参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户表参数请求封装", description = "用户表参数请求封装")
+public class DmpMemberRequest extends BasePageBean {
+	/**
+	* 用户ID
+	*/
+	@ApiModelProperty(value = "用户ID")
+	private Integer userId;
+
+	/**
+	* 登录账号
+	*/
+	@ApiModelProperty(value = "登录账号")
+	private String userAccount;
+
+	/**
+	* 用户名称
+	*/
+	@ApiModelProperty(value = "用户名称")
+	private String userName;
+
+	/**
+	* 登录密码
+	*/
+	@ApiModelProperty(value = "登录密码")
+	private String userPassword;
+
+	/**
+	* 联系电话
+	*/
+	@ApiModelProperty(value = "联系电话")
+	private String userPhone;
+
+	/**
+	* 登录IP
+	*/
+	@ApiModelProperty(value = "登录IP")
+	private String loginIp;
+
+	/**
+	* 最近登录时间起
+	*/
+	@ApiModelProperty(value = "最近登录时间起")
+	private Date loginTimeStart;
+
+	/**
+	* 最近登录时间止
+	*/
+	@ApiModelProperty(value = "最近登录时间止")
+	private Date loginTimeEnd;
+
+	/**
+	* 是否登录锁定(0：否，1：是)
+	*/
+	@ApiModelProperty(value = "是否登录锁定(0：否，1：是)")
+	private String loginLocked;
+
+	/**
+	* 连续登录错误次数
+	*/
+	@ApiModelProperty(value = "连续登录错误次数")
+	private Integer loginErrtimes;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+	private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+	private Integer createUserId;
+
+	/**
+	* 创建时间起
+	*/
+	@ApiModelProperty(value = "创建时间起")
+	private Date createTimeStart;
+
+	/**
+	* 创建时间止
+	*/
+	@ApiModelProperty(value = "创建时间止")
+	private Date createTimeEnd;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+	private Integer updateUserId;
+
+	/**
+	* 修改时间起
+	*/
+	@ApiModelProperty(value = "修改时间起")
+	private Date updateTimeStart;
+
+	/**
+	* 修改时间止
+	*/
+	@ApiModelProperty(value = "修改时间止")
+	private Date updateTimeEnd;
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getUserAccount() {
+		return userAccount;
+	}
+
+	public void setUserAccount(String userAccount) {
+		this.userAccount = userAccount;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserPassword() {
+		return userPassword;
+	}
+
+	public void setUserPassword(String userPassword) {
+		this.userPassword = userPassword;
+	}
+
+	public String getUserPhone() {
+		return userPhone;
+	}
+
+	public void setUserPhone(String userPhone) {
+		this.userPhone = userPhone;
+	}
+
+	public String getLoginIp() {
+		return loginIp;
+	}
+
+	public void setLoginIp(String loginIp) {
+		this.loginIp = loginIp;
+	}
+
+	public Date getLoginTimeStart() {
+		return loginTimeStart;
+	}
+
+	public void setLoginTimeStart(Date loginTimeStart) {
+		this.loginTimeStart = loginTimeStart;
+	}
+
+	public Date getLoginTimeEnd() {
+		return loginTimeEnd;
+	}
+
+	public void setLoginTimeEnd(Date loginTimeEnd) {
+		this.loginTimeEnd = loginTimeEnd;
+	}
+
+	public String getLoginLocked() {
+		return loginLocked;
+	}
+
+	public void setLoginLocked(String loginLocked) {
+		this.loginLocked = loginLocked;
+	}
+
+	public Integer getLoginErrtimes() {
+		return loginErrtimes;
+	}
+
+	public void setLoginErrtimes(Integer loginErrtimes) {
+		this.loginErrtimes = loginErrtimes;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTimeStart() {
+		return createTimeStart;
+	}
+
+	public void setCreateTimeStart(Date createTimeStart) {
+		this.createTimeStart = createTimeStart;
+	}
+
+	public Date getCreateTimeEnd() {
+		return createTimeEnd;
+	}
+
+	public void setCreateTimeEnd(Date createTimeEnd) {
+		this.createTimeEnd = createTimeEnd;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTimeStart() {
+		return updateTimeStart;
+	}
+
+	public void setUpdateTimeStart(Date updateTimeStart) {
+		this.updateTimeStart = updateTimeStart;
+	}
+
+	public Date getUpdateTimeEnd() {
+		return updateTimeEnd;
+	}
+
+	public void setUpdateTimeEnd(Date updateTimeEnd) {
+		this.updateTimeEnd = updateTimeEnd;
+	}
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberRoleBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpMemberRole;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpMemberRoleBatch {
+	
+	private List<DmpMemberRole> dmpMemberRoles;
+
+	public List<DmpMemberRole> getDmpMemberRoles() {
+		return dmpMemberRoles;
+	}
+
+	public void setDmpMemberRoles(List<DmpMemberRole> dmpMemberRoles) {
+		this.dmpMemberRoles = dmpMemberRoles;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberRoleDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpMemberRole;
+
+import io.swagger.annotations.ApiModel;
+
+/**用户角色关系表Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户角色关系表Dto", description = "用户角色关系表Dto")
+public class DmpMemberRoleDto extends DmpMemberRole {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberRoleRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**用户角色关系表参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户角色关系表参数请求封装", description = "用户角色关系表参数请求封装")
+public class DmpMemberRoleRequest extends BasePageBean {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+	private Integer userRoleId;
+
+	/**
+	* 用户ID
+	*/
+	@ApiModelProperty(value = "用户ID")
+	private Integer userId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+	private Integer roleId;
+
+	public Integer getUserRoleId() {
+		return userRoleId;
+	}
+
+	public void setUserRoleId(Integer userRoleId) {
+		this.userRoleId = userRoleId;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpPermissionBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpPermission;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpPermissionBatch {
+	
+	private List<DmpPermission> dmpPermissions;
+
+	public List<DmpPermission> getDmpPermissions() {
+		return dmpPermissions;
+	}
+
+	public void setDmpPermissions(List<DmpPermission> dmpPermissions) {
+		this.dmpPermissions = dmpPermissions;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpPermissionDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpPermission;
+
+import io.swagger.annotations.ApiModel;
+
+/**资源表Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "资源表Dto", description = "资源表Dto")
+public class DmpPermissionDto extends DmpPermission {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpPermissionRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.Date;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**资源表参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "资源表参数请求封装", description = "资源表参数请求封装")
+public class DmpPermissionRequest extends BasePageBean {
+	/**
+	* 资源ID
+	*/
+	@ApiModelProperty(value = "资源ID")
+	private Integer permissionId;
+
+	/**
+	* 资源编码
+	*/
+	@ApiModelProperty(value = "资源编码")
+	private String permissionCode;
+
+	/**
+	* 资源名称
+	*/
+	@ApiModelProperty(value = "资源名称")
+	private String permissionName;
+
+	/**
+	* 资源描述
+	*/
+	@ApiModelProperty(value = "资源描述")
+	private String permissionDesc;
+
+	/**
+	* 资源URL
+	*/
+	@ApiModelProperty(value = "资源URL")
+	private String permissionUrl;
+
+	/**
+	* 资源类型(关联字典编码表)
+	*/
+	@ApiModelProperty(value = "资源类型(关联字典编码表)")
+	private String permissionType;
+
+	/**
+	* 排序
+	*/
+	@ApiModelProperty(value = "排序")
+	private Integer permissionSort;
+
+	/**
+	* 父级编码
+	*/
+	@ApiModelProperty(value = "父级编码")
+	private String parentCode;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+	private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+	private Integer createUserId;
+
+	/**
+	* 创建时间起
+	*/
+	@ApiModelProperty(value = "创建时间起")
+	private Date createTimeStart;
+
+	/**
+	* 创建时间止
+	*/
+	@ApiModelProperty(value = "创建时间止")
+	private Date createTimeEnd;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+	private Integer updateUserId;
+
+	/**
+	* 修改时间起
+	*/
+	@ApiModelProperty(value = "修改时间起")
+	private Date updateTimeStart;
+
+	/**
+	* 修改时间止
+	*/
+	@ApiModelProperty(value = "修改时间止")
+	private Date updateTimeEnd;
+
+	public Integer getPermissionId() {
+		return permissionId;
+	}
+
+	public void setPermissionId(Integer permissionId) {
+		this.permissionId = permissionId;
+	}
+
+	public String getPermissionCode() {
+		return permissionCode;
+	}
+
+	public void setPermissionCode(String permissionCode) {
+		this.permissionCode = permissionCode;
+	}
+
+	public String getPermissionName() {
+		return permissionName;
+	}
+
+	public void setPermissionName(String permissionName) {
+		this.permissionName = permissionName;
+	}
+
+	public String getPermissionDesc() {
+		return permissionDesc;
+	}
+
+	public void setPermissionDesc(String permissionDesc) {
+		this.permissionDesc = permissionDesc;
+	}
+
+	public String getPermissionUrl() {
+		return permissionUrl;
+	}
+
+	public void setPermissionUrl(String permissionUrl) {
+		this.permissionUrl = permissionUrl;
+	}
+
+	public String getPermissionType() {
+		return permissionType;
+	}
+
+	public void setPermissionType(String permissionType) {
+		this.permissionType = permissionType;
+	}
+
+	public Integer getPermissionSort() {
+		return permissionSort;
+	}
+
+	public void setPermissionSort(Integer permissionSort) {
+		this.permissionSort = permissionSort;
+	}
+
+	public String getParentCode() {
+		return parentCode;
+	}
+
+	public void setParentCode(String parentCode) {
+		this.parentCode = parentCode;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTimeStart() {
+		return createTimeStart;
+	}
+
+	public void setCreateTimeStart(Date createTimeStart) {
+		this.createTimeStart = createTimeStart;
+	}
+
+	public Date getCreateTimeEnd() {
+		return createTimeEnd;
+	}
+
+	public void setCreateTimeEnd(Date createTimeEnd) {
+		this.createTimeEnd = createTimeEnd;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTimeStart() {
+		return updateTimeStart;
+	}
+
+	public void setUpdateTimeStart(Date updateTimeStart) {
+		this.updateTimeStart = updateTimeStart;
+	}
+
+	public Date getUpdateTimeEnd() {
+		return updateTimeEnd;
+	}
+
+	public void setUpdateTimeEnd(Date updateTimeEnd) {
+		this.updateTimeEnd = updateTimeEnd;
+	}
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpProjectRoleBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpProjectRole;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpProjectRoleBatch {
+	
+	private List<DmpProjectRole> dmpProjectRoles;
+
+	public List<DmpProjectRole> getDmpProjectRoles() {
+		return dmpProjectRoles;
+	}
+
+	public void setDmpProjectRoles(List<DmpProjectRole> dmpProjectRoles) {
+		this.dmpProjectRoles = dmpProjectRoles;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpProjectRoleDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpProjectRole;
+
+import io.swagger.annotations.ApiModel;
+
+/**项目角色关系表Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "项目角色关系表Dto", description = "项目角色关系表Dto")
+public class DmpProjectRoleDto extends DmpProjectRole {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpProjectRoleRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**项目角色关系表参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "项目角色关系表参数请求封装", description = "项目角色关系表参数请求封装")
+public class DmpProjectRoleRequest extends BasePageBean {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+	private Integer projectRoleId;
+
+	/**
+	* 项目ID
+	*/
+	@ApiModelProperty(value = "项目ID")
+	private Integer projectId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+	private Integer roleId;
+
+	public Integer getProjectRoleId() {
+		return projectRoleId;
+	}
+
+	public void setProjectRoleId(Integer projectRoleId) {
+		this.projectRoleId = projectRoleId;
+	}
+
+	public Integer getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Integer projectId) {
+		this.projectId = projectId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpRoleBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpRole;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpRoleBatch {
+	
+	private List<DmpRole> dmpRoles;
+
+	public List<DmpRole> getDmpRoles() {
+		return dmpRoles;
+	}
+
+	public void setDmpRoles(List<DmpRole> dmpRoles) {
+		this.dmpRoles = dmpRoles;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpRoleDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpRole;
+
+import io.swagger.annotations.ApiModel;
+
+/**角色表Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "角色表Dto", description = "角色表Dto")
+public class DmpRoleDto extends DmpRole {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpRolePermissionBatch.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.List;
+
+import com.jz.dmp.modules.model.DmpRolePermission;
+
+/**
+ * @author ybz
+ *
+ */
+public class DmpRolePermissionBatch {
+	
+	private List<DmpRolePermission> dmpRolePermissions;
+
+	public List<DmpRolePermission> getDmpRolePermissions() {
+		return dmpRolePermissions;
+	}
+
+	public void setDmpRolePermissions(List<DmpRolePermission> dmpRolePermissions) {
+		this.dmpRolePermissions = dmpRolePermissions;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpRolePermissionDto.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.dmp.modules.model.DmpRolePermission;
+
+import io.swagger.annotations.ApiModel;
+
+/**角色资源关系表Dto
+ * @author ybz
+ *
+ */
+@ApiModel(value = "角色资源关系表Dto", description = "角色资源关系表Dto")
+public class DmpRolePermissionDto extends DmpRolePermission {
+
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpRolePermissionRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**角色资源关系表参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "角色资源关系表参数请求封装", description = "角色资源关系表参数请求封装")
+public class DmpRolePermissionRequest extends BasePageBean {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+	private Integer rolePermissionId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+	private Integer roleId;
+
+	/**
+	* 资源ID
+	*/
+	@ApiModelProperty(value = "资源ID")
+	private Integer permissionId;
+
+	public Integer getRolePermissionId() {
+		return rolePermissionId;
+	}
+
+	public void setRolePermissionId(Integer rolePermissionId) {
+		this.rolePermissionId = rolePermissionId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public Integer getPermissionId() {
+		return permissionId;
+	}
+
+	public void setPermissionId(Integer permissionId) {
+		this.permissionId = permissionId;
+	}
+}

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpRoleRequest.java

+package com.jz.dmp.modules.controller.sys.bean;
+
+import java.util.Date;
+
+import com.jz.common.bean.BasePageBean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**角色表参数请求封装
+ * @author ybz
+ *
+ */
+@ApiModel(value = "角色表参数请求封装", description = "角色表参数请求封装")
+public class DmpRoleRequest extends BasePageBean {
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+	private Integer roleId;
+
+	/**
+	* 角色编码
+	*/
+	@ApiModelProperty(value = "角色编码")
+	private String roleCode;
+
+	/**
+	* 角色名称
+	*/
+	@ApiModelProperty(value = "角色名称")
+	private String roleName;
+
+	/**
+	* 角色描述
+	*/
+	@ApiModelProperty(value = "角色描述")
+	private String roleDesc;
+
+	/**
+	* 角色类型
+	*/
+	@ApiModelProperty(value = "角色类型")
+	private String roleType;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+	private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+	private Integer createUserId;
+
+	/**
+	* 创建时间起
+	*/
+	@ApiModelProperty(value = "创建时间起")
+	private Date createTimeStart;
+
+	/**
+	* 创建时间止
+	*/
+	@ApiModelProperty(value = "创建时间止")
+	private Date createTimeEnd;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+	private Integer updateUserId;
+
+	/**
+	* 修改时间起
+	*/
+	@ApiModelProperty(value = "修改时间起")
+	private Date updateTimeStart;
+
+	/**
+	* 修改时间止
+	*/
+	@ApiModelProperty(value = "修改时间止")
+	private Date updateTimeEnd;
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(String roleCode) {
+		this.roleCode = roleCode;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public String getRoleDesc() {
+		return roleDesc;
+	}
+
+	public void setRoleDesc(String roleDesc) {
+		this.roleDesc = roleDesc;
+	}
+
+	public String getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(String roleType) {
+		this.roleType = roleType;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTimeStart() {
+		return createTimeStart;
+	}
+
+	public void setCreateTimeStart(Date createTimeStart) {
+		this.createTimeStart = createTimeStart;
+	}
+
+	public Date getCreateTimeEnd() {
+		return createTimeEnd;
+	}
+
+	public void setCreateTimeEnd(Date createTimeEnd) {
+		this.createTimeEnd = createTimeEnd;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTimeStart() {
+		return updateTimeStart;
+	}
+
+	public void setUpdateTimeStart(Date updateTimeStart) {
+		this.updateTimeStart = updateTimeStart;
+	}
+
+	public Date getUpdateTimeEnd() {
+		return updateTimeEnd;
+	}
+
+	public void setUpdateTimeEnd(Date updateTimeEnd) {
+		this.updateTimeEnd = updateTimeEnd;
+	}
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpCodeDictionaryMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpCodeDictionaryDto;
+import com.jz.dmp.modules.model.DmpCodeDictionary;
+
+/**编码字典 mapper
+ * @author ybz
+ *
+ */
+public interface DmpCodeDictionaryMapper {
+	
+	/**新增编码字典
+     * @param dmpCodeDictionary
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpCodeDictionary dmpCodeDictionary)throws Exception;
+
+    /**选择性增加编码字典
+     * @param dmpCodeDictionary
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpCodeDictionary dmpCodeDictionary)throws Exception;
+    
+    /**主键修改编码字典
+     * @param dmpCodeDictionary
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpCodeDictionary dmpCodeDictionary)throws Exception;
+
+    /**选择性修改编码字典
+     * @param dmpCodeDictionary
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpCodeDictionary dmpCodeDictionary)throws Exception;
+    
+    /**主键查询编码字典
+     * @param dmpCodeDictionaryId
+     * @return
+     * @throws Exception
+     */
+    public DmpCodeDictionary selectByPrimaryKey(Integer dmpCodeDictionaryId)throws Exception;
+
+    /**主键删除编码字典
+     * @param dmpCodeDictionaryId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpCodeDictionaryId)throws Exception;
+
+	/**条件查询编码字典
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpCodeDictionaryDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询编码字典
+	 * @param dmpCodeDictionaryId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpCodeDictionaryDto findById(Integer dmpCodeDictionaryId)throws Exception;
+
+	/**批量新增编码字典
+	 * @param dmpCodeDictionarys
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpCodeDictionary> dmpCodeDictionarys)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpMemberMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberDto;
+import com.jz.dmp.modules.model.DmpMember;
+
+/**用户表 mapper
+ * @author ybz
+ *
+ */
+public interface DmpMemberMapper {
+	
+	/**新增用户表
+     * @param dmpMember
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpMember dmpMember)throws Exception;
+
+    /**选择性增加用户表
+     * @param dmpMember
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpMember dmpMember)throws Exception;
+    
+    /**主键修改用户表
+     * @param dmpMember
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpMember dmpMember)throws Exception;
+
+    /**选择性修改用户表
+     * @param dmpMember
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpMember dmpMember)throws Exception;
+    
+    /**主键查询用户表
+     * @param dmpMemberId
+     * @return
+     * @throws Exception
+     */
+    public DmpMember selectByPrimaryKey(Integer dmpMemberId)throws Exception;
+
+    /**主键删除用户表
+     * @param dmpMemberId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpMemberId)throws Exception;
+
+	/**条件查询用户表
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpMemberDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询用户表
+	 * @param dmpMemberId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpMemberDto findById(Integer dmpMemberId)throws Exception;
+
+	/**批量新增用户表
+	 * @param dmpMembers
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpMember> dmpMembers)throws Exception;
+
+	/**  
+	* @Title: findByUserName  
+	* @Description: TODO(通过用户名获取用户信息)  
+	* @param @param userName
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return DmpMember    返回类型  
+	* @throws  
+	*/ 
+	public DmpMember findByUserName(String userName)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpMemberProjectRoleMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleDto;
+import com.jz.dmp.modules.model.DmpMemberProjectRole;
+
+/**用户项目角色表 mapper
+ * @author ybz
+ *
+ */
+public interface DmpMemberProjectRoleMapper {
+	
+	/**新增用户项目角色表
+     * @param dmpMemberProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpMemberProjectRole dmpMemberProjectRole)throws Exception;
+
+    /**选择性增加用户项目角色表
+     * @param dmpMemberProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpMemberProjectRole dmpMemberProjectRole)throws Exception;
+    
+    /**主键修改用户项目角色表
+     * @param dmpMemberProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpMemberProjectRole dmpMemberProjectRole)throws Exception;
+
+    /**选择性修改用户项目角色表
+     * @param dmpMemberProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpMemberProjectRole dmpMemberProjectRole)throws Exception;
+    
+    /**主键查询用户项目角色表
+     * @param dmpMemberProjectRoleId
+     * @return
+     * @throws Exception
+     */
+    public DmpMemberProjectRole selectByPrimaryKey(Integer dmpMemberProjectRoleId)throws Exception;
+
+    /**主键删除用户项目角色表
+     * @param dmpMemberProjectRoleId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpMemberProjectRoleId)throws Exception;
+
+	/**条件查询用户项目角色表
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpMemberProjectRoleDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询用户项目角色表
+	 * @param dmpMemberProjectRoleId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpMemberProjectRoleDto findById(Integer dmpMemberProjectRoleId)throws Exception;
+
+	/**批量新增用户项目角色表
+	 * @param dmpMemberProjectRoles
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpMemberProjectRole> dmpMemberProjectRoles)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpMemberRoleMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberRoleDto;
+import com.jz.dmp.modules.model.DmpMemberRole;
+
+/**用户角色关系表 mapper
+ * @author ybz
+ *
+ */
+public interface DmpMemberRoleMapper {
+	
+	/**新增用户角色关系表
+     * @param dmpMemberRole
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpMemberRole dmpMemberRole)throws Exception;
+
+    /**选择性增加用户角色关系表
+     * @param dmpMemberRole
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpMemberRole dmpMemberRole)throws Exception;
+    
+    /**主键修改用户角色关系表
+     * @param dmpMemberRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpMemberRole dmpMemberRole)throws Exception;
+
+    /**选择性修改用户角色关系表
+     * @param dmpMemberRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpMemberRole dmpMemberRole)throws Exception;
+    
+    /**主键查询用户角色关系表
+     * @param dmpMemberRoleId
+     * @return
+     * @throws Exception
+     */
+    public DmpMemberRole selectByPrimaryKey(Integer dmpMemberRoleId)throws Exception;
+
+    /**主键删除用户角色关系表
+     * @param dmpMemberRoleId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpMemberRoleId)throws Exception;
+
+	/**条件查询用户角色关系表
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpMemberRoleDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询用户角色关系表
+	 * @param dmpMemberRoleId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpMemberRoleDto findById(Integer dmpMemberRoleId)throws Exception;
+
+	/**批量新增用户角色关系表
+	 * @param dmpMemberRoles
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpMemberRole> dmpMemberRoles)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpPermissionMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpPermissionDto;
+import com.jz.dmp.modules.model.DmpPermission;
+
+/**资源表 mapper
+ * @author ybz
+ *
+ */
+public interface DmpPermissionMapper {
+	
+	/**新增资源表
+     * @param dmpPermission
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpPermission dmpPermission)throws Exception;
+
+    /**选择性增加资源表
+     * @param dmpPermission
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpPermission dmpPermission)throws Exception;
+    
+    /**主键修改资源表
+     * @param dmpPermission
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpPermission dmpPermission)throws Exception;
+
+    /**选择性修改资源表
+     * @param dmpPermission
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpPermission dmpPermission)throws Exception;
+    
+    /**主键查询资源表
+     * @param dmpPermissionId
+     * @return
+     * @throws Exception
+     */
+    public DmpPermission selectByPrimaryKey(Integer dmpPermissionId)throws Exception;
+
+    /**主键删除资源表
+     * @param dmpPermissionId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpPermissionId)throws Exception;
+
+	/**条件查询资源表
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpPermissionDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询资源表
+	 * @param dmpPermissionId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpPermissionDto findById(Integer dmpPermissionId)throws Exception;
+
+	/**批量新增资源表
+	 * @param dmpPermissions
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpPermission> dmpPermissions)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpProjectRoleMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpProjectRoleDto;
+import com.jz.dmp.modules.model.DmpProjectRole;
+
+/**项目角色关系表 mapper
+ * @author ybz
+ *
+ */
+public interface DmpProjectRoleMapper {
+	
+	/**新增项目角色关系表
+     * @param dmpProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpProjectRole dmpProjectRole)throws Exception;
+
+    /**选择性增加项目角色关系表
+     * @param dmpProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpProjectRole dmpProjectRole)throws Exception;
+    
+    /**主键修改项目角色关系表
+     * @param dmpProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpProjectRole dmpProjectRole)throws Exception;
+
+    /**选择性修改项目角色关系表
+     * @param dmpProjectRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpProjectRole dmpProjectRole)throws Exception;
+    
+    /**主键查询项目角色关系表
+     * @param dmpProjectRoleId
+     * @return
+     * @throws Exception
+     */
+    public DmpProjectRole selectByPrimaryKey(Integer dmpProjectRoleId)throws Exception;
+
+    /**主键删除项目角色关系表
+     * @param dmpProjectRoleId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpProjectRoleId)throws Exception;
+
+	/**条件查询项目角色关系表
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpProjectRoleDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询项目角色关系表
+	 * @param dmpProjectRoleId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpProjectRoleDto findById(Integer dmpProjectRoleId)throws Exception;
+
+	/**批量新增项目角色关系表
+	 * @param dmpProjectRoles
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpProjectRole> dmpProjectRoles)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpRoleMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpRoleDto;
+import com.jz.dmp.modules.model.DmpRole;
+
+/**角色表 mapper
+ * @author ybz
+ *
+ */
+public interface DmpRoleMapper {
+	
+	/**新增角色表
+     * @param dmpRole
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpRole dmpRole)throws Exception;
+
+    /**选择性增加角色表
+     * @param dmpRole
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpRole dmpRole)throws Exception;
+    
+    /**主键修改角色表
+     * @param dmpRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpRole dmpRole)throws Exception;
+
+    /**选择性修改角色表
+     * @param dmpRole
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpRole dmpRole)throws Exception;
+    
+    /**主键查询角色表
+     * @param dmpRoleId
+     * @return
+     * @throws Exception
+     */
+    public DmpRole selectByPrimaryKey(Integer dmpRoleId)throws Exception;
+
+    /**主键删除角色表
+     * @param dmpRoleId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpRoleId)throws Exception;
+
+	/**条件查询角色表
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpRoleDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询角色表
+	 * @param dmpRoleId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpRoleDto findById(Integer dmpRoleId)throws Exception;
+
+	/**批量新增角色表
+	 * @param dmpRoles
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpRole> dmpRoles)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/dao/sys/DmpRolePermissionMapper.java

+package com.jz.dmp.modules.dao.sys;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jz.dmp.modules.controller.sys.bean.DmpRolePermissionDto;
+import com.jz.dmp.modules.model.DmpRolePermission;
+
+/**角色资源关系表 mapper
+ * @author ybz
+ *
+ */
+public interface DmpRolePermissionMapper {
+	
+	/**新增角色资源关系表
+     * @param dmpRolePermission
+     * @return
+     * @throws Exception
+     */
+    public int insert(DmpRolePermission dmpRolePermission)throws Exception;
+
+    /**选择性增加角色资源关系表
+     * @param dmpRolePermission
+     * @return
+     * @throws Exception
+     */
+    public int insertSelective(DmpRolePermission dmpRolePermission)throws Exception;
+    
+    /**主键修改角色资源关系表
+     * @param dmpRolePermission
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKey(DmpRolePermission dmpRolePermission)throws Exception;
+
+    /**选择性修改角色资源关系表
+     * @param dmpRolePermission
+     * @return
+     * @throws Exception
+     */
+    public int updateByPrimaryKeySelective(DmpRolePermission dmpRolePermission)throws Exception;
+    
+    /**主键查询角色资源关系表
+     * @param dmpRolePermissionId
+     * @return
+     * @throws Exception
+     */
+    public DmpRolePermission selectByPrimaryKey(Integer dmpRolePermissionId)throws Exception;
+
+    /**主键删除角色资源关系表
+     * @param dmpRolePermissionId
+     * @return
+     * @throws Exception
+     */
+    public int deleteByPrimaryKey(Integer dmpRolePermissionId)throws Exception;
+
+	/**条件查询角色资源关系表
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	public List<DmpRolePermissionDto> findList(Map<String, Object> param)throws Exception;
+
+	/**主键查询角色资源关系表
+	 * @param dmpRolePermissionId
+	 * @return
+	 * @throws Exception
+	 */
+	public DmpRolePermissionDto findById(Integer dmpRolePermissionId)throws Exception;
+
+	/**批量新增角色资源关系表
+	 * @param dmpRolePermissions
+	 * @throws Exception
+	 */
+	public void insertBatch(List<DmpRolePermission> dmpRolePermissions)throws Exception;
+	
+}

src/main/java/com/jz/dmp/modules/model/DmpCodeDictionary.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**编码字典
+ * @author ybz
+ *
+ */
+@ApiModel(value = "编码字典", description = "编码字典")
+public class DmpCodeDictionary {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+    private Integer codeId;
+
+	/**
+	* 编码分类
+	*/
+	@ApiModelProperty(value = "编码分类")
+    private String codeType;
+
+	/**
+	* 编码CODE
+	*/
+	@ApiModelProperty(value = "编码CODE")
+    private String codeKey;
+
+	/**
+	* 编码值
+	*/
+	@ApiModelProperty(value = "编码值")
+    private String codeValue;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+    private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+    private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+    private Integer createUserId;
+
+	/**
+	* 创建时间
+	*/
+	@ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+    private Integer updateUserId;
+
+	/**
+	* 修改时间
+	*/
+	@ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+	public Integer getCodeId() {
+		return codeId;
+	}
+
+	public void setCodeId(Integer codeId) {
+		this.codeId = codeId;
+	}
+
+	public String getCodeType() {
+		return codeType;
+	}
+
+	public void setCodeType(String codeType) {
+		this.codeType = codeType;
+	}
+
+	public String getCodeKey() {
+		return codeKey;
+	}
+
+	public void setCodeKey(String codeKey) {
+		this.codeKey = codeKey;
+	}
+
+	public String getCodeValue() {
+		return codeValue;
+	}
+
+	public void setCodeValue(String codeValue) {
+		this.codeValue = codeValue;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}

src/main/java/com/jz/dmp/modules/model/DmpMember.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+/**用户表
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户表", description = "用户表")
+public class DmpMember implements UserDetails{
+	/**
+	* 用户ID
+	*/
+	@ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+	/**
+	* 用户名称
+	*/
+	@ApiModelProperty(value = "用户名称")
+    private String userName;
+
+	/**
+	* 登录密码
+	*/
+	@ApiModelProperty(value = "登录密码")
+    private String userPassword;
+
+	/**
+	* 真实姓名
+	*/
+	@ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+	/**
+	* 联系电话
+	*/
+	@ApiModelProperty(value = "联系电话")
+    private String userPhone;
+
+	/**
+	* 登录IP
+	*/
+	@ApiModelProperty(value = "登录IP")
+    private String loginIp;
+
+	/**
+	* 最近登录时间
+	*/
+	@ApiModelProperty(value = "最近登录时间")
+    private Date loginTime;
+
+	/**
+	* 是否登录锁定(0：否，1：是)
+	*/
+	@ApiModelProperty(value = "是否登录锁定(0：否，1：是)")
+    private String loginLocked;
+
+	/**
+	* 连续登录错误次数
+	*/
+	@ApiModelProperty(value = "连续登录错误次数")
+    private Integer loginErrtimes;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+    private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+    private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+    private Integer createUserId;
+
+	/**
+	* 创建时间
+	*/
+	@ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+    private Integer updateUserId;
+
+	/**
+	* 修改时间
+	*/
+	@ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+	
+	private List<? extends GrantedAuthority> authorities;
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getUserPassword() {
+		return userPassword;
+	}
+
+	public void setUserPassword(String userPassword) {
+		this.userPassword = userPassword;
+	}
+
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
+	public String getUserPhone() {
+		return userPhone;
+	}
+
+	public void setUserPhone(String userPhone) {
+		this.userPhone = userPhone;
+	}
+
+	public String getLoginIp() {
+		return loginIp;
+	}
+
+	public void setLoginIp(String loginIp) {
+		this.loginIp = loginIp;
+	}
+
+	public Date getLoginTime() {
+		return loginTime;
+	}
+
+	public void setLoginTime(Date loginTime) {
+		this.loginTime = loginTime;
+	}
+
+	public String getLoginLocked() {
+		return loginLocked;
+	}
+
+	public void setLoginLocked(String loginLocked) {
+		this.loginLocked = loginLocked;
+	}
+
+	public Integer getLoginErrtimes() {
+		return loginErrtimes;
+	}
+
+	public void setLoginErrtimes(Integer loginErrtimes) {
+		this.loginErrtimes = loginErrtimes;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	
+	public void setAuthorities(List<? extends GrantedAuthority> authorities) {
+		this.authorities = authorities;
+	}
+
+	@Override
+	public Collection<? extends GrantedAuthority> getAuthorities() {
+		// TODO Auto-generated method stub
+		return this.authorities;
+	}
+
+	@Override
+	public String getPassword() {
+		// TODO Auto-generated method stub
+		return this.userPassword;
+	}
+
+	@Override
+	public String getUsername() {
+		// TODO Auto-generated method stub
+		return this.userName;
+	}
+
+	@Override
+	public boolean isAccountNonExpired() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	@Override
+	public boolean isAccountNonLocked() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	@Override
+	public boolean isCredentialsNonExpired() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+}

src/main/java/com/jz/dmp/modules/model/DmpMemberProjectRole.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**用户项目角色表
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户项目角色表", description = "用户项目角色表")
+public class DmpMemberProjectRole {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+    private Integer memberProjectRoleId;
+
+	/**
+	* 用户ID
+	*/
+	@ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+	/**
+	* 项目ID
+	*/
+	@ApiModelProperty(value = "项目ID")
+    private Integer projectId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+    private Integer roleId;
+
+	public Integer getMemberProjectRoleId() {
+		return memberProjectRoleId;
+	}
+
+	public void setMemberProjectRoleId(Integer memberProjectRoleId) {
+		this.memberProjectRoleId = memberProjectRoleId;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Integer projectId) {
+		this.projectId = projectId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+}

src/main/java/com/jz/dmp/modules/model/DmpMemberRole.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**用户角色关系表
+ * @author ybz
+ *
+ */
+@ApiModel(value = "用户角色关系表", description = "用户角色关系表")
+public class DmpMemberRole {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+    private Integer userRoleId;
+
+	/**
+	* 用户ID
+	*/
+	@ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+    private Integer roleId;
+
+	public Integer getUserRoleId() {
+		return userRoleId;
+	}
+
+	public void setUserRoleId(Integer userRoleId) {
+		this.userRoleId = userRoleId;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+}

src/main/java/com/jz/dmp/modules/model/DmpPermission.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**资源表
+ * @author ybz
+ *
+ */
+@ApiModel(value = "资源表", description = "资源表")
+public class DmpPermission {
+	/**
+	* 资源ID
+	*/
+	@ApiModelProperty(value = "资源ID")
+    private Integer permissionId;
+
+	/**
+	* 资源编码
+	*/
+	@ApiModelProperty(value = "资源编码")
+    private String permissionCode;
+
+	/**
+	* 资源名称
+	*/
+	@ApiModelProperty(value = "资源名称")
+    private String permissionName;
+
+	/**
+	* 资源描述
+	*/
+	@ApiModelProperty(value = "资源描述")
+    private String permissionDesc;
+
+	/**
+	* 资源URL
+	*/
+	@ApiModelProperty(value = "资源URL")
+    private String permissionUrl;
+
+	/**
+	* 资源类型(关联字典编码表)
+	*/
+	@ApiModelProperty(value = "资源类型(关联字典编码表)")
+    private String permissionType;
+
+	/**
+	* 排序
+	*/
+	@ApiModelProperty(value = "排序")
+    private Integer permissionSort;
+
+	/**
+	* 父级编码
+	*/
+	@ApiModelProperty(value = "父级编码")
+    private String parentCode;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+    private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+    private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+    private Integer createUserId;
+
+	/**
+	* 创建时间
+	*/
+	@ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+    private Integer updateUserId;
+
+	/**
+	* 修改时间
+	*/
+	@ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+	public Integer getPermissionId() {
+		return permissionId;
+	}
+
+	public void setPermissionId(Integer permissionId) {
+		this.permissionId = permissionId;
+	}
+
+	public String getPermissionCode() {
+		return permissionCode;
+	}
+
+	public void setPermissionCode(String permissionCode) {
+		this.permissionCode = permissionCode;
+	}
+
+	public String getPermissionName() {
+		return permissionName;
+	}
+
+	public void setPermissionName(String permissionName) {
+		this.permissionName = permissionName;
+	}
+
+	public String getPermissionDesc() {
+		return permissionDesc;
+	}
+
+	public void setPermissionDesc(String permissionDesc) {
+		this.permissionDesc = permissionDesc;
+	}
+
+	public String getPermissionUrl() {
+		return permissionUrl;
+	}
+
+	public void setPermissionUrl(String permissionUrl) {
+		this.permissionUrl = permissionUrl;
+	}
+
+	public String getPermissionType() {
+		return permissionType;
+	}
+
+	public void setPermissionType(String permissionType) {
+		this.permissionType = permissionType;
+	}
+
+	public Integer getPermissionSort() {
+		return permissionSort;
+	}
+
+	public void setPermissionSort(Integer permissionSort) {
+		this.permissionSort = permissionSort;
+	}
+
+	public String getParentCode() {
+		return parentCode;
+	}
+
+	public void setParentCode(String parentCode) {
+		this.parentCode = parentCode;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}

src/main/java/com/jz/dmp/modules/model/DmpProjectRole.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**项目角色关系表
+ * @author ybz
+ *
+ */
+@ApiModel(value = "项目角色关系表", description = "项目角色关系表")
+public class DmpProjectRole {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+    private Integer projectRoleId;
+
+	/**
+	* 项目ID
+	*/
+	@ApiModelProperty(value = "项目ID")
+    private Integer projectId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+    private Integer roleId;
+
+	public Integer getProjectRoleId() {
+		return projectRoleId;
+	}
+
+	public void setProjectRoleId(Integer projectRoleId) {
+		this.projectRoleId = projectRoleId;
+	}
+
+	public Integer getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(Integer projectId) {
+		this.projectId = projectId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+}

src/main/java/com/jz/dmp/modules/model/DmpRole.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**角色表
+ * @author ybz
+ *
+ */
+@ApiModel(value = "角色表", description = "角色表")
+public class DmpRole {
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+    private Integer roleId;
+
+	/**
+	* 角色编码
+	*/
+	@ApiModelProperty(value = "角色编码")
+    private String roleCode;
+
+	/**
+	* 角色名称
+	*/
+	@ApiModelProperty(value = "角色名称")
+    private String roleName;
+
+	/**
+	* 角色描述
+	*/
+	@ApiModelProperty(value = "角色描述")
+    private String roleDesc;
+
+	/**
+	* 角色类型
+	*/
+	@ApiModelProperty(value = "角色类型")
+    private String roleType;
+
+	/**
+	* 备注
+	*/
+	@ApiModelProperty(value = "备注")
+    private String remark;
+
+	/**
+	* 数据状态(0：删除，1，未删除)
+	*/
+	@ApiModelProperty(value = "数据状态(0：删除，1，未删除)")
+    private String dataStatus;
+
+	/**
+	* 创建用户ID
+	*/
+	@ApiModelProperty(value = "创建用户ID")
+    private Integer createUserId;
+
+	/**
+	* 创建时间
+	*/
+	@ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+	/**
+	* 修改用户ID
+	*/
+	@ApiModelProperty(value = "修改用户ID")
+    private Integer updateUserId;
+
+	/**
+	* 修改时间
+	*/
+	@ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(String roleCode) {
+		this.roleCode = roleCode;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public String getRoleDesc() {
+		return roleDesc;
+	}
+
+	public void setRoleDesc(String roleDesc) {
+		this.roleDesc = roleDesc;
+	}
+
+	public String getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(String roleType) {
+		this.roleType = roleType;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
+	public Integer getCreateUserId() {
+		return createUserId;
+	}
+
+	public void setCreateUserId(Integer createUserId) {
+		this.createUserId = createUserId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getUpdateUserId() {
+		return updateUserId;
+	}
+
+	public void setUpdateUserId(Integer updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}

src/main/java/com/jz/dmp/modules/model/DmpRolePermission.java

+package com.jz.dmp.modules.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**角色资源关系表
+ * @author ybz
+ *
+ */
+@ApiModel(value = "角色资源关系表", description = "角色资源关系表")
+public class DmpRolePermission {
+	/**
+	* 主键
+	*/
+	@ApiModelProperty(value = "主键")
+    private Integer rolePermissionId;
+
+	/**
+	* 角色ID
+	*/
+	@ApiModelProperty(value = "角色ID")
+    private Integer roleId;
+
+	/**
+	* 资源ID
+	*/
+	@ApiModelProperty(value = "资源ID")
+    private Integer permissionId;
+
+	public Integer getRolePermissionId() {
+		return rolePermissionId;
+	}
+
+	public void setRolePermissionId(Integer rolePermissionId) {
+		this.rolePermissionId = rolePermissionId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public Integer getPermissionId() {
+		return permissionId;
+	}
+
+	public void setPermissionId(Integer permissionId) {
+		this.permissionId = permissionId;
+	}
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpCodeDictionaryService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpCodeDictionaryBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpCodeDictionaryDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpCodeDictionaryRequest;
+import com.jz.dmp.modules.model.DmpCodeDictionary;
+
+/**
+ * 编码字典服务接口
+ * @author ybz
+ *
+ */
+public interface DmpCodeDictionaryService {
+
+	/**条件查询所有编码字典
+	 * @param dmpCodeDictionaryRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpCodeDictionaryDto> findList(DmpCodeDictionaryRequest dmpCodeDictionaryRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增编码字典
+	 * @param dmpCodeDictionary
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpCodeDictionary> add(DmpCodeDictionary dmpCodeDictionary, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询编码字典
+	 * @param dmpCodeDictionaryRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpCodeDictionaryDto> findById(DmpCodeDictionaryRequest dmpCodeDictionaryRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改编码字典
+	 * @param dmpCodeDictionary
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpCodeDictionary> edit(DmpCodeDictionary dmpCodeDictionary, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除编码字典
+	 * @param dmpCodeDictionaryRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpCodeDictionaryRequest dmpCodeDictionaryRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增编码字典
+	 * @param dmpCodeDictionaryVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpCodeDictionaryBatch> addBatch(DmpCodeDictionaryBatch dmpCodeDictionaryBatch, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpMemberProjectRoleService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleRequest;
+import com.jz.dmp.modules.model.DmpMemberProjectRole;
+
+/**
+ * 用户项目角色表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpMemberProjectRoleService {
+
+	/**条件查询所有用户项目角色表
+	 * @param dmpMemberProjectRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpMemberProjectRoleDto> findList(DmpMemberProjectRoleRequest dmpMemberProjectRoleRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增用户项目角色表
+	 * @param dmpMemberProjectRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberProjectRole> add(DmpMemberProjectRole dmpMemberProjectRole, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询用户项目角色表
+	 * @param dmpMemberProjectRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberProjectRoleDto> findById(DmpMemberProjectRoleRequest dmpMemberProjectRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改用户项目角色表
+	 * @param dmpMemberProjectRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberProjectRole> edit(DmpMemberProjectRole dmpMemberProjectRole, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除用户项目角色表
+	 * @param dmpMemberProjectRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpMemberProjectRoleRequest dmpMemberProjectRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增用户项目角色表
+	 * @param dmpMemberProjectRoleVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberProjectRoleBatch> addBatch(DmpMemberProjectRoleBatch dmpMemberProjectRoleBatch, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpMemberRoleService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberRoleBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberRoleDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberRoleRequest;
+import com.jz.dmp.modules.model.DmpMemberRole;
+
+/**
+ * 用户角色关系表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpMemberRoleService {
+
+	/**条件查询所有用户角色关系表
+	 * @param dmpMemberRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpMemberRoleDto> findList(DmpMemberRoleRequest dmpMemberRoleRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增用户角色关系表
+	 * @param dmpMemberRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberRole> add(DmpMemberRole dmpMemberRole, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询用户角色关系表
+	 * @param dmpMemberRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberRoleDto> findById(DmpMemberRoleRequest dmpMemberRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改用户角色关系表
+	 * @param dmpMemberRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberRole> edit(DmpMemberRole dmpMemberRole, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除用户角色关系表
+	 * @param dmpMemberRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpMemberRoleRequest dmpMemberRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增用户角色关系表
+	 * @param dmpMemberRoleVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberRoleBatch> addBatch(DmpMemberRoleBatch dmpMemberRoleBatch, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpMemberService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberRequest;
+import com.jz.dmp.modules.model.DmpMember;
+
+/**
+ * 用户表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpMemberService {
+
+	/**条件查询所有用户表
+	 * @param dmpMemberRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpMemberDto> findList(DmpMemberRequest dmpMemberRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增用户表
+	 * @param dmpMember
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMember> add(DmpMember dmpMember, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询用户表
+	 * @param dmpMemberRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberDto> findById(DmpMemberRequest dmpMemberRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改用户表
+	 * @param dmpMember
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMember> edit(DmpMember dmpMember, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除用户表
+	 * @param dmpMemberRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpMemberRequest dmpMemberRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增用户表
+	 * @param dmpMemberVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpMemberBatch> addBatch(DmpMemberBatch dmpMemberBatch, HttpServletRequest httpRequest)throws Exception;
+
+
+	/**  
+	* @Title: findByUserName  
+	* @Description: TODO(通过用户名获取用户)  
+	* @param @param userName
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return DmpMember    返回类型  
+	* @throws  
+	*/ 
+	public DmpMember findByUserName(String userName)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpPermissionService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpPermissionBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpPermissionDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpPermissionRequest;
+import com.jz.dmp.modules.model.DmpPermission;
+
+/**
+ * 资源表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpPermissionService {
+
+	/**条件查询所有资源表
+	 * @param dmpPermissionRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpPermissionDto> findList(DmpPermissionRequest dmpPermissionRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增资源表
+	 * @param dmpPermission
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPermission> add(DmpPermission dmpPermission, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询资源表
+	 * @param dmpPermissionRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPermissionDto> findById(DmpPermissionRequest dmpPermissionRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改资源表
+	 * @param dmpPermission
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPermission> edit(DmpPermission dmpPermission, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除资源表
+	 * @param dmpPermissionRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpPermissionRequest dmpPermissionRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增资源表
+	 * @param dmpPermissionVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPermissionBatch> addBatch(DmpPermissionBatch dmpPermissionBatch, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpProjectRoleService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpProjectRoleBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpProjectRoleDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpProjectRoleRequest;
+import com.jz.dmp.modules.model.DmpProjectRole;
+
+/**
+ * 项目角色关系表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpProjectRoleService {
+
+	/**条件查询所有项目角色关系表
+	 * @param dmpProjectRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpProjectRoleDto> findList(DmpProjectRoleRequest dmpProjectRoleRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增项目角色关系表
+	 * @param dmpProjectRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectRole> add(DmpProjectRole dmpProjectRole, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询项目角色关系表
+	 * @param dmpProjectRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectRoleDto> findById(DmpProjectRoleRequest dmpProjectRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改项目角色关系表
+	 * @param dmpProjectRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectRole> edit(DmpProjectRole dmpProjectRole, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除项目角色关系表
+	 * @param dmpProjectRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpProjectRoleRequest dmpProjectRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增项目角色关系表
+	 * @param dmpProjectRoleVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectRoleBatch> addBatch(DmpProjectRoleBatch dmpProjectRoleBatch, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpRolePermissionService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpRolePermissionBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpRolePermissionDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpRolePermissionRequest;
+import com.jz.dmp.modules.model.DmpRolePermission;
+
+/**
+ * 角色资源关系表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpRolePermissionService {
+
+	/**条件查询所有角色资源关系表
+	 * @param dmpRolePermissionRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpRolePermissionDto> findList(DmpRolePermissionRequest dmpRolePermissionRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增角色资源关系表
+	 * @param dmpRolePermission
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRolePermission> add(DmpRolePermission dmpRolePermission, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询角色资源关系表
+	 * @param dmpRolePermissionRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRolePermissionDto> findById(DmpRolePermissionRequest dmpRolePermissionRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改角色资源关系表
+	 * @param dmpRolePermission
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRolePermission> edit(DmpRolePermission dmpRolePermission, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除角色资源关系表
+	 * @param dmpRolePermissionRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpRolePermissionRequest dmpRolePermissionRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增角色资源关系表
+	 * @param dmpRolePermissionVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRolePermissionBatch> addBatch(DmpRolePermissionBatch dmpRolePermissionBatch, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/DmpRoleService.java

+package com.jz.dmp.modules.service.sys;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.sys.bean.DmpRoleBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpRoleDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpRoleRequest;
+import com.jz.dmp.modules.model.DmpRole;
+
+/**
+ * 角色表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpRoleService {
+
+	/**条件查询所有角色表
+	 * @param dmpRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpRoleDto> findList(DmpRoleRequest dmpRoleRequest, HttpServletRequest httpRequest)throws Exception;
+	
+
+	/**新增角色表
+	 * @param dmpRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRole> add(DmpRole dmpRole, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询角色表
+	 * @param dmpRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRoleDto> findById(DmpRoleRequest dmpRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改角色表
+	 * @param dmpRole
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRole> edit(DmpRole dmpRole, HttpServletRequest httpRequest)throws Exception;
+
+	/**主键删除角色表
+	 * @param dmpRoleRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(DmpRoleRequest dmpRoleRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增角色表
+	 * @param dmpRoleVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpRoleBatch> addBatch(DmpRoleBatch dmpRoleBatch, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/sys/impl/DmpCodeDictionaryServiceImpl.java

+package com.jz.dmp.modules.service.sys.impl;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.common.constant.Constants;
+import com.jz.common.constant.ResultCode;
+import com.jz.common.persistence.BaseService;
+import com.jz.dmp.modules.controller.sys.bean.DmpCodeDictionaryBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpCodeDictionaryDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpCodeDictionaryRequest;
+import com.jz.dmp.modules.dao.sys.DmpCodeDictionaryMapper;
+import com.jz.dmp.modules.model.DmpCodeDictionary;
+import com.jz.dmp.modules.service.sys.DmpCodeDictionaryService;
+
+/**
+ * 编码字典服务的实现?
+ * @author ybz
+ *
+ */
+@Service("dmpCodeDictionaryService")
+public class DmpCodeDictionaryServiceImpl extends BaseService implements DmpCodeDictionaryService {
+	
+	private static Logger logger = LoggerFactory.getLogger(DmpCodeDictionaryServiceImpl.class);
+	
+	@Autowired
+	private DmpCodeDictionaryMapper dmpCodeDictionaryMapper;
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpCodeDictionaryService#findList(com.ycxc.vmts.controller.bean.DmpCodeDictionaryRequest, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public PageInfoResponse<DmpCodeDictionaryDto> findList(DmpCodeDictionaryRequest dmpCodeDictionaryRequest, HttpServletRequest httpRequest)
+			throws Exception {
+		PageInfoResponse<DmpCodeDictionaryDto> pageInfoResponse = new PageInfoResponse<>();
+		
+		Map<String, Object> param = new HashMap<>();
+		//主键
+		if (dmpCodeDictionaryRequest.getCodeId() != null) {
+			param.put("codeId", dmpCodeDictionaryRequest.getCodeId());
+		}
+		//编码分类
+		if (!StringUtils.isEmpty(dmpCodeDictionaryRequest.getCodeType())) {
+			param.put("codeType", dmpCodeDictionaryRequest.getCodeType());
+		}
+		//编码CODE
+		if (!StringUtils.isEmpty(dmpCodeDictionaryRequest.getCodeKey())) {
+			param.put("codeKey", dmpCodeDictionaryRequest.getCodeKey());
+		}
+		//编码值
+		if (!StringUtils.isEmpty(dmpCodeDictionaryRequest.getCodeValue())) {
+			param.put("codeValue", dmpCodeDictionaryRequest.getCodeValue());
+		}
+		//备注
+		if (!StringUtils.isEmpty(dmpCodeDictionaryRequest.getRemark())) {
+			param.put("remark", dmpCodeDictionaryRequest.getRemark());
+		}
+		//数据状态(0：删除，1，未删除)
+		if (!StringUtils.isEmpty(dmpCodeDictionaryRequest.getDataStatus())) {
+			param.put("dataStatus", dmpCodeDictionaryRequest.getDataStatus());
+		}
+		//创建用户ID
+		if (dmpCodeDictionaryRequest.getCreateUserId() != null) {
+			param.put("createUserId", dmpCodeDictionaryRequest.getCreateUserId());
+		}
+		//创建时间起
+		if (dmpCodeDictionaryRequest.getCreateTimeStart() != null) {
+			param.put("createTimeStart", dmpCodeDictionaryRequest.getCreateTimeStart());
+		}
+		//创建时间止
+		if (dmpCodeDictionaryRequest.getCreateTimeEnd() != null) {
+			param.put("createTimeEnd", dmpCodeDictionaryRequest.getCreateTimeEnd());
+		}
+		//修改用户ID
+		if (dmpCodeDictionaryRequest.getUpdateUserId() != null) {
+			param.put("updateUserId", dmpCodeDictionaryRequest.getUpdateUserId());
+		}
+		//修改时间起
+		if (dmpCodeDictionaryRequest.getUpdateTimeStart() != null) {
+			param.put("updateTimeStart", dmpCodeDictionaryRequest.getUpdateTimeStart());
+		}
+		//修改时间止
+		if (dmpCodeDictionaryRequest.getUpdateTimeEnd() != null) {
+			param.put("updateTimeEnd", dmpCodeDictionaryRequest.getUpdateTimeEnd());
+		}
+		
+		PageHelper.startPage(dmpCodeDictionaryRequest.getPageNum(), dmpCodeDictionaryRequest.getPageSize());
+		List<DmpCodeDictionaryDto> list = dmpCodeDictionaryMapper.findList(param);
+		PageInfo<DmpCodeDictionaryDto> pageInfo = new PageInfo<>(list);
+		
+		pageInfoResponse.setCode(ResultCode.SUCCESS.val());
+		pageInfoResponse.setMessage("查询成功");
+		pageInfoResponse.setData(pageInfo);
+		return pageInfoResponse;
+	}
+	
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpCodeDictionaryService#add(com.ycxc.vmts.entity.DmpCodeDictionary, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseBeanResponse<DmpCodeDictionary> add(DmpCodeDictionary dmpCodeDictionary, HttpServletRequest httpRequest) throws Exception {
+		BaseBeanResponse<DmpCodeDictionary> baseBeanResponse = new BaseBeanResponse<>();
+		
+		/*$*setCodeIdCodeReplace*$*/
+		//创建人
+		dmpCodeDictionary.setCreateUserId(getHttpRequestUserId(httpRequest));
+		//创建时间
+		dmpCodeDictionary.setCreateTime(new Date());
+		
+		dmpCodeDictionaryMapper.insertSelective(dmpCodeDictionary);
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("新增成功");
+		baseBeanResponse.setData(dmpCodeDictionary);
+		
+		return baseBeanResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpCodeDictionaryService#edit(com.ycxc.vmts.entity.DmpCodeDictionary, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseBeanResponse<DmpCodeDictionary> edit(DmpCodeDictionary dmpCodeDictionary, HttpServletRequest httpRequest) throws Exception {
+		BaseBeanResponse<DmpCodeDictionary> baseBeanResponse = new BaseBeanResponse<>();
+		
+		//修改人
+		dmpCodeDictionary.setUpdateUserId(getHttpRequestUserId(httpRequest));
+		//修改时间
+		dmpCodeDictionary.setUpdateTime(new Date());
+		
+		dmpCodeDictionaryMapper.updateByPrimaryKeySelective(dmpCodeDictionary);
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("修改成功");
+		baseBeanResponse.setData(dmpCodeDictionary);
+		
+		return baseBeanResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpCodeDictionaryService#findById(com.ycxc.vmts.controller.bean.DmpCodeDictionaryRequest, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public BaseBeanResponse<DmpCodeDictionaryDto> findById(DmpCodeDictionaryRequest dmpCodeDictionaryRequest, HttpServletRequest httpRequest)
+			throws Exception {
+		BaseBeanResponse<DmpCodeDictionaryDto> baseBeanResponse = new BaseBeanResponse<>();
+		
+		DmpCodeDictionaryDto dmpCodeDictionaryDto = dmpCodeDictionaryMapper.findById(dmpCodeDictionaryRequest.getCodeId());
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("查询成功");
+		baseBeanResponse.setData(dmpCodeDictionaryDto);
+		
+		return baseBeanResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpCodeDictionaryService#deleteById(com.ycxc.vmts.controller.bean.DmpCodeDictionaryRequest, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseResponse deleteById(DmpCodeDictionaryRequest dmpCodeDictionaryRequest, HttpServletRequest httpRequest)
+			throws Exception {
+		BaseResponse baseResponse = new BaseResponse();
+		
+		dmpCodeDictionaryMapper.deleteByPrimaryKey(dmpCodeDictionaryRequest.getCodeId());
+		
+		baseResponse.setCode(ResultCode.SUCCESS.val());
+		baseResponse.setMessage("删除成功");
+		
+		return baseResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpCodeDictionaryService#addBatch(com.ycxc.vmts.controller.bean.DmpCodeDictionaryVo, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseBeanResponse<DmpCodeDictionaryBatch> addBatch(DmpCodeDictionaryBatch dmpCodeDictionaryBatch, HttpServletRequest httpRequest) throws Exception {
+		BaseBeanResponse<DmpCodeDictionaryBatch> baseBeanResponse = new BaseBeanResponse<>();
+		
+		List<DmpCodeDictionary> dmpCodeDictionarys = dmpCodeDictionaryBatch.getDmpCodeDictionarys();
+		
+		if (CollectionUtils.isEmpty(dmpCodeDictionarys)) {
+			baseBeanResponse.setCode(ResultCode.PARAMS_ERROR.val());
+			baseBeanResponse.setMessage("数据不能为空！");
+			return baseBeanResponse;
+		}
+		
+		dmpCodeDictionarys = dmpCodeDictionarys.stream().map(dmpCodeDictionary -> {
+			/*$*setCodeIdCodeReplace*$*/
+			//创建人
+			try {
+				dmpCodeDictionary.setCreateUserId(getHttpRequestUserId(httpRequest));
+			} catch (Exception e) {
+				logger.info(e.getMessage());
+				e.printStackTrace();
+			}
+			//创建时间
+			dmpCodeDictionary.setCreateTime(new Date());
+			
+			return dmpCodeDictionary;
+		}).collect(Collectors.toList());
+		
+		dmpCodeDictionaryMapper.insertBatch(dmpCodeDictionarys);
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("批量新增成功");
+		baseBeanResponse.setData(dmpCodeDictionaryBatch);
+		
+		return baseBeanResponse;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/service/sys/impl/DmpMemberProjectRoleServiceImpl.java

+package com.jz.dmp.modules.service.sys.impl;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.common.constant.Constants;
+import com.jz.common.constant.ResultCode;
+import com.jz.common.persistence.BaseService;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleBatch;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleDto;
+import com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleRequest;
+import com.jz.dmp.modules.dao.sys.DmpMemberProjectRoleMapper;
+import com.jz.dmp.modules.model.DmpMemberProjectRole;
+import com.jz.dmp.modules.service.sys.DmpMemberProjectRoleService;
+
+/**
+ * 用户项目角色表服务的实现?
+ * @author ybz
+ *
+ */
+@Service("dmpMemberProjectRoleService")
+public class DmpMemberProjectRoleServiceImpl extends BaseService implements DmpMemberProjectRoleService {
+	
+	private static Logger logger = LoggerFactory.getLogger(DmpMemberProjectRoleServiceImpl.class);
+	
+	@Autowired
+	private DmpMemberProjectRoleMapper dmpMemberProjectRoleMapper;
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpMemberProjectRoleService#findList(com.ycxc.vmts.controller.bean.DmpMemberProjectRoleRequest, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public PageInfoResponse<DmpMemberProjectRoleDto> findList(DmpMemberProjectRoleRequest dmpMemberProjectRoleRequest, HttpServletRequest httpRequest)
+			throws Exception {
+		PageInfoResponse<DmpMemberProjectRoleDto> pageInfoResponse = new PageInfoResponse<>();
+		
+		Map<String, Object> param = new HashMap<>();
+		//主键
+		if (dmpMemberProjectRoleRequest.getMemberProjectRoleId() != null) {
+			param.put("memberProjectRoleId", dmpMemberProjectRoleRequest.getMemberProjectRoleId());
+		}
+		//用户ID
+		if (dmpMemberProjectRoleRequest.getUserId() != null) {
+			param.put("userId", dmpMemberProjectRoleRequest.getUserId());
+		}
+		//项目ID
+		if (dmpMemberProjectRoleRequest.getProjectId() != null) {
+			param.put("projectId", dmpMemberProjectRoleRequest.getProjectId());
+		}
+		//角色ID
+		if (dmpMemberProjectRoleRequest.getRoleId() != null) {
+			param.put("roleId", dmpMemberProjectRoleRequest.getRoleId());
+		}
+		
+		PageHelper.startPage(dmpMemberProjectRoleRequest.getPageNum(), dmpMemberProjectRoleRequest.getPageSize());
+		List<DmpMemberProjectRoleDto> list = dmpMemberProjectRoleMapper.findList(param);
+		PageInfo<DmpMemberProjectRoleDto> pageInfo = new PageInfo<>(list);
+		
+		pageInfoResponse.setCode(ResultCode.SUCCESS.val());
+		pageInfoResponse.setMessage("查询成功");
+		pageInfoResponse.setData(pageInfo);
+		return pageInfoResponse;
+	}
+	
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpMemberProjectRoleService#add(com.ycxc.vmts.entity.DmpMemberProjectRole, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseBeanResponse<DmpMemberProjectRole> add(DmpMemberProjectRole dmpMemberProjectRole, HttpServletRequest httpRequest) throws Exception {
+		BaseBeanResponse<DmpMemberProjectRole> baseBeanResponse = new BaseBeanResponse<>();
+		
+		dmpMemberProjectRoleMapper.insertSelective(dmpMemberProjectRole);
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("新增成功");
+		baseBeanResponse.setData(dmpMemberProjectRole);
+		
+		return baseBeanResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpMemberProjectRoleService#edit(com.ycxc.vmts.entity.DmpMemberProjectRole, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseBeanResponse<DmpMemberProjectRole> edit(DmpMemberProjectRole dmpMemberProjectRole, HttpServletRequest httpRequest) throws Exception {
+		BaseBeanResponse<DmpMemberProjectRole> baseBeanResponse = new BaseBeanResponse<>();
+		
+		dmpMemberProjectRoleMapper.updateByPrimaryKeySelective(dmpMemberProjectRole);
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("修改成功");
+		baseBeanResponse.setData(dmpMemberProjectRole);
+		
+		return baseBeanResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpMemberProjectRoleService#findById(com.ycxc.vmts.controller.bean.DmpMemberProjectRoleRequest, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public BaseBeanResponse<DmpMemberProjectRoleDto> findById(DmpMemberProjectRoleRequest dmpMemberProjectRoleRequest, HttpServletRequest httpRequest)
+			throws Exception {
+		BaseBeanResponse<DmpMemberProjectRoleDto> baseBeanResponse = new BaseBeanResponse<>();
+		
+		DmpMemberProjectRoleDto dmpMemberProjectRoleDto = dmpMemberProjectRoleMapper.findById(dmpMemberProjectRoleRequest.getMemberProjectRoleId());
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("查询成功");
+		baseBeanResponse.setData(dmpMemberProjectRoleDto);
+		
+		return baseBeanResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpMemberProjectRoleService#deleteById(com.ycxc.vmts.controller.bean.DmpMemberProjectRoleRequest, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseResponse deleteById(DmpMemberProjectRoleRequest dmpMemberProjectRoleRequest, HttpServletRequest httpRequest)
+			throws Exception {
+		BaseResponse baseResponse = new BaseResponse();
+		
+		dmpMemberProjectRoleMapper.deleteByPrimaryKey(dmpMemberProjectRoleRequest.getMemberProjectRoleId());
+		
+		baseResponse.setCode(ResultCode.SUCCESS.val());
+		baseResponse.setMessage("删除成功");
+		
+		return baseResponse;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.ycxc.vmts.service.DmpMemberProjectRoleService#addBatch(com.ycxc.vmts.controller.bean.DmpMemberProjectRoleVo, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	@Transactional(rollbackFor=Exception.class)
+	public BaseBeanResponse<DmpMemberProjectRoleBatch> addBatch(DmpMemberProjectRoleBatch dmpMemberProjectRoleBatch, HttpServletRequest httpRequest) throws Exception {
+		BaseBeanResponse<DmpMemberProjectRoleBatch> baseBeanResponse = new BaseBeanResponse<>();
+		
+		List<DmpMemberProjectRole> dmpMemberProjectRoles = dmpMemberProjectRoleBatch.getDmpMemberProjectRoles();
+		
+		if (CollectionUtils.isEmpty(dmpMemberProjectRoles)) {
+			baseBeanResponse.setCode(ResultCode.PARAMS_ERROR.val());
+			baseBeanResponse.setMessage("数据不能为空！");
+			return baseBeanResponse;
+		}
+		
+		dmpMemberProjectRoles = dmpMemberProjectRoles.stream().map(dmpMemberProjectRole -> {
+			return dmpMemberProjectRole;
+		}).collect(Collectors.toList());
+		
+		dmpMemberProjectRoleMapper.insertBatch(dmpMemberProjectRoles);
+		
+		baseBeanResponse.setCode(ResultCode.SUCCESS.val());
+		baseBeanResponse.setMessage("批量新增成功");
+		baseBeanResponse.setData(dmpMemberProjectRoleBatch);
+		
+		return baseBeanResponse;
+	}
+	
+}

src/main/resources/application-test.yml

@@ -12,10 +12,10 @@ management:
 spring:
   profiles: test
   datasource1:
-    url: jdbc:mysql://119.23.32.151:3306/dmp_web?characterEncoding=utf8&useSSL=false
+    url: jdbc:mysql://192.168.1.140:3307/dmp_web_new?characterEncoding=utf8&useSSL=false
     driver-class-name: com.mysql.jdbc.Driver
     username: dmp
-    password: Ioubuy@2019@!
+    password: Ioubuy123
     hikari:
       maxLifetime: 1765000
       maximumPoolSize: 20

src/main/resources/mapper/sys/DmpMemberProjectRoleMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.jz.dmp.modules.dao.sys.DmpMemberProjectRoleMapper" >
+  <resultMap id="BaseResultMap" type="com.jz.dmp.modules.model.DmpMemberProjectRole">
+    <result column="member_project_role_id" property="memberProjectRoleId" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="project_id" property="projectId" jdbcType="INTEGER" />
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
+  </resultMap>
+  
+  <resultMap id="BaseDtoResultMap" type="com.jz.dmp.modules.controller.sys.bean.DmpMemberProjectRoleDto" extends="BaseResultMap">
+    <!-- /*$BaseDtoResultMapContent$*/ -->
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    member_project_role_id, user_id, project_id, role_id
+  </sql>
+  
+  <sql id="BaseDto_Column_List">
+    <include refid="Base_Column_List" />
+    <!-- /*$BaseDtoColumnListContent$*/ -->
+  </sql>
+
+  <!-- 根据主键查询用户项目角色表 -->
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+    select
+    <include refid="Base_Column_List" />
+    from dmp_member_project_role
+    where member_project_role_id = #{memberProjectRoleId,jdbcType=INTEGER}
+  </select>
+	
+  <!-- 根据主键删除用户项目角色表 -->
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from dmp_member_project_role
+    where member_project_role_id = #{memberProjectRoleId,jdbcType=INTEGER}
+  </delete>
+
+  <!-- 插入用户项目角色表 -->
+  <insert id="insert" parameterType="com.jz.dmp.modules.model.DmpMemberProjectRole">
+    insert into dmp_member_project_role (
+    member_project_role_id, user_id, project_id, role_id
+    )
+    values (
+    #{memberProjectRoleId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{projectId,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}
+    )
+   </insert>
+   
+   <!-- 批量新增用户项目角色表 -->
+  <insert id="insertBatch" parameterType="com.jz.dmp.modules.model.DmpMemberProjectRole">
+    insert into dmp_member_project_role (
+    member_project_role_id, user_id, project_id, role_id
+    )
+    values 
+    <foreach collection="list" item="item" separator=",">
+    (
+    #{item.memberProjectRoleId,jdbcType=INTEGER}, #{item.userId,jdbcType=INTEGER}, #{item.projectId,jdbcType=INTEGER}, #{item.roleId,jdbcType=INTEGER}
+    )
+    </foreach>
+   </insert>
+	
+  <!-- 选择性插入用户项目角色表 -->
+  <insert id="insertSelective" parameterType="com.jz.dmp.modules.model.DmpMemberProjectRole">
+    insert into dmp_member_project_role
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="memberProjectRoleId != null" >
+        member_project_role_id,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="projectId != null" >
+        project_id,
+      </if>
+      <if test="roleId != null" >
+        role_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="memberProjectRoleId != null" >
+        #{memberProjectRoleId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="projectId != null" >
+        #{projectId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        #{roleId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+	
+  <!-- 修改用户项目角色表 -->
+  <update id="updateByPrimaryKey" parameterType="com.jz.dmp.modules.model.DmpMemberProjectRole">
+    update dmp_member_project_role set 
+          member_project_role_id = #{memberProjectRoleId,jdbcType=INTEGER},
+          user_id = #{userId,jdbcType=INTEGER},
+          project_id = #{projectId,jdbcType=INTEGER},
+          role_id = #{roleId,jdbcType=INTEGER}
+    where member_project_role_id = #{memberProjectRoleId,jdbcType=INTEGER}
+  </update>
+	
+  <!-- 选择性修改用户项目角色表 -->
+  <update id="updateByPrimaryKeySelective" parameterType="com.jz.dmp.modules.model.DmpMemberProjectRole">
+    update dmp_member_project_role
+    <set>
+      <if test="memberProjectRoleId != null" >
+        member_project_role_id = #{memberProjectRoleId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="projectId != null" >
+        project_id = #{projectId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        role_id = #{roleId,jdbcType=INTEGER},