Commit 9f33d9f2 authored by ranjun's avatar ranjun

user关联数据库

parent 9860d1e1
...@@ -23,35 +23,34 @@ public class UserController { ...@@ -23,35 +23,34 @@ public class UserController {
private UserDao userDao; private UserDao userDao;
/** /**
* 新增用户 * 新增用户
* @param //userDto * @param userDto
* @return * @return
*/ */
@RequestMapping(value = "/save", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object saveUser(){//@RequestBody UserDto userDto public Object saveUser(@RequestBody UserDto userDto){
UserDto userDto = new UserDto(); UserVo u = userServiceImpl.getUser(userDto);
userDto.setUserName("test1"); if (u != null) {
userDto.setPassword("123456"); return new Result(4001,"该用户已存在",null);
userDto.setPhoneNumber("123456789110"); //throw new IllegalArgumentException(userDto.getUserName() + "已存在");
userDto.setCreateTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date())); }
userDto.setCount(0);
// if (u != null) {
// return new Result(4001,"该用户已存在",null);
// //throw new IllegalArgumentException(userDto.getUserName() + "已存在");
// }
UserVo userVo = userServiceImpl.saveUser(userDto); UserVo userVo = userServiceImpl.saveUser(userDto);
UserVo u = userServiceImpl.getUser(userDto.getUserName());
Result result = new Result(0,"SUCCESS",userVo); Result result = new Result(0,"SUCCESS",userVo);
return result; return result;
} }
/** /**
* 修改用户信息 * 修改用户信息
* @param userDto * @param //userDto
* @return * @return
*/ */
@RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/update", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Object updateUser(@RequestBody UserDto userDto){ public Object updateUser(){//@RequestBody UserDto userDto
UserDto userDto = new UserDto();
userDto.setUserName("test11234111");
userDto.setPassword("12345612");
userDto.setPhoneNumber("123456789110");
userDto.setCreateTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
userDto.setCount(0);
UserVo userVo = userServiceImpl.updateUser(userDto); UserVo userVo = userServiceImpl.updateUser(userDto);
Result result = new Result(0,"SUCCESS",userVo); Result result = new Result(0,"SUCCESS",userVo);
return result; return result;
......
package com.pangding.web.tright.dao; package com.pangding.web.tright.dao;
import com.pangding.web.tright.vo.UserRoleRelation;
import com.pangding.web.tright.vo.UserVo; import com.pangding.web.tright.vo.UserVo;
import com.yanzuoguang.dao.BaseDao; import com.yanzuoguang.dao.BaseDao;
...@@ -9,13 +10,13 @@ public interface UserDao extends BaseDao { ...@@ -9,13 +10,13 @@ public interface UserDao extends BaseDao {
// int saveUser(UserVo userVo); // int saveUser(UserVo userVo);
// //
UserVo getUser(String username); UserVo getUser(UserVo userVo);
// //
// int update(UserVo userVo); // int update(UserVo userVo);
//
// int deleteUserRole(Long userId); int deleteUserRole(UserRoleRelation userRoleRelation);
//
// int saveUserRoles(Long userId, List<Long> roleIds); int saveUserRoles(List<UserRoleRelation> userRoleRelations);
//
// UserVo getById(Long id); // UserVo getById(Long id);
} }
package com.pangding.web.tright.dao.impl; package com.pangding.web.tright.dao.impl;
import com.pangding.web.tright.dao.UserDao; import com.pangding.web.tright.dao.UserDao;
import com.pangding.web.tright.vo.UserRoleRelation;
import com.pangding.web.tright.vo.UserVo; import com.pangding.web.tright.vo.UserVo;
import com.yanzuoguang.dao.DaoConst; import com.yanzuoguang.dao.DaoConst;
import com.yanzuoguang.dao.Impl.BaseDaoImpl; import com.yanzuoguang.dao.Impl.BaseDaoImpl;
...@@ -10,10 +11,14 @@ import com.yanzuoguang.util.vo.PageSizeReqVo; ...@@ -10,10 +11,14 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
import java.util.Map;
@Component @Component
public class UserDaoImpl extends BaseDaoImpl implements UserDao { public class UserDaoImpl extends BaseDaoImpl implements UserDao {
final String GET_USER = "GET_USER"; final String GET_USER = "GET_USER";
final String DELETE_USER_ROLE="deleteUserRole";
final String SAVE_USER_ROLE = "saveUserRoles";
// @Override // @Override
// public int saveUser(UserVo userVo) { // public int saveUser(UserVo userVo) {
// //
...@@ -23,7 +28,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao { ...@@ -23,7 +28,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
// } // }
// //
// //
// @Override // @Override
// public int update(UserVo userVo) { // public int update(UserVo userVo) {
// return 0; // return 0;
...@@ -47,12 +52,30 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao { ...@@ -47,12 +52,30 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
@Override @Override
protected void init() { protected void init() {
register(UserVo.class); register(UserVo.class);
Table.add(GET_USER, "SELECT p.* FROM pd_user p WHERE 1=1 ").add("username"," AND p.user_name = ?");
Table.add(GET_USER, "SELECT p.* FROM pd_user p WHERE 1=1 ")
.add("username", " AND p.user_name = ?");
Table.add(DELETE_USER_ROLE,"delete from pd_user_role_relation where tu_id = ?");
} }
@Override
public UserVo getUser(UserVo userVo) {
return this.queryFirst(UserVo.class, GET_USER, userVo);
}
@Override
public int deleteUserRole(UserRoleRelation userRoleRelation) {
return this.updateSql(DELETE_USER_ROLE,userRoleRelation);
}
@Override @Override
public UserVo getUser(String username) { public int saveUserRoles(List<UserRoleRelation> userRoleRelations) {
this.queryPage(UserVo.class,new PageSizeReqVo(),GET_USER,username).getList().get(0); for (UserRoleRelation userRoleRelation : userRoleRelations) {
//this.query(GET_USER,username); this.create(userRoleRelation);
return null; }
return userRoleRelations.size();
} }
} }
...@@ -9,7 +9,7 @@ public interface UserService { ...@@ -9,7 +9,7 @@ public interface UserService {
UserVo updateUser(UserDto userDto); UserVo updateUser(UserDto userDto);
UserVo getUser(String username); UserVo getUser(UserVo userVo);
String passwordEncoder(String credentials, String salt); String passwordEncoder(String credentials, String salt);
} }
...@@ -3,11 +3,13 @@ package com.pangding.web.tright.service.impl; ...@@ -3,11 +3,13 @@ package com.pangding.web.tright.service.impl;
import com.pangding.web.tright.dao.UserDao; import com.pangding.web.tright.dao.UserDao;
import com.pangding.web.tright.dto.UserDto; import com.pangding.web.tright.dto.UserDto;
import com.pangding.web.tright.service.UserService; import com.pangding.web.tright.service.UserService;
import com.pangding.web.tright.vo.UserRoleRelation;
import com.pangding.web.tright.vo.UserVo; import com.pangding.web.tright.vo.UserVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Service @Service
...@@ -19,37 +21,46 @@ public class UserServiceImpl implements UserService { ...@@ -19,37 +21,46 @@ public class UserServiceImpl implements UserService {
@Override @Override
public UserVo saveUser(UserDto userDto) { public UserVo saveUser(UserDto userDto) {
UserVo userVo = userDto; UserVo userVo = userDto;
//
userDao.create(userVo); userDao.create(userVo);
//userDao.saveUser(userVo); userAndRole(userDto);
saveUserRoles(userVo.getTuId(), userDto.getRoleIds());
return userVo; return userVo;
} }
private void saveUserRoles(Long userId, List<Long> roleIds) { private void saveUserRoles(List<UserRoleRelation> userRoleRelations) {
if (roleIds != null) { userDao.deleteUserRole(userRoleRelations.get(0));
//userDao.deleteUserRole(userId); if (!CollectionUtils.isEmpty(userRoleRelations)) {
if (!CollectionUtils.isEmpty(roleIds)) { userDao.saveUserRoles(userRoleRelations);
//userDao.saveUserRoles(userId, roleIds);
} }
}
} }
@Override @Override
public UserVo updateUser(UserDto userDto) { public UserVo updateUser(UserDto userDto) {
userDao.update(userDto); userDao.update(userDto);
saveUserRoles(userDto.getTuId(), userDto.getRoleIds()); userAndRole(userDto);
return userDto; return userDto;
} }
@Override @Override
public UserVo getUser(String username) { public UserVo getUser(UserVo userVo) {
return userDao.getUser(username); return userDao.getUser(userVo);
} }
@Override @Override
public String passwordEncoder(String credentials, String salt) { public String passwordEncoder(String credentials, String salt) {
return null; return null;
} }
private void userAndRole(UserDto userDto){
if (userDto.getRoleIds()!=null&&userDto.getRoleIds().size()!=0) {
List<Long> longs = userDto.getRoleIds();//多个角色
List<UserRoleRelation> userRoleRelations = new ArrayList<>();
for (Long l : longs) {
UserRoleRelation userRoleRelation = new UserRoleRelation();
userRoleRelation.setTr_id(l);
userRoleRelation.setTu_id(userDto.getTuId());
userRoleRelations.add(userRoleRelation);
}
saveUserRoles(userRoleRelations);
}
}
} }
package com.pangding.web.tright.vo;
import com.yanzuoguang.dao.TableAnnotation;
@TableAnnotation("pd_user_role_relation")
public class UserRoleRelation {
private Long tru_id;
private Long tr_id;
private Long tu_id;
public Long getTru_id() {
return tru_id;
}
public void setTru_id(Long tru_id) {
this.tru_id = tru_id;
}
public Long getTr_id() {
return tr_id;
}
public void setTr_id(Long tr_id) {
this.tr_id = tr_id;
}
public Long getTu_id() {
return tu_id;
}
public void setTu_id(Long tu_id) {
this.tu_id = tu_id;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment