Skip to content

B
bpm
Commit 8f8a0bb6 by Java-曹文达
Options

注册接口开发

parent 12dda71c
Showing with 204 additions and 235 deletions
src/main/java/com/bbd/bpm/controller/user/UserApiController.java
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;
}
} }
src/main/java/com/bbd/bpm/dao/UserInfoMapper.java
...@@ -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);
} }
src/main/java/com/bbd/bpm/dao/UserInfoMapper.xml
...@@ -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
src/main/java/com/bbd/bpm/domain/User.java
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;
......
src/main/java/com/bbd/bpm/service/UserInfoService.java
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);
} }
src/main/java/com/bbd/bpm/serviceImpl/UserInfoServiceImpl.java
...@@ -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;
}
} }
/** /**
......
src/main/java/com/bbd/bpm/util/IdWorker.java 0 → 100644
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);
}
}
src/main/resources/templates/bpm/index.html
...@@ -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>
......
src/main/resources/templates/register.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh"> <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <title>工作流</title>
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>志愿者服务信息网</title> <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="shortcut icon" type="image/x-icon" href="https://yst-pjyc-server.oss-cn-beijing.aliyuncs.com/datas/image/20181120/20181120103218126806518.jpg" media="screen" /> <script src="https://cdn.bootcss.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" type="text/css" href="css/layer.css" />
<link rel="stylesheet" type="text/css" href="css/reset.css" />
<link rel="stylesheet" type="text/css" href="css/flatpickr.min.css" />
<link rel="stylesheet" type="text/css" href="css/registe.css" />
</head>
<body> </head>
<!--top头部标题栏--> <body class="text-center">
<div id="top"> <div style="margin-top: 100px;">
<body>
<!--top头部标题栏-->
<div id="top">
<!--用户注册--> <!--用户注册-->
<div id="vl_registe"> <div id="vl_registe">
<!--账号信息--> <!--账号信息-->
...@@ -26,252 +24,115 @@ ...@@ -26,252 +24,115 @@
<span class="red">*</span> <span class="red">*</span>
<span class="info">用户名:</span> <span class="info">用户名:</span>
</span> </span>
<input type="text" name="v_username" id="v_username" value="" placeholder="用户名" autocomplete="off" /><span class="tishi">dsfsdfsfssd</span> <input type="text" name="v_username" id="username" value="" placeholder="用户名" autocomplete="off" />
</p> </p>
<p class="userinfo"> <p class="userinfo">
<span class="left"> <span class="left">
<span class="red">*</span> <span class="red">*</span>
<span class="info">密码:</span> <span class="info">密码:</span>
</span> </span>
<input type="password" name="v_passward" id="v_passward" value="" placeholder="密码" autocomplete="off" /> <input type="password" name="v_passward" id="passward" value="" placeholder="密码" autocomplete="off" />
<span class="tishi">dsfsdfsfssd</span>
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">确认密码:</span>
</span>
<input type="password" name="v_passward1" id="v_passward1" value="" placeholder="确认密码" autocomplete="off" />
<span class="tishi">dsfsdfsfssd</span>
</p> </p>
<p class="userinfo"> <p class="userinfo">
<span class="left"> <span class="left">
<span class="red">*</span> <span class="red">*</span>
<span class="info">邮箱:</span> <span class="info">邮箱:</span>
</span> </span>
<input type="emaila" name="v_mail" id="v_mail" value="" placeholder="邮箱" autocomplete="off" /> <input type="emaila" name="v_mail" id="email" value="" placeholder="邮箱" autocomplete="off" />
<span class="tishi">dsfsdfsfssd</span>
</p>
</div>
<!--志愿者基本信息-->
<p class="r_p1"><span class="line"></span>志愿者基本信息</p>
<div class="d_1">
<!--<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">国家:</span>
</span>
<input type="text" name="country" id="country" value="" placeholder="国家" />
</p>-->
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">真实姓名:</span>
</span>
<input type="text" name="v_name" id="v_name" value="" placeholder="真实姓名" autocomplete="off" />
<span class="tishi">dsfsdfsfssd</span>
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">证件类型:</span>
</span>
<select id="card_type" name="card_type ">
<option value="内地居民身份证">内地居民身份证</option>
</select>
</p> </p>
<p class="userinfo"> <p class="userinfo">
<span class="left"> <span class="left">
<span class="red">*</span> <span class="red">*</span>
<span class="info">证件号码:</span> <span class="info">手机号:</span>
</span> </span>
<input type="text" name="card_num" id="card_num" value="" placeholder="证件号码" autocomplete="off" /> <input type="emaila" name="telephone" id="telephone" value="" placeholder="手机号" autocomplete="off" />
<span class="tishi">dsfsdfsfssd</span>
</p> </p>
<p class="userinfo"> <p class="userinfo">
<span class="left"> <span class="left">
<span class="red">*</span> <span class="red">*</span>
<span class="info">性别:</span> <span class="info">用户描述:</span>
</span> </span>
<input type="radio" name="sex" id="boy" value="0" />男 <input type="emaila" name="content" id="content" value="" placeholder="用户描述" autocomplete="off" />
<input type="radio" name="sex" id="girl" value="1" />女
<span class="tishi1"></span>
</p> </p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">出生年月:</span>
</span>
<input class="flatpickr" type="date" name="birth_time" id="birth_time" value="" placeholder="出生日期" autocomplete="off" />
<span class="tishi"></span>
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">手机号码:</span>
</span>
<input type="text" name="v_phone" id="v_phone" value="" placeholder="手机号码" maxlength="11" autocomplete="off" />
<span class="tishi"></span>
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">详细地址:</span>
</span>
<input type="text" name="v_address" id="v_address" value="" placeholder="详细地址" autocomplete="off" />
<span class="tishi"></span>
</p>
</div> </div>
<p id="volunteer_people_registe">申请成为实名注册志愿者</p> <button onclick="register()">确认申请</button>
</div> </div>
</div> </div>
</body>
</div> </div>
</body> </body>
<script src="js/jquery-3.3.1.min.js" type="text/javascript" charset="utf-8"></script> </html>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.10&key=544e65a7e9e11d0b0a4f4bb04b06e8c8"></script>
<script src="js/flatpickr.min.js" type="text/javascript" charset="utf-8"></script> <style>
<script src="js/imgUp.js" type="text/javascript" charset="utf-8"></script> * {
<script src="js/layer.js" type="text/javascript" charset="utf-8"></script> font-family: "微软雅黑";
<script src="js/common.js" type="text/javascript" charset="utf-8"></script> font-size: 15px;
<script src="js/registe.js" type="text/javascript" charset="utf-8"></script> margin: 0 auto;
<script type="text/javascript"> }
/*时间插件*/ div{
$(".flatpickr").flatpickr(); width: 400px;
/* 高德地图start */ text-align:center;
var windowsArr = []; padding-top:10px;
var marker = []; }
var longitude, latitude, addressName; input,button{
var map = new AMap.Map("mapContainer", { margin-top:10px;
resizeEnable: true, }
center: [116.397428, 39.90923], //地图中心点
zoom: 13, //地图显示的缩放级别
keyboardEnable: false
});
AMap.plugin(['AMap.Autocomplete', 'AMap.PlaceSearch'], function() {
var autoOptions = {
city: "天津", //城市，默认全国
input: "v_address" //使用联想输入的input的id
};
autocomplete = new AMap.Autocomplete(autoOptions);
var placeSearch = new AMap.PlaceSearch({
city: '天津',
map: map
})
AMap.event.addListener(autocomplete, "select", function(e) {
var location = e.poi.location;
console.log(location)
longitude = location.lng;
latitude = location.lat;
addressName = e.poi.name;
console.log(longitude + "-----" + latitude + '------' + addressName)
//TODO 针对选中的poi实现自己的功能
placeSearch.setCity(e.poi.adcode);
placeSearch.search(e.poi.name)
/* 选择定位后，更新省市区的显示 */ button {
console.log(e) padding:5px 0;
var district = e.poi.district; width: 408px;
}); }
}); </style>
/* 高德地图end */ <script src="/js/plugins/jquery.min.js"></script>
/* 高德地图start */ <script src="/js/plugins/layer/layer.js"></script>
var windowsArr = []; <script>
var marker = []; function register(){
var t_longitude, t_latitude, t_addressName; var name=$("#username").val();
var map = new AMap.Map("mapContainer", { if(name==''){
resizeEnable: true, layer.msg('账号不可为空');
center: [116.397428, 39.90923], //地图中心点 return false
zoom: 13, //地图显示的缩放级别 }
keyboardEnable: false var passWard=$("#passward").val();
}); if(passWard==''){
AMap.plugin(['AMap.Autocomplete', 'AMap.PlaceSearch'], function() { layer.msg('密码不可为空');
var autoOptions = { return false
city: "天津", //城市，默认全国 }
input: "competent_address" //使用联想输入的input的id var email=$("#email").val();
}; if(email==''){
autocomplete = new AMap.Autocomplete(autoOptions); layer.msg('邮箱不可为空');
var placeSearch = new AMap.PlaceSearch({ return false
city: '天津', }
map: map var content=$("#content").val();
}) if(content==''){
AMap.event.addListener(autocomplete, "select", function(e) { layer.msg('用户描述不可为空');
var location = e.poi.location; return false
console.log(location) }
t_longitude = location.lng; var telephone=$("#telephone").val()
t_latitude = location.lat; if(telephone==''){
t_addressName = e.poi.name; layer.msg('手机号不可为空');
console.log(t_longitude + "-----" + t_latitude + '------' + t_addressName) return false
//TODO 针对选中的poi实现自己的功能 }
placeSearch.setCity(e.poi.adcode); $.post("/bpm/user/addUser",
placeSearch.search(e.poi.name) {
telephone:telephone,
password:passWard,
username:name,
email:email,
content:content
},function (data) {
if(data.code==200){
layer.msg('删除成功');
location.reload();
}else {
layer.msg('删除失败');
location.reload();
}
},'json')
/* 选择定位后，更新省市区的显示 */
console.log(e)
var district = e.poi.district;
});
});
/* 高德地图end */
//上传图片
var vlImg;
var vtImg;
var skillimg0,skillimg1,skillimg2,skillimg3,skillimg4;
var skillnum;
$(".fileBox").on('click', '#vl_up', function() {
skillnum = 6;
$("#vl_up").takungaeImgup({
formData: {
'filesname': 'imageFile'
},
url: apicom + '/webadmin/fileupload/image',
maxImage: 1,
success: function(data) {
console.log(data)
},
error: function(err) {
console.log(err)
}
});
})
$(".fileBox").on('click', '#vt_up', function() {
$("#vt_up").takungaeImgup({
formData: {
'filesname': 'imageFile'
},
url: apicom + '/webadmin/fileupload/image',
maxImage: 1,
success: function(data) {
vtImg = data.data
$('#vt_img').attr('src', vtImg)
},
error: function(err) {
console.log(err)
}
});
})
$("#add_skills").on('click', '.skillup', function() {
skillnum = $(this).parents('.skills').index()
console.log(skillnum);
$(".skillup").takungaeImgup({
formData: {
'filesname': 'imageFile'
},
url: apicom + '/webadmin/fileupload/image',
maxImage: 1,
success: function(data) {
// vtImg = data.data
// $('#skillup_1').attr('src', skillimg1)
},
error: function(err) {
console.log(err)
}
});
})
</script> }
</script>
</html>
\ No newline at end of file
src/main/resources/templates/user/userList.html
...@@ -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