修改service

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Menu.java

@@ -0,0 +1,26 @@
+package com.xintong.visualinspection.bean;
+
+import lombok.Data;
+
+/**
+ * 文件名：Job 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class Menu {
+	// 编号
+	private Integer id;
+	// 名称
+	private String menuname;
+	// 地址
+	private String url;
+	// 父id
+	private Integer parentId;
+	// 图标类名称
+	private String iconClass;
+	// 菜单类型 10—UI 20—Api
+	private Integer type;
+	// 排序编号
+	private Integer sortNo;
+	
+	private Integer status;
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -0,0 +1,176 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.securityTools.RedisCacheUtil;
+import com.xintong.visualinspection.service.AuthService;
+import com.xintong.visualinspection.service.UserService;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+/**
+ * @author wenhongquan
+ *
+ */
+/**
+ * @author wenhongquan
+ *
+ */
+@RestController
+@RequestMapping("/dept")
+public class DepartmentController extends BaseController {
+
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private AuthService authService;
+    
+    @Autowired
+    private RedisCacheUtil redisCacheUtil;
+    
+    @Value("${jwt.header}")
+    private String tokenHeader;
+
+    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String login(@RequestBody User user){
+    	User u = authService.login(user.getUsername(), user.getPassword());
+        return returnSuccessResult("登陆成功", u);
+    }
+    
+   
+    
+    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String logout(){
+    	//获取用户名
+    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
+    	if(username!=null){
+    		redisCacheUtil.removeForUserName(username);
+    	}
+    	//返回成功
+    	return returnSuccessResult("退出成功");
+    }
+    
+    
+    
+    
+    
+    /**
+     * 添加用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addUser(@RequestBody User user) throws Exception{
+    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
+    	userService.insert(user);
+    	return returnResult(0, "添加成功", null);
+    }
+    
+    /**
+     * 修改用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updateUser(@RequestBody User user,@PathVariable int userid){
+        try{
+        	user.setId(userid);
+        	userService.update(user);
+        	return super.returnResult(0, "修改成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20003);
+        }
+    }
+    
+    /**
+     * 删除用户（软删除）
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deleteUser(@PathVariable Integer userid){
+        try{
+        	userService.delete((userid));
+        	return returnResult(0, "删除成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20002);
+        }
+    }
+    
+    /**
+     * 获取所用用户
+     * @param page
+     * @param size
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+	@PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getAll();
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getUsers(user);
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getUser(@PathVariable Integer userid){
+        try{
+            User u = userService.getOne(userid);
+        	return returnResult(0, "获取成功", u);
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    
+    
+
+
+    
+    
+    
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/MenuController.java

@@ -0,0 +1,172 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.securityTools.RedisCacheUtil;
+import com.xintong.visualinspection.service.AuthService;
+import com.xintong.visualinspection.service.UserService;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+/**
+ * @author wenhongquan
+ *
+ */
+@RestController
+@RequestMapping("/menu")
+public class MenuController extends BaseController {
+
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private AuthService authService;
+    
+    @Autowired
+    private RedisCacheUtil redisCacheUtil;
+    
+    @Value("${jwt.header}")
+    private String tokenHeader;
+
+    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String login(@RequestBody User user){
+    	User u = authService.login(user.getUsername(), user.getPassword());
+        return returnSuccessResult("登陆成功", u);
+    }
+    
+   
+    
+    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String logout(){
+    	//获取用户名
+    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
+    	if(username!=null){
+    		redisCacheUtil.removeForUserName(username);
+    	}
+    	//返回成功
+    	return returnSuccessResult("退出成功");
+    }
+    
+    
+    
+    
+    
+    /**
+     * 添加用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addUser(@RequestBody User user) throws Exception{
+    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
+    	userService.insert(user);
+    	return returnResult(0, "添加成功", null);
+    }
+    
+    /**
+     * 修改用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updateUser(@RequestBody User user,@PathVariable int userid){
+        try{
+        	user.setId(userid);
+        	userService.update(user);
+        	return super.returnResult(0, "修改成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20003);
+        }
+    }
+    
+    /**
+     * 删除用户（软删除）
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deleteUser(@PathVariable Integer userid){
+        try{
+        	userService.delete((userid));
+        	return returnResult(0, "删除成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20002);
+        }
+    }
+    
+    /**
+     * 获取所用用户
+     * @param page
+     * @param size
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+	@PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getAll();
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getUsers(user);
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getUser(@PathVariable Integer userid){
+        try{
+            User u = userService.getOne(userid);
+        	return returnResult(0, "获取成功", u);
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    
+    
+
+
+    
+    
+    
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/PermissionController.java

@@ -0,0 +1,176 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.securityTools.RedisCacheUtil;
+import com.xintong.visualinspection.service.AuthService;
+import com.xintong.visualinspection.service.UserService;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+/**
+ * @author wenhongquan
+ *
+ */
+/**
+ * @author wenhongquan
+ *
+ */
+@RestController
+@RequestMapping("/permission")
+public class PermissionController extends BaseController {
+
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private AuthService authService;
+    
+    @Autowired
+    private RedisCacheUtil redisCacheUtil;
+    
+    @Value("${jwt.header}")
+    private String tokenHeader;
+
+    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String login(@RequestBody User user){
+    	User u = authService.login(user.getUsername(), user.getPassword());
+        return returnSuccessResult("登陆成功", u);
+    }
+    
+   
+    
+    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String logout(){
+    	//获取用户名
+    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
+    	if(username!=null){
+    		redisCacheUtil.removeForUserName(username);
+    	}
+    	//返回成功
+    	return returnSuccessResult("退出成功");
+    }
+    
+    
+    
+    
+    
+    /**
+     * 添加用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addUser(@RequestBody User user) throws Exception{
+    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
+    	userService.insert(user);
+    	return returnResult(0, "添加成功", null);
+    }
+    
+    /**
+     * 修改用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updateUser(@RequestBody User user,@PathVariable int userid){
+        try{
+        	user.setId(userid);
+        	userService.update(user);
+        	return super.returnResult(0, "修改成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20003);
+        }
+    }
+    
+    /**
+     * 删除用户（软删除）
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deleteUser(@PathVariable Integer userid){
+        try{
+        	userService.delete((userid));
+        	return returnResult(0, "删除成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20002);
+        }
+    }
+    
+    /**
+     * 获取所用用户
+     * @param page
+     * @param size
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+	@PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getAll();
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getUsers(user);
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getUser(@PathVariable Integer userid){
+        try{
+            User u = userService.getOne(userid);
+        	return returnResult(0, "获取成功", u);
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    
+    
+
+
+    
+    
+    
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/RoleController.java

@@ -0,0 +1,176 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.securityTools.RedisCacheUtil;
+import com.xintong.visualinspection.service.AuthService;
+import com.xintong.visualinspection.service.UserService;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+/**
+ * @author wenhongquan
+ *
+ */
+/**
+ * @author wenhongquan
+ *
+ */
+@RestController
+@RequestMapping("/role")
+public class RoleController extends BaseController {
+
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private AuthService authService;
+    
+    @Autowired
+    private RedisCacheUtil redisCacheUtil;
+    
+    @Value("${jwt.header}")
+    private String tokenHeader;
+
+    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String login(@RequestBody User user){
+    	User u = authService.login(user.getUsername(), user.getPassword());
+        return returnSuccessResult("登陆成功", u);
+    }
+    
+   
+    
+    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String logout(){
+    	//获取用户名
+    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
+    	if(username!=null){
+    		redisCacheUtil.removeForUserName(username);
+    	}
+    	//返回成功
+    	return returnSuccessResult("退出成功");
+    }
+    
+    
+    
+    
+    
+    /**
+     * 添加用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addUser(@RequestBody User user) throws Exception{
+    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
+    	userService.insert(user);
+    	return returnResult(0, "添加成功", null);
+    }
+    
+    /**
+     * 修改用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updateUser(@RequestBody User user,@PathVariable int userid){
+        try{
+        	user.setId(userid);
+        	userService.update(user);
+        	return super.returnResult(0, "修改成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20003);
+        }
+    }
+    
+    /**
+     * 删除用户（软删除）
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deleteUser(@PathVariable Integer userid){
+        try{
+        	userService.delete((userid));
+        	return returnResult(0, "删除成功", null);
+        }catch(Exception e){
+        	throw new BusinessException(20002);
+        }
+    }
+    
+    /**
+     * 获取所用用户
+     * @param page
+     * @param size
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+	@PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getAll();
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @PreAuthorize("hasRole('ADMIN')")
+    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+        try{
+        	PageHelper.startPage(page, size); 
+        	List<User> users= userService.getUsers(user);
+        	
+        	return returnResult(0, "获取成功", new PageInfo(users));
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getUser(@PathVariable Integer userid){
+        try{
+            User u = userService.getOne(userid);
+        	return returnResult(0, "获取成功", u);
+        }catch(Exception e){
+        	throw new BusinessException(20001);
+        }
+    }
+    
+    
+    
+
+
+    
+    
+    
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -0,0 +1,19 @@
+package com.xintong.visualinspection.dao.cluster;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.xintong.visualinspection.bean.Organ;
+
+/**
+ * 文件名：UserInfoDao
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Mapper
+public interface DepartmentDao  {
+    public List<Organ> getOrgan(Organ organ);
+    public void insert(Organ organ);
+    public void update(Organ organ);
+    public void delete(Integer id);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/MenuDao.java

@@ -0,0 +1,19 @@
+package com.xintong.visualinspection.dao.master;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.xintong.visualinspection.bean.Menu;
+
+/**
+ * 文件名：UserInfoDao
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Mapper
+public interface MenuDao  {
+    public List<Menu> getMenu(Menu menu);
+    public void insert(Menu menu);
+    public void update(Menu menu);
+    public void delete(Integer id);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/RoleDao.java

@@ -0,0 +1,19 @@
+package com.xintong.visualinspection.dao.master;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.xintong.visualinspection.bean.Role;
+
+/**
+ * 文件名：UserInfoDao
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Mapper
+public interface RoleDao  {
+    public List<Role> getRole(Role role);
+    public void insert(Role role);
+    public void update(Role role);
+    public void delete(Integer id);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -0,0 +1,79 @@
+<?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.xintong.visualinspection.dao.cluster.DepartmentDao" >
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Organ" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="organname" property="organname" jdbcType="VARCHAR" />
+        <result column="parentid" property="parentid" jdbcType="INTEGER" />
+        <result column="remark" property="remark" jdbcType="VARCHAR" />
+        <result column="classtype" property="classtype" jdbcType="VARCHAR" />
+        <result column="organcode" property="organcode" jdbcType="VARCHAR" />
+        <result column="isshow" property="isshow" jdbcType="VARCHAR" />
+        <result column="deptype" property="deptype" jdbcType="VARCHAR" />
+        <result column="status" property="status" jdbcType="INTEGER" />
+    </resultMap>
+
+   <!--  <select id="getAll" resultMap="BaseResultMap"  >
+        SELECT
+        id,organname,remark,parentid,classtype,organcode,isshow,deptype,status 
+        FROM t_sys_organ
+    </select>
+
+    <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+        SELECT
+        id,organname,remark,parentid,classtype,organcode,isshow,deptype,status
+        FROM t_sys_organ
+        WHERE id = #{id}
+    </select> -->
+    
+    <select id="getOrgan" parameterType="com.xintong.visualinspection.bean.Organ" resultMap="BaseResultMap">
+        SELECT 
+        id,organname,remark,parentid,classtype,organcode,isshow,deptype,status
+         FROM t_sys_organ
+         where 1=1
+         <if test="organname != null">and organname = #{organname}</if>
+         <if test="remark != null">and remark = #{remark}</if>
+         <if test="parentid != null and parentid!=0">and parentid = #{parentid}</if>
+         <if test="classtype != null">and classtype = #{classtype}</if>
+         <if test="organcode != null">and organcode = #{organcode}</if>
+         <if test="isshow != null">and isshow = #{isshow}</if>
+         <if test="deptype != null">and deptype = #{deptype}</if>
+         <if test="status != null">and status = #{status}</if>
+         <if test="id != null and id != 0">and id = #{id}</if>
+    </select>
+    
+
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.Organ" >
+        INSERT INTO
+        t_sys_organ
+        (organname,remark,parentid,classtype,organcode,isshow,deptype)
+        VALUES
+        (#{organname},#{remark},#{parentid},#{classtype},#{organcode},#{isshow},#{deptype})
+    </insert>
+
+    <update id="update" parameterType="com.xintong.visualinspection.bean.Organ" >
+        UPDATE
+        t_sys_organ
+        SET
+        <if test="organname != null">organname = #{organname},</if>
+        <if test="remark != null">remark = #{remark},</if>
+        <if test="parentid != null and parentid!=0">parentid = #{parentid},</if>
+        <if test="classtype != null">classtype = #{classtype},</if>
+        <if test="organcode != null">organcode = #{organcode},</if>
+        <if test="isshow != null">isshow = #{isshow},</if>
+        <if test="deptype != null">deptype = #{deptype},</if>
+        id = #{id}
+        WHERE
+        id = #{id}
+    </update>
+
+    <delete id="delete" parameterType="java.lang.Integer" >
+        update t_sys_organ
+         set status=-1
+        WHERE
+        id =#{id}
+    </delete>
+
+
+    
+</mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/MenuMapper.xml

@@ -0,0 +1,60 @@
+<?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.xintong.visualinspection.dao.master.MenuDao" >
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Menu" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="menuname" property="menuname" jdbcType="VARCHAR" />
+        <result column="url" property="url" jdbcType="VARCHAR" />
+        <result column="iconClass" property="iconClass" jdbcType="VARCHAR" />
+        <result column="parentId" property="parentId" jdbcType="INTEGER" />
+        <result column="type" property="type" jdbcType="INTEGER" />     
+        <result column="sortNo" property="sortNo" jdbcType="INTEGER" />  
+        <result column="status" property="status" jdbcType="INTEGER" />        
+    </resultMap>
+
+   <select id="getMenu" parameterType="com.xintong.visualinspection.bean.Menu" resultMap="BaseResultMap">
+        SELECT 
+        id,menuname,url,iconClass,parentId,type,sortNo,status 
+         FROM sys_menu
+         where 1=1
+         <if test="id != null and id != 0">and id = #{id}</if>
+         <if test="menuname != null">and menuname = #{menuname}</if>
+         <if test="iconClass != null">and iconClass = #{iconClass}</if>
+         <if test="url != null">and url = #{url}</if>
+         <if test="parentId != null and parentId != 0">and parentId = #{parentId}</if>
+         <if test="type != null and type != 0">and type = #{type}</if>
+         <if test="sortNo != null and sortNo != 0">and sortNo = #{sortNo}</if>
+         <if test="status != null">and status = #{status}</if>
+    </select>
+    
+
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.Menu" >
+        INSERT INTO
+        sys_menu
+        (menuname,url,iconClass,parentId,type,sortNo,status)
+        VALUES
+        (#{menuname},#{url},#{iconClass},#{parentId},#{type},#{sortNo},#{status})
+    </insert>
+
+    <update id="update" parameterType="com.xintong.visualinspection.bean.Menu" >
+        UPDATE
+        sys_menu
+        SET
+         id = #{id}
+         <if test="menuname != null">, menuname = #{menuname}</if>
+         <if test="iconClass != null">, iconClass = #{iconClass}</if>
+         <if test="url != null">, url = #{url}</if>
+         <if test="parentId != null and parentId != 0">, parentId = #{parentId}</if>
+         <if test="type != null and type != 0">, type = #{type}</if>
+         <if test="sortNo != null and sortNo != 0">, sortNo = #{sortNo}</if>
+        WHERE
+        id = #{id}
+    </update>
+
+    <delete id="delete" parameterType="java.lang.Integer" >
+        update sys_menu
+         set status=-1
+        WHERE
+        id =#{id}
+    </delete>
+</mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/RoleMapper.xml

@@ -0,0 +1,44 @@
+<?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.xintong.visualinspection.dao.master.RoleDao" >
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Role" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+    </resultMap>
+    
+    
+     <select id="getRole" parameterType="com.xintong.visualinspection.bean.Role" resultMap="BaseResultMap">
+        SELECT 
+        id,name,status 
+         FROM sys_role
+         where 1=1
+         <if test="id != null and id != 0">and id = #{id}</if>
+         <if test="name != null">and name = #{name}</if>
+    </select>
+    
+
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.Role" >
+        INSERT INTO
+        sys_role
+        (name)
+        VALUES
+        (#{name})
+    </insert>
+
+    <update id="update" parameterType="com.xintong.visualinspection.bean.Role" >
+        UPDATE
+        sys_role
+        SET
+        <if test="name != null">name = #{name},</if>
+        id = #{id}
+        WHERE
+        id = #{id}
+    </update>
+
+    <delete id="delete" parameterType="java.lang.Integer" >
+        update sys_role
+         set status=-1
+        WHERE
+        id =#{id}
+    </delete>
+</mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/DepartmentService.java

@@ -0,0 +1,18 @@
+package com.xintong.visualinspection.service;
+
+import java.util.List;
+
+import com.xintong.visualinspection.bean.Organ;
+
+/**
+ * 文件名：UserService 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+public interface DepartmentService {
+	public List<Organ> getOrgans(Organ organ);
+
+	public void insert(Organ organ);
+
+	public void update(Organ organ);
+
+	public void delete(Integer id);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/MenuService.java

@@ -0,0 +1,16 @@
+package com.xintong.visualinspection.service;
+
+import java.util.List;
+
+import com.xintong.visualinspection.bean.Menu;
+
+/**
+ * 文件名：UserService
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+public interface MenuService {
+    public List<Menu> getMenus(Menu menu);
+    public void insert(Menu menu);
+    public void update(Menu menu);
+    public void delete(Integer id);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/PermissionService.java

@@ -0,0 +1,18 @@
+package com.xintong.visualinspection.service;
+
+import java.util.List;
+
+import com.xintong.visualinspection.bean.Permission;
+
+/**
+ * 文件名：UserService 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+public interface PermissionService {
+	public List<Permission> getPermissions(Permission permission);
+
+	public void insert(Permission permission);
+
+	public void update(Permission permission);
+
+	public void delete(Integer id);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/RoleService.java

@@ -0,0 +1,19 @@
+package com.xintong.visualinspection.service;
+
+import java.util.List;
+
+import com.xintong.visualinspection.bean.Role;
+
+/**
+ * 文件名：UserService
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+public interface RoleService  {
+	public List<Role> getRoles(Role role);
+
+	public void insert(Role role);
+
+	public void update(Role role);
+
+	public void delete(Integer id);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/DepartmentServiceImpl.java

@@ -0,0 +1,57 @@
+package com.xintong.visualinspection.service.impl;
+
+import java.util.List;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.dao.cluster.DepartmentDao;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.DepartmentService;
+
+import lombok.Data;
+
+/**
+ * 文件名：UserServiceImpl
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Service
+@Data
+public class DepartmentServiceImpl extends BaseService implements DepartmentService {
+
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(DepartmentService.class);
+
+
+    @Autowired
+    private DepartmentDao departmentDao;
+
+
+	@Override
+	public List<Organ> getOrgans(Organ organ) {
+		return departmentDao.getOrgan(organ);
+	}
+
+
+	@Override
+	public void insert(Organ organ) {
+		departmentDao.insert(organ);
+		
+	}
+
+
+	@Override
+	public void update(Organ organ) {
+		departmentDao.update(organ);		
+	}
+
+
+	@Override
+	public void delete(Integer id) {
+		departmentDao.delete(id);
+	}
+
+ 
+
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/MenuServiceImpl.java

@@ -0,0 +1,61 @@
+package com.xintong.visualinspection.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.crsh.shell.impl.command.system.repl;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import com.xintong.visualinspection.bean.Menu;
+import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.dao.cluster.UserInfoDao;
+import com.xintong.visualinspection.dao.master.MenuDao;
+import com.xintong.visualinspection.dao.master.PermissionDao;
+import com.xintong.visualinspection.pojo.SimpleGrantedAuthority;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.MenuService;
+
+import lombok.Data;
+
+/**
+ * 文件名：UserServiceImpl 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017
+ * 版权所有.
+ */
+@Service
+@Data
+public class MenuServiceImpl extends BaseService implements MenuService {
+
+	private static final org.slf4j.Logger logger = LoggerFactory.getLogger(MenuService.class);
+
+	@Autowired
+	private MenuDao menuDao;
+
+	@Override
+	public List<Menu> getMenus(Menu menu) {
+		return menuDao.getMenu(menu);
+	}
+
+	@Override
+	public void insert(Menu menu) {
+		menuDao.insert(menu);
+
+	}
+
+	@Override
+	public void update(Menu menu) {
+		menuDao.update(menu);
+	}
+
+	@Override
+	public void delete(Integer id) {
+		menuDao.delete(id);
+	}
+
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/PermissionServiceImpl.java

@@ -0,0 +1,48 @@
+package com.xintong.visualinspection.service.impl;
+
+import java.util.List;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.dao.master.PermissionDao;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.PermissionService;
+
+import lombok.Data;
+
+/**
+ * 文件名：UserServiceImpl
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Service
+@Data
+public class PermissionServiceImpl extends BaseService implements PermissionService {
+
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(PermissionService.class);
+
+    private PermissionDao permissionDao;
+
+	@Override
+	public List<Permission> getPermissions(Permission permission) {
+		return permissionDao.getPermission(permission);
+	}
+
+	@Override
+	public void insert(Permission permission) {
+		permissionDao.insert(permission);
+	}
+
+	@Override
+	public void update(Permission permission) {
+		permissionDao.update(permission);
+	}
+
+	@Override
+	public void delete(Integer id) {
+		permissionDao.delete(id);
+	}
+
+  
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/RoleServiceImpl.java

@@ -0,0 +1,65 @@
+package com.xintong.visualinspection.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.bean.Role;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.dao.cluster.UserInfoDao;
+import com.xintong.visualinspection.dao.master.PermissionDao;
+import com.xintong.visualinspection.dao.master.RoleDao;
+import com.xintong.visualinspection.pojo.SimpleGrantedAuthority;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.RoleService;
+
+import lombok.Data;
+
+/**
+ * 文件名：UserServiceImpl
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Service
+@Data
+public class RoleServiceImpl extends BaseService implements RoleService {
+
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(RoleService.class);
+
+
+    @Autowired
+    private RoleDao roleDao;
+
+
+	@Override
+	public List<Role> getRoles(Role role) {
+		return roleDao.getRole(role);
+	}
+
+
+	@Override
+	public void insert(Role role) {
+		roleDao.insert(role);
+	}
+
+
+	@Override
+	public void update(Role role) {
+		roleDao.update(role);
+	}
+
+
+	@Override
+	public void delete(Integer id) {
+		roleDao.delete(id);
+	}
+
+    
+}