添加用户管理模块

VisualInspection_server/pom.xml

@@ -148,7 +148,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.RC1</version>
+				<version>Dalston.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

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

@@ -1,13 +1,15 @@
 package com.xintong.visualinspection.bean;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
+
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * 文件名：User
@@ -17,11 +19,12 @@ import java.util.List;
 public class User implements UserDetails  {
     private Integer id;
     private String username;
+    private String truename;
     private Integer age;
     //工号
-    private String job_number;
+    private String workno;
     //身份证
-    private String id_number;
+    private String idno;
     //手机号
     private String mobile;
     //性别
@@ -29,9 +32,9 @@ public class User implements UserDetails  {
     //生日
     private Date birth;
     //部门id
-    private Integer department_id;
+    private Integer deptId;
     //职位id
-    private Integer job_id;
+    private Integer positionId;
     @JsonIgnore
     private String password;
     @JsonIgnore

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

@@ -0,0 +1,48 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import com.alibaba.fastjson.JSON;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@ControllerAdvice
+public class BaseController {
+    
+    /**
+     * 返回前台结果结构体
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    public String returnResult(int result_code,String result_desc, Object o){
+    	Map<String,Object> result = new HashMap<>();
+    	result.put("result_code", result_code);
+    	result.put("result_desc", result_desc);
+    	result.put("result_data", o);
+        return JSON.toJSON(result).toString();
+    }
+    
+    /** 基于@ExceptionHandler异常处理 */  
+    @ExceptionHandler  
+    public String exp(int errcode, Exception ex) {  
+//        request.setAttribute("ex", ex);
+        // 根据不同错误转向不同页面  
+    	String err;
+        if(ex instanceof NullPointerException) {  
+        	err = "空指针错误";
+        } else {  
+        	err = "好多错误";  
+        }  
+        return returnResult(errcode,err,null);
+    }  
+}

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

@@ -52,21 +52,21 @@ public class TestController {
         return "login";
     }
 
-    @RequestMapping(value = "/user", method = RequestMethod.GET)
+    @RequestMapping(value = "/user1", method = RequestMethod.GET)
     @ResponseBody
     public String getList(){
         return "hello getList";
     }
 
 
-    @RequestMapping(value = "/user", method = RequestMethod.POST)
+    @RequestMapping(value = "/user1", method = RequestMethod.POST)
     @ResponseBody
     public String save(){
         return "hello save";
     }
 
 
-    @RequestMapping(value = "/user", method = RequestMethod.PUT)
+    @RequestMapping(value = "/user1", method = RequestMethod.PUT)
     @ResponseBody
     public String update(){
         return "hello update";

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

@@ -0,0 +1,77 @@
+package com.xintong.visualinspection.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.UserService;
+
+/**
+ * 文件名：TestController
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@RestController
+@RequestMapping("/user")
+public class UserController extends BaseController {
+
+    @Autowired
+    private UserService userService;
+
+    @RequestMapping(value = "/test")
+    public String test(){
+        User u = userService.getOne((long) 1);
+        return JSON.toJSON(u).toString();
+    }
+    /**
+     * 添加用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/addUser")
+    public String addUser(@RequestBody User user) throws Exception{
+    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
+    	if(1==1) throw new Exception("dddd");
+    	userService.insert(user);
+    	return super.returnResult(0, "添加成功", null);
+    }
+    
+    /**
+     * 修改用户
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/updateUser")
+    public String updateUser(@RequestBody User user){
+        try{
+        	userService.update(user);
+        	return super.returnResult(0, "修改成功", null);
+        }catch(Exception e){
+        	return super.returnResult(-1, "修改失败", null);
+        }
+    }
+    
+    /**
+     * 删除用户（软删除）
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/deleteUser")
+    public String deleteUser(@RequestBody String id){
+        try{
+        	userService.delete(Long.parseLong(id));
+        	return super.returnResult(0, "删除成功", null);
+        }catch(Exception e){
+        	return super.returnResult(-1, "删除失败", null);
+        }
+    }
+}

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

@@ -24,21 +24,21 @@
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
         SELECT
         id,username,age,password
-        FROM sys_user
+        FROM t_sys_users
         WHERE id = #{id}
     </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
         INSERT INTO
-        sys_user
-        (username,age,password)
+        t_sys_users
+        (username,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
         VALUES
-        (#{username}, #{age},#{password})
+        (#{username},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.User" >
         UPDATE
-        sys_user
+        t_sys_users
         SET
         <if test="username != null">userName = #{username},</if>
         <if test="age != null">age = #{age},</if>
@@ -48,20 +48,25 @@
         id = #{id}
     </update>
 
-    <delete id="delete" parameterType="java.lang.Long" >
+	<update id="delete" parameterType="com.xintong.visualinspection.bean.User" >
+        UPDATE
+        	t_sys_users
+        SET
+        	status = -1
+        WHERE
+        	id = #{id}
+    </update>
+    <!-- <delete id="delete" parameterType="java.lang.Long" >
         DELETE FROM
-        sys_user
+        t_sys_users
         WHERE
         id =#{id}
-    </delete>
+    </delete> -->
 
 
     <select id="findByUserName" parameterType="String" resultMap="userMap">
         select u.*
-        ,r.name
-        from sys_user u
-        LEFT JOIN sys_role_user sru on u.id= sru.Sys_User_id
-        LEFT JOIN sys_role r on sru.sys_role_id=r.id
+        from t_sys_users u
         where username= #{username}
     </select>
 </mapper>

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

@@ -32,9 +32,9 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
         INSERT INTO
         sys_user
-        (username,age,password)
+        (username,age,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
         VALUES
-        (#{username}, #{age},#{password})
+        (#{username}, #{age},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.User" >

VisualInspection_server/src/main/java/com/xintong/visualinspection/securityTools/WebSecurityConfig.java

@@ -1,10 +1,9 @@
 package com.xintong.visualinspection.securityTools;
 
-import com.xintong.visualinspection.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Role;
+import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -12,9 +11,8 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
-import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring4.SpringTemplateEngine;
-import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
+
+import com.xintong.visualinspection.service.UserService;
 
 /**
  * 文件名：WebSecurityConfig
@@ -33,7 +31,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(userService); //user Details Service验证
+        auth.userDetailsService(userService).passwordEncoder(passwordEncoder());//user Details Service验证
     }
 
     @Override
@@ -45,7 +43,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
-                .anyRequest().authenticated() //任何请求,登录后可以访问
+                .anyRequest()
+                .authenticated() //任何请求,登录后可以访问
                 .and()
                 .formLogin()
                 .loginPage("/login")
@@ -59,4 +58,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     }
 
+    /**
+     * 设置用户密码的加密方式为MD5加密
+     * @return
+     */
+    @Bean
+    public Md5PasswordEncoder passwordEncoder() {
+        return new Md5PasswordEncoder();
+
+    }
 }

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

@@ -42,7 +42,7 @@ public class UserServiceImpl extends BaseService implements UserService {
 
     @Override
     public List<User> getAll() {
-        return userDao.getAll();
+        return userInfoDao.getAll();
     }
 
     @Override
@@ -53,35 +53,37 @@ public class UserServiceImpl extends BaseService implements UserService {
 
     @Override
     public void insert(User user) {
-        userDao.insert(user);
+    	User b=null;
+    	b.getAge();
+    	userInfoDao.insert(user);
     }
 
     @Override
     public void update(User user) {
-        userDao.update(user);
+    	userInfoDao.update(user);
     }
 
     @Override
     public void delete(Long id) {
-        userDao.delete(id);
+    	userInfoDao.delete(id);
     }
 
 
     private User getUserById(Long id){
         System.out.printf("数据库查询");
-        return userDao.getOne(id);
+        return userInfoDao.getOne(id);
     }
 
     @Override
     public UserDetails loadUserByUsername(String username) {
 
-        try {
-            userInfoDao.getAll();
-        }catch (Exception e){
-            System.out.print(e.getCause());
-        }
+//        try {
+//            userInfoDao.getAll();
+//        }catch (Exception e){
+//            System.out.print(e.getCause());
+//        }
 
-        User user = userDao.findByUserName(username);
+        User user = userInfoDao.findByUserName(username);
         if (user != null) {
             List<Permission> permissions = permissionDao.findByAdminUserId(user.getId());
             List<GrantedAuthority> grantedAuthorities = new ArrayList<>();

VisualInspection_server/src/test/java/com/xintong/visualinspection/VideocheckApplicationTests.java

@@ -1,4 +1,4 @@
-package com.xintong.videocheck;
+package com.xintong.visualinspection;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;