Commit 8f8a0bb6 by Java-曹文达

注册接口开发

parent 12dda71c
package com.bbd.bpm.controller.user; package com.bbd.bpm.controller.user;
import com.bbd.bpm.base.PageBean; import com.bbd.bpm.base.PageBean;
import com.bbd.bpm.domain.User;
import com.bbd.bpm.result.RespCode; import com.bbd.bpm.result.RespCode;
import com.bbd.bpm.result.Result; import com.bbd.bpm.result.Result;
import com.bbd.bpm.result.ResultUtil; import com.bbd.bpm.result.ResultUtil;
...@@ -184,6 +185,20 @@ public class UserApiController { ...@@ -184,6 +185,20 @@ public class UserApiController {
} }
/**
* @Author:cwd
* 添加用户
* @Date: 2019.4.4
* @return
*/
@RequestMapping(value = "/addUser",method = RequestMethod.POST)
@ResponseBody
public Result addUser(User user){
Result result= userInfoService.addUser(user);
return result;
}
} }
...@@ -33,4 +33,6 @@ public interface UserInfoMapper extends BaseMapper<BpmCompany>{ ...@@ -33,4 +33,6 @@ public interface UserInfoMapper extends BaseMapper<BpmCompany>{
List<ActReModelEntity> getList(@Param("modelName") String modelName); List<ActReModelEntity> getList(@Param("modelName") String modelName);
List<User> userList(@Param("userName") String userName); List<User> userList(@Param("userName") String userName);
void addUser(User user);
} }
...@@ -114,4 +114,16 @@ ...@@ -114,4 +114,16 @@
</select> </select>
<insert id="addUser" parameterType="com.bbd.bpm.domain.User">
INSERT INTO `user` (
user_Uuid,
username,
password,
email,
telephone
)
VALUES
(#{userUuid},#{username},#{password},#{email},#{telephone})
</insert>
</mapper> </mapper>
\ No newline at end of file
package com.bbd.bpm.domain; package com.bbd.bpm.domain;
import lombok.Data;
import javax.persistence.*; import javax.persistence.*;
/** /**
...@@ -9,6 +11,7 @@ import javax.persistence.*; ...@@ -9,6 +11,7 @@ import javax.persistence.*;
//用户信息表 //用户信息表
@Entity @Entity
@Table(name = "user") @Table(name = "user")
@Data
public class User { public class User {
@Id @Id
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
...@@ -42,6 +45,8 @@ public class User { ...@@ -42,6 +45,8 @@ public class User {
@Column(name="last_time") @Column(name="last_time")
private String lastTime; //上次登录时间 private String lastTime; //上次登录时间
@Column(name = "content") //角色描述
private String content;
public Integer getId() { public Integer getId() {
return id; return id;
......
package com.bbd.bpm.service; package com.bbd.bpm.service;
import com.bbd.bpm.base.PageBean; import com.bbd.bpm.base.PageBean;
import com.bbd.bpm.domain.User;
import com.bbd.bpm.result.Result; import com.bbd.bpm.result.Result;
public interface UserInfoService { public interface UserInfoService {
...@@ -81,4 +82,12 @@ public interface UserInfoService { ...@@ -81,4 +82,12 @@ public interface UserInfoService {
* @return * @return
*/ */
Result userList(Integer id, PageBean pageBean, String userName); Result userList(Integer id, PageBean pageBean, String userName);
/**
* @Author:cwd
* 添加用户
* @Date: 2019.4.4
* @return
* @param user
*/
Result addUser(User user);
} }
...@@ -10,12 +10,14 @@ import com.bbd.bpm.result.RespCode; ...@@ -10,12 +10,14 @@ import com.bbd.bpm.result.RespCode;
import com.bbd.bpm.result.Result; import com.bbd.bpm.result.Result;
import com.bbd.bpm.result.ResultUtil; import com.bbd.bpm.result.ResultUtil;
import com.bbd.bpm.service.UserInfoService; import com.bbd.bpm.service.UserInfoService;
import com.bbd.bpm.util.IdWorker;
import com.bbd.bpm.vo.BpmCompanyVo; import com.bbd.bpm.vo.BpmCompanyVo;
import com.bbd.bpm.vo.MenuVO; import com.bbd.bpm.vo.MenuVO;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.activiti.editor.language.json.converter.util.CollectionUtils; import org.activiti.editor.language.json.converter.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
...@@ -272,12 +274,55 @@ public class UserInfoServiceImpl implements UserInfoService{ ...@@ -272,12 +274,55 @@ public class UserInfoServiceImpl implements UserInfoService{
} }
} }
/**
* @Author:cwd
* 获取用户列表
* @Date: 2019.3.7
* @return
*/
@Override @Override
public Result userList(Integer id, PageBean pageBean, String userName) { public Result userList(Integer id, PageBean pageBean, String userName) {
PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize()); try{
List<User> list = userInfoMapper.userList(userName); PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize());
PageInfo<User> pageInfo = new PageInfo<>(list); List<User> list = userInfoMapper.userList(userName);
return ResultUtil.getResult(RespCode.Code.SUCCESS, pageInfo); PageInfo<User> pageInfo = new PageInfo<>(list);
return ResultUtil.getResult(RespCode.Code.SUCCESS, pageInfo);
}catch (Exception e){
return ResultUtil.getResult(RespCode.Code.INTERNAL_SERVER_ERROR);
}
}
/**
* @Author:cwd
* 添加用户
* @Date: 2019.4.4
* @return
* @param user
*/
@Override
public Result addUser(User user) {
Result result=new Result();
try{
user.setUserUuid(IdWorker.nextId());
String password = user.getPassword();
//密码加密
BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(4);
String enPassword = encoder.encode(password);
user.setPassword(enPassword);
userInfoMapper.addUser(user);
result.setSuccess(true);
result.setCode("200");
result.setMessage("添加用户成功");
return result;
}catch (Exception e){
e.printStackTrace();
result.setSuccess(false);
result.setCode("500");
result.setMessage("添加用户失败");
return result;
}
} }
/** /**
......
package com.bbd.bpm.util;
import java.util.UUID;
/**
* 说明
*
* @author Bob Ren(Copyright ©2018 Hong Kong Airlines Ltd.)
* @version v1.0
* @created 2019/3/10 11:52
*/
public class IdWorker {
public static String nextId() {
UUID uuid = UUID.randomUUID();
String str = uuid.toString();
// 去掉"-"符号
return str.substring(0, 8) + str.substring(9, 13) + str.substring(14, 18) + str.substring(19, 23) + str.substring(24);
}
}
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
<li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toDeployment"><span class="nav-icon"><i class="fa fa-qrcode bg-gradient-red text-white"></i></span>查看流程</a></li> <li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toDeployment"><span class="nav-icon"><i class="fa fa-qrcode bg-gradient-red text-white"></i></span>查看流程</a></li>
<li class="s_menu_item"><a target="main_frame" href="/model/createNew"><span class="nav-icon"><i class="fa fa-heart bg-gradient-orange text-white"></i></span>创建流程</a></li> <li class="s_menu_item"><a target="main_frame" href="/model/createNew"><span class="nav-icon"><i class="fa fa-heart bg-gradient-orange text-white"></i></span>创建流程</a></li>
<li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toOrganization"><span class="nav-icon"><i class="fa fa-table bg-gradient-green text-white"></i></span>组织结构</a></li> <li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toOrganization"><span class="nav-icon"><i class="fa fa-table bg-gradient-green text-white"></i></span>组织结构</a></li>
<li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toUserList"><span class="nav-icon"><i class="fa fa-map bg-gradient-blue text-white"></i></span>用户管理</a></li>
<li class="s_menu_item"><a target="main_frame" href="/swagger-ui.html"><span class="nav-icon"><i class="fa fa-map bg-gradient-blue text-white"></i></span>API 文档</a></li> <li class="s_menu_item"><a target="main_frame" href="/swagger-ui.html"><span class="nav-icon"><i class="fa fa-map bg-gradient-blue text-white"></i></span>API 文档</a></li>
</ul> </ul>
......
...@@ -169,7 +169,6 @@ ...@@ -169,7 +169,6 @@
/*删除用户 */ /*删除用户 */
function deleteUser(id) { function deleteUser(id) {
alert(id)
$.post("/api/bpm/model/deleteModel", $.post("/api/bpm/model/deleteModel",
{ {
modelId:id modelId: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