update...

潘钊
1 parent 57b395ef
Showing 6 changed files with 66 additions and 16 deletions
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/static/pages/permission/user/add.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -237,4 +237,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		}
 		return msg;
 	}
+
+	@RequestMapping(value = "/register" ,method = RequestMethod.POST)
+	public Map<String, Object> register(SysUser u){
+		return sysUserService.register(u);
+	}
 }
@@ -3,6 +3,8 @@ package com.bsth.service.sys;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.BaseService;
+import java.util.Map;
+
 public interface SysUserService extends BaseService<SysUser, Integer>{
 	SysUser findByUserName(String name);
@@ -10,4 +12,6 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	int changeEnabled(int id,int enabled);
 	int changePWD(int id,String newPWD);
+
+	Map<String,Object> register(SysUser u);
 }
 package com.bsth.service.sys.impl;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.SysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
 	@Autowired
 	SysUserRepository sysUserRepository;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
 	public SysUser findByUserName(String name) {
@@ -45,4 +49,25 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	public int changePWD(int id,String newPWD) {
 		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
 	}
+
+	@Override
+	public Map<String, Object> register(SysUser u) {
+		Map<String, Object> rs = new HashMap();
+		try{
+			//检查用户名是否存在
+			if(findByUserName(u.getUserName()) != null){
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "用户名" + u.getUserName() + "已存在！");
+			}
+			else{
+				u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
+				rs = super.save(u);
+			}
+		}catch (Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
 }
@@ -150,10 +150,26 @@
 			submitHandler : function(f) {
 				var params = form.serializeJSON();
 				error.hide();
-				console.log(params);
-				
-				//检查一下用户是否存在
-				$get('/user/all', {userName_eq: params.userName}, function(list){
+
+				$.ajax({
+					url: '/user/register',
+					type: 'POST',
+					traditional: true,
+					data: params,
+					success: function(rs){
+						if(!rs){
+							layer.msg('未知异常！');
+						}
+						if(rs.status=='SUCCESS'){
+							layer.msg('添加用户成功.');
+							loadPage('list.html');
+						}
+						else if(rs.status=='ERROR'){
+							layer.msg('添加失败[ ' + rs.msg + ']');
+						}
+					}
+				});
+				/*$get('/user/all', {userName_eq: params.userName}, function(list){
 					if(!list || list.length == 0){
 						console.log(params);
 						$.ajax({
@@ -166,14 +182,14 @@
 								loadPage('list.html');
 							}
 						});
-						/* $post('/user', params, function(res){
+						/!* $post('/user', params, function(res){
 							layer.msg('添加用户成功.');
 							loadPage('list.html');
-						}); */
+						}); *!/
 					}
 					else
 						layer.alert('用户【' + params.userName + '】已存在', {icon: 2, title: '提交被拒绝'});
-				});
+				});*/
 			}
 		});
 	});
@@ -129,7 +129,7 @@
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="备注，不超过20个字符">{{sch.remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -8,7 +8,7 @@ var gb_schedule_table = (function () {
     //车辆应发未发车辆数
     var car_yfwf_map = {};
     var schedule_sort = function (s1, s2) {
-        return s1.dfsjT - s2.dfsjT;
+        return s1.fcsjT - s2.fcsjT;
     };
     var show = function (cb) {