Skip to content

B
bpm
Commit da244d51 by Java-曹文达
Options

添加用户列表 代码修改

parent f5c20157
Showing with 380 additions and 72 deletions
src/main/java/com/bbd/bpm/controller/deployment/DeploymentController.java
......@@ -57,7 +57,7 @@ public class DeploymentController {
@ApiOperation(value = "查询流程列表")
@RequestMapping(value = "/modelList")
public BpmResponse modelList(PageBean pageBean) {
public BpmResponse modelList(PageBean pageBean,String modelName) {
BpmResponse resp = new BpmResponse();
try{
if(pageBean.getPageNum()==0){
......@@ -67,7 +67,7 @@ public class DeploymentController {
pageBean.setPageSize(10);
}
//获取流程列表
Result result= actReModelService.getList(pageBean);
Result result= actReModelService.getList(pageBean,modelName);
resp.setData(result);
resp.setCode(SysCode.SUCCESS_CODE);
resp.setSuccess(true);
......@@ -83,7 +83,7 @@ public class DeploymentController {
@ApiOperation(value = "删除流程")
@GetMapping("/deleteModel")
@RequestMapping("/deleteModel")
public BpmResponse deleteModel(String modelId) {
BpmResponse resp = new BpmResponse();
try{
......@@ -133,7 +133,7 @@ public class DeploymentController {
@ApiOperation(value = "部署流程")
@GetMapping("/deploymentModel")
@RequestMapping("/deploymentModel")
public BpmResponse deploymentModel(final String modelId) {
BpmResponse resp = new BpmResponse();
resp.setSuccess(true);
......@@ -150,6 +150,7 @@ public class DeploymentController {
modelData.setDeploymentId(deployment.getId());
repositoryService.saveModel(modelData);
resp.setData(deployment.getId());
resp.setCode(SysCode.SUCCESS_CODE);
} catch (Exception e) {
Log.error(modelId+"部署失败",e);
resp.setSuccess(false);
......@@ -161,7 +162,7 @@ public class DeploymentController {
}
@ApiOperation(value = "删除部署")
@GetMapping("/deleteDeployment")
@RequestMapping("/deleteDeployment")
public BpmResponse deleteDeployment(String deploymentId) {
BpmResponse resp = new BpmResponse();
// processEngine.getRepositoryService().deleteDeployment(deploymentId, true);
......@@ -171,6 +172,7 @@ public class DeploymentController {
System.out.println("删除流程成功，当前流程部署ID：" + deploymentId);
resp.setSuccess(true);
resp.setMessage("删除成功");
resp.setCode(SysCode.SUCCESS_CODE);
}catch (Exception e){
Log.error("删除失败",e);
resp.setSuccess(false);
......
src/main/java/com/bbd/bpm/controller/user/UserController.java
......@@ -20,58 +20,27 @@ import javax.servlet.http.HttpSession;
@RequestMapping(value = "bpm/user")
public class UserController {
@Autowired
private UserInfoService userInfoService;
/**
* @Author:cwd
* @Description:进入组织管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "toIndex")
public String toIndex(){
return "bpm/index";
}
/**
* @Author:cwd
* @Description:进入组织管理
* @Description:用户列表
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "welcome")
public String welcome(){
return "bpm/welcome";
@RequestMapping(value = "/userList")
@ResponseBody
public Result userList(Integer id,PageBean pageBean,String userName){
if(pageBean.getPageNum()==0){
pageBean.setPageNum(1);
}
/**
* @Author:cwd
* @Description:进入组织管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "toOrganization")
public String toOrganization(){
return "user/organizationList";
if (pageBean.getPageSize()==0) {
pageBean.setPageSize(10);
}
/**
* @Author:cwd
* @Description:进入流程管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "toDeployment")
public String toDeployment(){
return "deployment/deplymentList";
Result result= userInfoService.userList(id,pageBean,userName);
return result;
}
......
src/main/java/com/bbd/bpm/controller/user/UserWebController.java 0 → 100644
package com.bbd.bpm.controller.user;
import com.bbd.bpm.base.PageBean;
import com.bbd.bpm.result.Result;
import com.bbd.bpm.service.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@RequestMapping(value = "/web/bpm/user")
public class UserWebController {
/**
* @Author:cwd
* @Description:进入首页
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "toIndex")
public String toIndex(){
return "bpm/index";
}
/**
* @Author:cwd
* @Description:进入组织管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "welcome")
public String welcome(){
return "bpm/welcome";
}
/**
* @Author:cwd
* @Description:进入组织管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "toOrganization")
public String toOrganization(){
return "user/organizationList";
}
/**
* @Author:cwd
* @Description:进入流程管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "toDeployment")
public String toDeployment(){
return "deployment/deplymentList";
}
/**
* @Author:cwd
* @Description:进入用户管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@RequestMapping(value = "toUserList")
public String toUserList(){
return "user/userList";
}
}
src/main/java/com/bbd/bpm/dao/UserInfoMapper.java
......@@ -4,8 +4,10 @@ package com.bbd.bpm.dao;
import com.bbd.bpm.base.BaseMapper;
import com.bbd.bpm.domain.ActReModelEntity;
import com.bbd.bpm.domain.BpmCompany;
import com.bbd.bpm.domain.User;
import com.bbd.bpm.vo.BpmCompanyVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -28,5 +30,7 @@ public interface UserInfoMapper extends BaseMapper<BpmCompany>{
void deleteDepartments(@Param("id") Long id);
List<ActReModelEntity> getList();
List<ActReModelEntity> getList(@Param("modelName") String modelName);
List<User> userList(@Param("userName") String userName);
}
src/main/java/com/bbd/bpm/dao/UserInfoMapper.xml
......@@ -91,6 +91,27 @@
TENANT_ID_ tenantId
FROM
act_re_model
where 1=1
<if test="modelName!=null">
and NAME_ LIKE CONCAT('%',#{modelName},'%')
</if>
</select>
<select id="userList" resultType="com.bbd.bpm.domain.User">
SELECT
id,
user_uuid userUuid,
username,
email,
telephone,
last_time lastTime
FROM
`user`
where 1=1
<if test="userName!=null">
and username LIKE CONCAT('%',#{userName},'%')
</if>
</select>
</mapper>
\ No newline at end of file
src/main/java/com/bbd/bpm/service/ActReModelService.java
......@@ -5,5 +5,5 @@ import com.bbd.bpm.result.Result;
public interface ActReModelService {
Result getList(PageBean pageBean);
Result getList(PageBean pageBean, String modelName);
}
src/main/java/com/bbd/bpm/service/UserInfoService.java
......@@ -74,4 +74,11 @@ public interface UserInfoService {
* @return
*/
Result getMenuList();
/**
* @Author:cwd
* 获取用户列表
* @Date: 2019.3.7
* @return
*/
Result userList(Integer id, PageBean pageBean, String userName);
}
src/main/java/com/bbd/bpm/serviceImpl/ActReModelServiceImpl.java
......@@ -21,9 +21,9 @@ public class ActReModelServiceImpl implements ActReModelService{
private UserInfoMapper userInfoMapper;
@Override
public Result getList(PageBean pageBean) {
public Result getList(PageBean pageBean, String modelName) {
PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize());
List<ActReModelEntity> list = userInfoMapper.getList();
List<ActReModelEntity> list = userInfoMapper.getList(modelName);
PageInfo<ActReModelEntity> pageInfo = new PageInfo<>(list);
return ResultUtil.getResult(RespCode.Code.SUCCESS, pageInfo);
}
......
src/main/java/com/bbd/bpm/serviceImpl/UserInfoServiceImpl.java
......@@ -5,6 +5,7 @@ import com.bbd.bpm.dao.MemberMapper;
import com.bbd.bpm.dao.UserInfoMapper;
import com.bbd.bpm.domain.BpmCompany;
import com.bbd.bpm.domain.BpmEmployee;
import com.bbd.bpm.domain.User;
import com.bbd.bpm.result.RespCode;
import com.bbd.bpm.result.Result;
import com.bbd.bpm.result.ResultUtil;
......@@ -271,6 +272,14 @@ public class UserInfoServiceImpl implements UserInfoService{
}
}
@Override
public Result userList(Integer id, PageBean pageBean, String userName) {
PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize());
List<User> list = userInfoMapper.userList(userName);
PageInfo<User> pageInfo = new PageInfo<>(list);
return ResultUtil.getResult(RespCode.Code.SUCCESS, pageInfo);
}
/**
* 获取菜单树
* @param menuVos
......
src/main/resources/templates/bpm/index.html
......@@ -99,9 +99,9 @@
<!--左边导航-->
<div class="main_wrap clearfix" >
<ul id="aside_nav" class="navBox" style='width:140px;min-height: 680px;'>
<li class="s_menu_item"><a target="main_frame" href="/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-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="/swagger-ui.html"><span class="nav-icon"><i class="fa fa-map bg-gradient-blue text-white"></i></span>API 文档</a></li>
</ul>
......@@ -109,7 +109,7 @@
<!--&lt;!&ndash;end 左边导航&ndash;&gt;-->
<div class="mainContentBox">
<iframe id="main_frame" width="100%" height="100%" frameborder="0" onload="" name="main_frame" src="/bpm/user/welcome"
<iframe id="main_frame" width="100%" height="100%" frameborder="0" onload="" name="main_frame" src="/web/bpm/user/welcome"
style="overflow:hidden; position:absolute;"></iframe>
</div>
......
src/main/resources/templates/deployment/deplymentList.html
......@@ -31,7 +31,7 @@
<div class="search">
<p class="title">筛选查询</p>
<p class="search_pro">
<span><b>流程名称：</b><input type="text" name="teamName" placeholder="请输入"/></span>
<span><b>流程名称：</b><input type="text" name="modelName" placeholder="请输入"/></span>
<span class="cx">
<input type="button" style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" value="查询" onclick="getBargainProduct()">
</span>
......@@ -123,7 +123,7 @@
content += '<td class="product_num">'+data[i].metaInfo+'</td><td class="product_num">'+data[i].version+'</td>';
content += '<td class="cao_zuo"><span onclick="toActivityDetail('+data[i].id+')">查看</span></span><span onclick="toActivityMember(\'+data[i].id+\')">启动流程</span><span onclick="toActivityMember('+data[i].id+')">删除</span></td></tr>';
content += '<td class="cao_zuo"><span onclick="toActivityDetail('+data[i].id+')">查看</span></span><span onclick="deploymentModel('+data[i].id+')">部署流程</span><span onclick="deleteDeployMent('+data[i].id+')">删除</span></td></tr>';
}
$('#pages').text(pages);
$('#total').text(total);
......@@ -136,18 +136,16 @@
}
/*条件查询*/
function getBargainProduct() {
var teamName = $("[name='teamName']").val();
var status = $("[name='status']").val();
$.post("activityList",
var name = $("[name='modelName']").val();
$.post("/api/bpm/model/modelList",
{
pageSize:10,
pageNum:1,
teamName:teamName,
status:status
modelName:name
},function (data) {
selectListAll(data.data);
var size = data.data.pages;
if (!data.data.pages){
selectListAll(data.data.data);
var size = data.data.data.pages;
if (!data.data.data.pages){
size = 0;
}
/*分页*/
......@@ -169,8 +167,38 @@
location.href="/activityManage/toActivityInfo?activityId="+id+"&type=1";
}
//部署流程
function deploymentModel(id){
$.post("/api/bpm/model/deploymentModel",
{
modelId:id
},function (data) {
if(data.code==200){
layer.msg('部署成功');
location.reload();
}else {
layer.msg('部署失败');
location.reload();
}
},'json')
}
/*跳转活动人员列表 */
function toActivityMember(id) {
location.href="/activityManage/toActivityMember?activityId="+id;
function deleteDeployMent(id) {
alert(id)
$.post("/api/bpm/model/deleteModel",
{
modelId:id
},function (data) {
if(data.code==200){
layer.msg('删除成功');
location.reload();
}else {
layer.msg('删除失败');
location.reload();
}
},'json')
}
</script>
\ No newline at end of file
src/main/resources/templates/user/organizationList.html
......@@ -131,7 +131,7 @@
<script type="text/javascript">
$(function () {
$.post(
"getOrganization",
"/bpm/user/getOrganization",
{
pageSize:10,
pageNum:1,
......@@ -195,7 +195,7 @@
//加载zTree
var treeObj ;
$.post(
"getOrganizationList", function (data) {
"/bpm/user/getOrganizationList", function (data) {
zNodes = data.data;
treeObj = $.fn.zTree.init($("#treeDemo"), setting, zNodes);
fuzzySearch('treeDemo','#key',null,true); //initialize fuzzysearch function
......@@ -227,7 +227,7 @@
$("#add").hide();
}
$.post(
"getOrganization",
"/bpm/user/getOrganization",
{
pageSize:10,
pageNum:1,
......@@ -266,7 +266,7 @@
}
var name = $("[name='name']").val();
$.post(
"getOrganization",
"/bpm/user/getOrganization",
{
pageSize:10,
pageNum:pageNum,
......@@ -334,7 +334,7 @@
var type = $("#type").val();
var name = $("[name='name']").val();
$.post(
"getOrganization",
"/bpm/user/getOrganization",
{
pageSize:10,
pageNum:1,
......@@ -454,7 +454,7 @@
}
});
$.post(
"getOrganizationInfo",
"/bpm/user/getOrganizationInfo",
{"id":id},
function (data) {
data = data.data;
......@@ -517,7 +517,7 @@
}
});
$.post(
"getOrganizationInfo",
"/bpm/user/getOrganizationInfo",
{"id":id},
function (data) {
data = data.data;
......
src/main/resources/templates/user/userList.html 0 → 100644
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>Title</title>
<link rel="stylesheet" th:href="@{/css/common/base.css}" />
<link rel="stylesheet" th:href="@{/css/common/page_new.css}" />
<link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/product_list.css}" />
</head>
<style type="text/css">
.box .search_pro .cx input{
background: #00B983;
width: 100px;
height: 39px;
color:white;
margin-right: 10px;
padding: 10px -1px;
}
.content p span input{
background: #00B983;
color:white;
margin-right: 10px;
padding: 10px 20px;
border:1px solid #EEEEEE;
text-indent: 5px;
}
</style>
<body>
<div class="box">
<h2><span></span>用户列表<button onclick="location.reload()">刷新</button></h2>
<div class="search">
<p class="title">筛选查询</p>
<p class="search_pro">
<span><b>用户名称：</b><input type="text" name="userName" placeholder="请输入"/></span>
<span class="cx">
<input type="button" style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" value="查询" onclick="getBargainProduct()">
</span>
</p>
</div>
<div class="content">
<p class="title list_ti"><span>用户列表</span></p>
<table border="" cellspacing="" cellpadding="">
</table>
</div>
<div class="footer" style="display: flex;justify-content: space-between;align-items:center;padding:10px 10px;border:1px solid #e4e4e4;font-size:14px;color:#999">
<div style="flex-grow: 1;display: flex;justify-content: flex-end;">
<p style="line-height:33px">共<span style="color:#d00" id="pages">0</span>页/<span style="color:#d00" id="total">0</span>条数据</p>
<div class="pagediv" style="clear:both;"></div>
</div>
</div>
</div>
</body>
</html>
<script src="/js/plugins/jquery.min.js"></script>
<script src="/js/plugins/layer/layer.js"></script>
<script type="text/javascript" src="/js/plugins/page_new.js"></script>
<script type="text/javascript">
$(function(){
$.post(
"/bpm/user/userList",
{
pageSize:10,
pageNum:1,
teamName:"",
status:""
},
function (data) {
var size = data.data.pages;
if (!data.data.pages){
size = 0;
}
var current = data.pageNum;
/*分页*/
$(".pagediv").createPage({
pageNum: size,//总页码
current: current,//当前页
shownum: 10,//每页显示个数
showPageNum: true, //显示总页数
showToPage: true, //显示跳转页码
backfun: function (page) {
flushHtml(page.current);
}
});
},
'json'
);
flushHtml();
});
function flushHtml(current) {
var pageNum = 1;
if(current){
pageNum = current;
}
var teamName = $("[name='teamName']").val();
var status = $("[name='status']").val();
$.post(
"/bpm/user/userList",
{
pageSize:10,
pageNum:pageNum,
teamName:teamName,
status:status
},
function (data) {
selectListAll(data.data);
},'json'
);
}
function selectListAll(data) {
var pages = data.pages;
var total = data.total;
data = data.list;
var content = '';
content += '<tr><th>用户编号</th><th style="width: 15%">用户标识</th><th style="width: 8%">用户名称</th><th>邮箱</th><th style="width: 8%">手机</th><th style="width: 8%">创建时间</th><th>操作</th></tr>';
if(data!=null){
for (var i in data) {
content += '<tr>';
content += '<td class="product_name" style="width: 5%;">'+data[i].id+'</td>';
content += '<td class="product_num">'+data[i].userUuid+'</td><td class="product_num">'+data[i].username+'</td>';
content += '<td class="product_num">'+data[i].email+'</td><td class="product_num">'+data[i].telephone+'</td>';
content += '<td class="product_num">'+data[i].lastTime+'</td>';
content += '<td class="cao_zuo"><span onclick="toActivityDetail('+data[i].id+')">查看</span><span onclick="deleteDeployMent('+data[i].id+')">删除</span></td></tr>';
}
$('#pages').text(pages);
$('#total').text(total);
}else{
content+= '<div class="tipImg"><img src="/images/non.png" ><p class="tipNon">暂无数据</p></div>';
$('#pages').text(0);
$('#total').text(0);
}
$('table').html(content);
}
/*条件查询*/
function getBargainProduct() {
var name = $("[name='userName']").val();
$.post("/bpm/user/userList",
{
pageSize:10,
pageNum:1,
userName:name
},function (data) {
selectListAll(data.data);
var size = data.data.pages;
if (!data.data.pages){
size = 0;
}
/*分页*/
$(".pagediv").createPage({
pageNum: size,//总页码
current: 1,//当前页
shownum: 10,//每页显示个数
showPageNum: true, //显示总页数
showToPage: true, //显示跳转页码
backfun: function (page) {
flushHtml(page.current);
}
});
},'json')
}
/*跳转活动详情页 */
function toActivityDetail(id) {
location.href="/activityManage/toActivityInfo?activityId="+id+"&type=1";
}
/*删除用户 */
function deleteUser(id) {
alert(id)
$.post("/api/bpm/model/deleteModel",
{
modelId:id
},function (data) {
if(data.code==200){
layer.msg('删除成功');
location.reload();
}else {
layer.msg('删除失败');
location.reload();
}
},'json')
}
</script>
\ No newline at end of file
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