添加用户删除、更新

VisualInspection/js/user/addUser.js

@@ -1,19 +1,17 @@
 var dept_selectinput;
-var selectednodetemp;
+var usertemp;
 
 function loadUserData(nodedata) {
     var pnode = nodedata;
+    resetform()
 
     if (edittype == "add") {
         $("#dept_name").val("")
     }
     if (edittype == "edit") {
-        selectednodetemp = nodedata[0];
-        $("#dept_name").val(nodedata[0].name)
-        $("#dept_add_btn").html("保存")
-        if (pnode != null && pnode.length > 0) {
-            pnode = [dept_tree.getNodeByParam("id", pnode[0].pId, null)]
-        }
+        usertemp = nodedata;
+        pnode = [{ "id": usertemp.organid }]
+        initUserInfo()
     }
 
 
@@ -31,8 +29,71 @@ function loadUserData(nodedata) {
 
 }
 
+function resetform() {
+    $("#user_name").val("");
+    $("#user_true_name").val("");
+    $("#user_workno").val("");
+    $("#user_password").val("");
+    $("#user_confirm_password").val("")
+    $("#user_birth").val("")
+    $("#user_mobile").val("")
+    $("#user_position").val("")
+    $("#user_idno").val("")
+    $("#user_email").val("")
+
+}
+
+function initUserInfo() {
+
+    $("#user_name").val(usertemp.username);
+    $("#user_true_name").val(usertemp.truename);
+    $("#user_workno").val(usertemp.workno);
+    $("#user_password").val(usertemp.password);
+    $("#user_confirm_password").val(usertemp.password)
+    $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
+    $("#user_mobile").val(usertemp.mobile)
+    $("#user_position").val(usertemp.positionid)
+    $("#user_idno").val(usertemp.idno)
+    $("#user_email").val(usertemp.email)
+    if (typeof(usertemp.pic) != "undefinde" && usertemp.pic != null) {
+        $("#user_img_pre").removeClass("hide");
+        $("#user_img_add").addClass("hide");
+        var $section = $("#user_img_pre2");
+        var $span = $("<span class='up-span'>");
+        $span.appendTo($section);
+        var $img0 = $("<img class='close-upimg'>").on("click", function(event) {
+            event.preventDefault();
+            event.stopPropagation();
+            // $(".works-mask").show();
+            // delParent = $(this).parent();
+
+            $section.html("")
+            $("#user_img_add").removeClass("hide");
+            $("#user_img_pre").addClass("hide");
+
+        });
+        $img0.attr("src", "/js/lib/imageupload/img/a7.png").appendTo($section);
+        var $img = $("<img class='up-img up-opcity' id='user_pic'>");
+        $img.attr("src", base_server_url + usertemp.pic);
+        $img.appendTo($section);
+        var $p = $("<p class='img-name-p'>");
+        $p.html("image").appendTo($section);
+        var $input = $("<input id='taglocation' name='taglocation' value='' type='hidden'>");
+        $input.appendTo($section);
+        var $input2 = $("<input id='tags' name='tags' value='' type='hidden'/>");
+        $input2.appendTo($section);
+        $(".up-section").removeClass("loading");
+        $(".up-img").removeClass("up-opcity");
+    }
+
+
+}
+
+
 function addUser() {
 
+
+
     var username = $("#user_name").val();
     var userworkno = $("#user_workno").val();
     var userpassword = $("#user_password").val();
@@ -49,6 +110,7 @@ function addUser() {
     var parm = {
         "username": username,
         "password": userpassword,
+        "mobile": usermobile,
         "phone": usermobile,
         "workno": userworkno,
         "idno": useridno,
@@ -59,6 +121,21 @@ function addUser() {
         "positionid": 1,
         "truename": usertruename
     }
+    if (edittype == "edit") {
+        parm["id"] = usertemp.id;
+        UserUpdate(parm, function(data) {
+            layer.msg('修改成功！', {
+                time: 2000, //20s后自动关闭
+            }, function() {
+                $('#addUserModal').modal('hide')
+                updateUser(dept_selectinput.value)
+            });
+        }, function(error) {
+
+        });
+
+        return;
+    }
 
     UserAdd(parm, function(data) {
         layer.msg('添加成功！', {

VisualInspection/js/user/login.js

@@ -1,8 +1,9 @@
 $(document).ready(function() {
+    $.zui.store.set("user", "");
 
-    $('html').bind('keydown',function(e){
-        if(e.keyCode==13){
-        // alert('enter'); 
+    $('html').bind('keydown', function(e) {
+        if (e.keyCode == 13) {
+            // alert('enter'); 
             $('#loadingBtn').click();
         }
     });

VisualInspection/js/user/userManager.js

@@ -9,9 +9,9 @@
      flex: false,
      colClass: 'text-center'
  }, {
-     width: 10,
-     text: 'ID',
-     type: 'number',
+     width: 30,
+     text: '账号',
+     type: 'string',
      flex: false,
      colClass: 'text-center'
  }, {
@@ -35,13 +35,13 @@
      sort: 'down',
      colClass: 'text-center'
  }, {
-     width: 80,
+     width: 200,
      text: '角色',
      type: 'string',
      flex: true,
      colClass: 'text-center'
  }, {
-     width: 160,
+     width: 140,
      text: '操作',
      type: 'string',
      flex: true,
@@ -119,10 +119,26 @@
 
 
      $('.datatable').on('click', 'button', function() {
+         if (this.name == "user_edit") {
+             edittype = "edit"
+             var user = UserMap.get(parseInt(this.id));
+             loadUserData(user)
+             $('#addUserModal').modal('show')
+         }
+         if (this.name == "user_delete") {
+             UserDelete({ "id": this.id }, function(data) {
+                     layer.msg('用户删除成功！', {
+                         time: 2000, //20s后自动关闭
+                     }, function() {
+                         var nodedata = dept_tree.getSelectedNodes();
+                         updateUser(nodedata[0].id)
+                     });
+                 },
+                 function(error) {
+
+                 })
+         }
 
-         console.log(this.id)
-
-         console.log(UserMap.get(this.id))
      });
 
 
@@ -252,7 +268,7 @@
                      UserMap.set(user.id, user)
                      var userdata = {};
                      userdata["checked"] = false;
-                     userdata["data"] = [i + 1, user.id, user.username, user.workno == null ? -1 : user.workno, user.mobile, attr, '<button class="btn btn-primary" name="user_edit" id=' + user.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + user.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
+                     userdata["data"] = [i + 1, user.username, user.truename, user.workno == null ? -1 : user.workno, user.mobile, attr, '<button class="btn btn-primary" name="user_edit" id=' + user.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + user.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
                      rowdata.push(userdata);
                  }
              }

VisualInspection/js/util/const.js

@@ -3,6 +3,8 @@ var USER_LOGIN = "/user/auth/login"
 var USER_LOGOUT = "/user/logout"
 var USER_GET_LIST = "/user/getUserList"
 var USER_ADD = "/user/addUser"
+var USER_UPDATE = "/user/updateUser/"
+var USER_DELETE = "/user/deleteUser/"
 
 
 var UI_USER_LOGIN = "view/user/login"

VisualInspection/js/util/service.js

@@ -43,6 +43,34 @@ function UserAdd(data, success, fail) {
     });
 }
 
+function UserUpdate(data, success, fail) {
+    var url = base_server_url + USER_UPDATE + data.id
+    ajaxPut(url, data, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+function UserDelete(data, success, fail) {
+    var url = base_server_url + USER_DELETE + data.id
+    ajaxDelete(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
 
 function MenuGetAll(success, fail) {
     var url = base_server_url + MENU_GET_ALL

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

@@ -94,6 +94,9 @@ public class UserController extends BaseController {
     public String updateUser(@RequestBody User user,@PathVariable int userid){
         try{
         	user.setId(userid);
+        	if(user.getPassword()!=null){
+        		user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
+        	}
         	userService.update(user);
         	return super.returnResult(0, "修改成功", null);
         }catch(Exception e){

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

@@ -31,9 +31,9 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
         INSERT INTO
         t_sys_users
-        (username,password,TRUENAME,ORGANID,BIRTH,MOBILE,POSITIONID,WORKNO,IDNO,EMAIL,PIC)
+        (username,password,TRUENAME,ORGANID,BIRTH,MOBILE,PHONE,POSITIONID,WORKNO,IDNO,EMAIL,PIC)
         VALUES
-        (#{username},#{password},#{truename},#{organid},#{birth},#{phone},#{positionid},#{workno},#{idno},#{email},#{pic})
+        (#{username},#{password},#{truename},#{organid},#{birth},#{mobile},#{phone},#{positionid},#{workno},#{idno},#{email},#{pic})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.User" >
@@ -69,7 +69,7 @@
         SELECT
         *
         FROM t_sys_users
-        where 1=1
+        where 1=1 and status>0 
         <if test="organid != null and organid != 0">and organid = #{organid} </if>
         <if test="positionid != null and positionid != 0">and positionid = #{positionid} </if>
         <if test="classid != null and classid != 0">and classid = #{classid} </if>

VisualInspection_server/src/main/resources/application.properties

@@ -2,16 +2,16 @@ server.port=8089
 spring.thymeleaf.cache=false
 
 
-master.datasource.url = jdbc:mysql://localhost:3307/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:9001/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
-master.datasource.password = wenhongquan
+master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://localhost:3307/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://git.topm.win:9001/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
-cluster.datasource.password=wenhongquan
+cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
 cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*.xml
 
@@ -50,9 +50,9 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=localhost
+spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=32768  
+spring.redis.port=6379  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09