From 7b351fcd22c88a4c8dfb3b8f68ff7b99ea2daf84 Mon Sep 17 00:00:00 2001 From: forezp <124746406@qq.com> Date: Wed, 4 Sep 2019 23:03:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- matrix-web-admin/src/api/workflow/task.js | 25 ++ matrix-web-admin/src/lang/zh.js | 5 +- matrix-web-admin/src/router/index.js | 18 ++ .../workflow/biz/vacation/vactionApply.js | 3 + .../views/workflow/finishprocess/index.vue | 129 ++++++++++ .../views/workflow/finishprocess/process.js | 220 +++++++++++++++++ .../src/views/workflow/myprocess/index.vue | 129 ++++++++++ .../src/views/workflow/myprocess/myprocess.js | 222 ++++++++++++++++++ .../src/views/workflow/todoprocess/index.vue | 129 ++++++++++ .../src/views/workflow/todoprocess/process.js | 220 +++++++++++++++++ .../io/github/forezp/AriesApplication.java | 2 +- .../controller/VacationController.java | 6 +- .../personnel/service/PlVacationService.java | 2 + .../service/impl/PlVacationServiceImpl.java | 45 ++++ .../src/main/resources/sql/aries.sql | 123 ++++++++-- 15 files changed, 1252 insertions(+), 26 deletions(-) create mode 100644 matrix-web-admin/src/api/workflow/task.js create mode 100644 matrix-web-admin/src/views/workflow/finishprocess/index.vue create mode 100644 matrix-web-admin/src/views/workflow/finishprocess/process.js create mode 100644 matrix-web-admin/src/views/workflow/myprocess/index.vue create mode 100644 matrix-web-admin/src/views/workflow/myprocess/myprocess.js create mode 100644 matrix-web-admin/src/views/workflow/todoprocess/index.vue create mode 100644 matrix-web-admin/src/views/workflow/todoprocess/process.js diff --git a/matrix-web-admin/src/api/workflow/task.js b/matrix-web-admin/src/api/workflow/task.js new file mode 100644 index 0000000..0624eb6 --- /dev/null +++ b/matrix-web-admin/src/api/workflow/task.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +export function todoTaskList(params) { + return request({ + url: '/task/todo', + method: 'get', + params + }) +} + +export function myTaskList(params) { + return request({ + url: '/task/starter', + method: 'get', + params + }) +} + +export function finishTaskList(params) { + return request({ + url: '/task/finish', + method: 'get', + params + }) +} diff --git a/matrix-web-admin/src/lang/zh.js b/matrix-web-admin/src/lang/zh.js index 7e736a9..99cfb5d 100644 --- a/matrix-web-admin/src/lang/zh.js +++ b/matrix-web-admin/src/lang/zh.js @@ -33,7 +33,10 @@ export default { categoryMgr: '分类管理', processMgr: '流程管理', newProcessMgr: '新建流程', - vactionApplyMgr: '休假申请' + vactionApplyMgr: '休假申请', + myprocessMgr: '我的申请', + todpprocessMgr: '我的代办', + finishprocessMgr: '我的已办' }, navbar: { logOut: '退出登录', diff --git a/matrix-web-admin/src/router/index.js b/matrix-web-admin/src/router/index.js index 7ba0f4f..b93ec53 100644 --- a/matrix-web-admin/src/router/index.js +++ b/matrix-web-admin/src/router/index.js @@ -162,6 +162,24 @@ export const asyncRouterMap = [ component: () => import('@/views/workflow/biz/vacation/index'), hidden: true, meta: { title: 'vactionApplyMgr' } + }, + { + path: 'myprocess', + name: 'myprocess', + component: () => import('@/views/workflow/myprocess/index'), + meta: { title: 'myprocessMgr' } + }, + { + path: 'todoprocess', + name: 'todoprocess', + component: () => import('@/views/workflow/todoprocess/index'), + meta: { title: 'todpprocessMgr' } + }, + { + path: 'finishprocess', + name: 'finishprocess', + component: () => import('@/views/workflow/finishprocess/index'), + meta: { title: 'finishprocessMgr' } } ] }, diff --git a/matrix-web-admin/src/views/workflow/biz/vacation/vactionApply.js b/matrix-web-admin/src/views/workflow/biz/vacation/vactionApply.js index e6bf301..b180e25 100644 --- a/matrix-web-admin/src/views/workflow/biz/vacation/vactionApply.js +++ b/matrix-web-admin/src/views/workflow/biz/vacation/vactionApply.js @@ -8,6 +8,7 @@ export default { education: [], form: { name: '', + userId: '', reason: '', remarks: '', nextUserId: '', @@ -90,6 +91,7 @@ export default { this.form.step = step this.form.startTime = startTime this.form.endTime = endTime + this.form.userId = this.currentUser.userId if (step) { console.info(step) } else { @@ -98,6 +100,7 @@ export default { message: '提交成功', type: 'success' }) + this.$router.back() }) } }, diff --git a/matrix-web-admin/src/views/workflow/finishprocess/index.vue b/matrix-web-admin/src/views/workflow/finishprocess/index.vue new file mode 100644 index 0000000..a1919da --- /dev/null +++ b/matrix-web-admin/src/views/workflow/finishprocess/index.vue @@ -0,0 +1,129 @@ + + + + + + + diff --git a/matrix-web-admin/src/views/workflow/finishprocess/process.js b/matrix-web-admin/src/views/workflow/finishprocess/process.js new file mode 100644 index 0000000..c3acf8c --- /dev/null +++ b/matrix-web-admin/src/views/workflow/finishprocess/process.js @@ -0,0 +1,220 @@ +import {processList, updateState, updateCategory} from '@/api/workflow/process' +import {categoryList} from '@/api/workflow/category' +import { finishTaskList } from '@/api/workflow/task' +export default { + data() { + return { + isUpdate: false, + formVisible: false, + groupIdInputDisabled: false, + formTitle: '添加任务', + isAdd: true, + form: { + id: '', + category: '', + procDefId: '' + }, + listCategoryQuery: { + page: 1, + pageSize: 100 + }, + rules: { + categoryId: [ + {required: true, message: '请输入分类ID', trigger: 'blur'}, + {min: 1, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur'} + ], + categoryName: [ + {required: true, message: '请输入分类名', trigger: 'blur'} + ] + + }, + showTree: false, + defaultProps: { + id: 'id', + label: 'categoryName', + children: 'children' + }, + listQuery: { + category: undefined, + page: 1, + pageSize: 100 + }, + listPCategoryQuery: { + pCategoryId: 0, + page: 1, + pageSize: 100 + }, + totalCount: 0, + list: null, + categoryData: null, + listLoading: true, + selRow: {}, + radio: '2', + pCategoryIdDisabled: false, + rationDisabled: false + } + }, + filters: { + statusFilter(status) { + const statusMap = { + published: 'success', + draft: 'gray', + deleted: 'danger' + } + return statusMap[status] + } + }, + created() { + this.init() + }, + methods: { + init() { + this.fetchData() + this.fetchPCategoryData() + }, + fetchData() { + this.listLoading = true + finishTaskList(this.listQuery).then(response => { + this.list = response.data.tasks + this.listLoading = false + this.totalCount = response.data.totalCount + }) + }, + fetchPCategoryData() { + categoryList(this.listCategoryQuery).then(response => { + this.categoryData = response.data.list + }) + }, + handleNodeClick(data, node) { + console.log(data) + this.form.category = data.categoryId + this.showTree = false + }, + search() { + this.fetchData() + }, + reset() { + this.listQuery.categoryId = '' + this.listQuery.pCategoryId = '' + this.listQuery.categoryName = '' + this.fetchData() + }, + handleFilter() { + this.listQuery.page = 1 + this.getList() + }, + handleClose() { + + }, + handleCurrentChange(currentRow, oldCurrentRow) { + this.selRow = currentRow + }, + resetForm() { + this.form = {} + }, + add() { + this.resetForm() + this.formTitle = '添加分类' + this.formVisible = true + this.isAdd = true + this.isUpdate = false + this.groupIdInputDisabled = false + this.pCategoryIdDisabled = false + this.rationDisabled = false + }, + fetchNext() { + this.listQuery.page = this.listQuery.page + 1 + this.fetchData() + }, + fetchPrev() { + this.listQuery.page = this.listQuery.page - 1 + this.fetchData() + }, + fetchPage(page) { + this.listQuery.page = page + this.fetchData() + }, + changeSize(pageSize) { + this.listQuery.pageSize = pageSize + this.fetchData() + }, + updateCategoryVue() { + this.$refs['form'].validate((valid) => { + if (valid) { + updateCategory(this.form.procDefId, this.form.category).then(response => { + console.log(response) + this.$message({ + message: '提交成功', + type: 'success' + }) + this.fetchData() + this.formVisible = false + }) + } else { + return false + } + }) + }, + checkSel() { + if (this.selRow && this.selRow.processonDefinitionId) { + return true + } + this.$message({ + message: '请选中操作项', + type: 'warning' + }) + return false + }, + edit() { + if (this.checkSel()) { + this.isAdd = false + this.form = this.selRow + this.form.procDefId = this.selRow.processonDefinitionId + this.formTitle = '修改分类' + this.formVisible = true + this.groupIdInputDisabled = true + this.isUpdate = true + this.pCategoryIdDisabled = true + this.rationDisabled = true + } + }, + updateStateVue(data) { + var suspend = data.suspend + var state + console.info(suspend) + if (suspend) { + state = 'active' + this.$confirm('确定激活吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + updateState(state, data.processonDefinitionId).then(response => { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.fetchData() + }) + }).catch(() => { + }) + } else { + state = 'suspend' + this.$confirm('确定挂载吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + updateState(state, data.processonDefinitionId).then(response => { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.fetchData() + }) + }).catch(() => { + }) + } + } + } +} diff --git a/matrix-web-admin/src/views/workflow/myprocess/index.vue b/matrix-web-admin/src/views/workflow/myprocess/index.vue new file mode 100644 index 0000000..1c3c764 --- /dev/null +++ b/matrix-web-admin/src/views/workflow/myprocess/index.vue @@ -0,0 +1,129 @@ + + + + + + + diff --git a/matrix-web-admin/src/views/workflow/myprocess/myprocess.js b/matrix-web-admin/src/views/workflow/myprocess/myprocess.js new file mode 100644 index 0000000..435aa9d --- /dev/null +++ b/matrix-web-admin/src/views/workflow/myprocess/myprocess.js @@ -0,0 +1,222 @@ +import { myTaskList } from '@/api/workflow/task' +import {processList, updateState, updateCategory} from '@/api/workflow/process' +import {categoryList} from '@/api/workflow/category' + +export default { + data() { + return { + isUpdate: false, + formVisible: false, + groupIdInputDisabled: false, + formTitle: '添加任务', + isAdd: true, + form: { + id: '', + category: '', + procDefId: '' + }, + listCategoryQuery: { + page: 1, + pageSize: 100 + }, + rules: { + categoryId: [ + {required: true, message: '请输入分类ID', trigger: 'blur'}, + {min: 1, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur'} + ], + categoryName: [ + {required: true, message: '请输入分类名', trigger: 'blur'} + ] + + }, + showTree: false, + defaultProps: { + id: 'id', + label: 'categoryName', + children: 'children' + }, + listQuery: { + category: undefined, + page: 1, + pageSize: 100 + }, + listPCategoryQuery: { + pCategoryId: 0, + page: 1, + pageSize: 100 + }, + totalCount: 0, + list: null, + categoryData: null, + listLoading: true, + selRow: {}, + radio: '2', + pCategoryIdDisabled: false, + rationDisabled: false + } + }, + filters: { + statusFilter(status) { + const statusMap = { + published: 'success', + draft: 'gray', + deleted: 'danger' + } + return statusMap[status] + } + }, + created() { + this.init() + }, + methods: { + init() { + this.fetchData() + this.fetchPCategoryData() + }, + fetchData() { + this.listLoading = true + myTaskList(this.listQuery).then(response => { + this.list = response.data.tasks + this.listLoading = false + this.totalCount = response.data.totalCount + }) + }, + fetchPCategoryData() { + categoryList(this.listCategoryQuery).then(response => { + this.categoryData = response.data.list + }) + }, + handleNodeClick(data, node) { + console.log(data) + this.form.category = data.categoryId + this.showTree = false + }, + search() { + this.fetchData() + }, + reset() { + this.listQuery.categoryId = '' + this.listQuery.pCategoryId = '' + this.listQuery.categoryName = '' + this.fetchData() + }, + handleFilter() { + this.listQuery.page = 1 + this.getList() + }, + handleClose() { + + }, + handleCurrentChange(currentRow, oldCurrentRow) { + this.selRow = currentRow + }, + resetForm() { + this.form = {} + }, + add() { + this.resetForm() + this.formTitle = '添加分类' + this.formVisible = true + this.isAdd = true + this.isUpdate = false + this.groupIdInputDisabled = false + this.pCategoryIdDisabled = false + this.rationDisabled = false + }, + fetchNext() { + this.listQuery.page = this.listQuery.page + 1 + this.fetchData() + }, + fetchPrev() { + this.listQuery.page = this.listQuery.page - 1 + this.fetchData() + }, + fetchPage(page) { + this.listQuery.page = page + this.fetchData() + }, + changeSize(pageSize) { + this.listQuery.pageSize = pageSize + this.fetchData() + }, + updateCategoryVue() { + this.$refs['form'].validate((valid) => { + if (valid) { + updateCategory(this.form.procDefId, this.form.category).then(response => { + console.log(response) + this.$message({ + message: '提交成功', + type: 'success' + }) + this.fetchData() + this.formVisible = false + }) + } else { + return false + } + }) + }, + checkSel() { + if (this.selRow && this.selRow.processonDefinitionId) { + return true + } + this.$message({ + message: '请选中操作项', + type: 'warning' + }) + return false + }, + edit() { + if (this.checkSel()) { + this.isAdd = false + this.form = this.selRow + this.form.procDefId = this.selRow.processonDefinitionId + this.formTitle = '修改分类' + this.formVisible = true + this.groupIdInputDisabled = true + this.isUpdate = true + this.pCategoryIdDisabled = true + this.rationDisabled = true + } + }, + updateStateVue(data) { + var suspend = data.suspend + var state + console.info(suspend) + if (suspend) { + state = 'active' + this.$confirm('确定激活吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + updateState(state, data.processonDefinitionId).then(response => { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.fetchData() + }) + }).catch(() => { + }) + } else { + state = 'suspend' + this.$confirm('确定挂载吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + updateState(state, data.processonDefinitionId).then(response => { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.fetchData() + }) + }).catch(() => { + }) + } + } + } +} + diff --git a/matrix-web-admin/src/views/workflow/todoprocess/index.vue b/matrix-web-admin/src/views/workflow/todoprocess/index.vue new file mode 100644 index 0000000..a1919da --- /dev/null +++ b/matrix-web-admin/src/views/workflow/todoprocess/index.vue @@ -0,0 +1,129 @@ + + + + + + + diff --git a/matrix-web-admin/src/views/workflow/todoprocess/process.js b/matrix-web-admin/src/views/workflow/todoprocess/process.js new file mode 100644 index 0000000..3f7fd74 --- /dev/null +++ b/matrix-web-admin/src/views/workflow/todoprocess/process.js @@ -0,0 +1,220 @@ +import {processList, updateState, updateCategory} from '@/api/workflow/process' +import {categoryList} from '@/api/workflow/category' +import { todoTaskList } from '@/api/workflow/task' +export default { + data() { + return { + isUpdate: false, + formVisible: false, + groupIdInputDisabled: false, + formTitle: '添加任务', + isAdd: true, + form: { + id: '', + category: '', + procDefId: '' + }, + listCategoryQuery: { + page: 1, + pageSize: 100 + }, + rules: { + categoryId: [ + {required: true, message: '请输入分类ID', trigger: 'blur'}, + {min: 1, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur'} + ], + categoryName: [ + {required: true, message: '请输入分类名', trigger: 'blur'} + ] + + }, + showTree: false, + defaultProps: { + id: 'id', + label: 'categoryName', + children: 'children' + }, + listQuery: { + category: undefined, + page: 1, + pageSize: 100 + }, + listPCategoryQuery: { + pCategoryId: 0, + page: 1, + pageSize: 100 + }, + totalCount: 0, + list: null, + categoryData: null, + listLoading: true, + selRow: {}, + radio: '2', + pCategoryIdDisabled: false, + rationDisabled: false + } + }, + filters: { + statusFilter(status) { + const statusMap = { + published: 'success', + draft: 'gray', + deleted: 'danger' + } + return statusMap[status] + } + }, + created() { + this.init() + }, + methods: { + init() { + this.fetchData() + this.fetchPCategoryData() + }, + fetchData() { + this.listLoading = true + todoTaskList(this.listQuery).then(response => { + this.list = response.data.tasks + this.listLoading = false + this.totalCount = response.data.totalCount + }) + }, + fetchPCategoryData() { + categoryList(this.listCategoryQuery).then(response => { + this.categoryData = response.data.list + }) + }, + handleNodeClick(data, node) { + console.log(data) + this.form.category = data.categoryId + this.showTree = false + }, + search() { + this.fetchData() + }, + reset() { + this.listQuery.categoryId = '' + this.listQuery.pCategoryId = '' + this.listQuery.categoryName = '' + this.fetchData() + }, + handleFilter() { + this.listQuery.page = 1 + this.getList() + }, + handleClose() { + + }, + handleCurrentChange(currentRow, oldCurrentRow) { + this.selRow = currentRow + }, + resetForm() { + this.form = {} + }, + add() { + this.resetForm() + this.formTitle = '添加分类' + this.formVisible = true + this.isAdd = true + this.isUpdate = false + this.groupIdInputDisabled = false + this.pCategoryIdDisabled = false + this.rationDisabled = false + }, + fetchNext() { + this.listQuery.page = this.listQuery.page + 1 + this.fetchData() + }, + fetchPrev() { + this.listQuery.page = this.listQuery.page - 1 + this.fetchData() + }, + fetchPage(page) { + this.listQuery.page = page + this.fetchData() + }, + changeSize(pageSize) { + this.listQuery.pageSize = pageSize + this.fetchData() + }, + updateCategoryVue() { + this.$refs['form'].validate((valid) => { + if (valid) { + updateCategory(this.form.procDefId, this.form.category).then(response => { + console.log(response) + this.$message({ + message: '提交成功', + type: 'success' + }) + this.fetchData() + this.formVisible = false + }) + } else { + return false + } + }) + }, + checkSel() { + if (this.selRow && this.selRow.processonDefinitionId) { + return true + } + this.$message({ + message: '请选中操作项', + type: 'warning' + }) + return false + }, + edit() { + if (this.checkSel()) { + this.isAdd = false + this.form = this.selRow + this.form.procDefId = this.selRow.processonDefinitionId + this.formTitle = '修改分类' + this.formVisible = true + this.groupIdInputDisabled = true + this.isUpdate = true + this.pCategoryIdDisabled = true + this.rationDisabled = true + } + }, + updateStateVue(data) { + var suspend = data.suspend + var state + console.info(suspend) + if (suspend) { + state = 'active' + this.$confirm('确定激活吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + updateState(state, data.processonDefinitionId).then(response => { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.fetchData() + }) + }).catch(() => { + }) + } else { + state = 'suspend' + this.$confirm('确定挂载吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + updateState(state, data.processonDefinitionId).then(response => { + this.$message({ + message: '操作成功', + type: 'success' + }) + this.fetchData() + }) + }).catch(() => { + }) + } + } + } +} diff --git a/matrix-web-backend/src/main/java/io/github/forezp/AriesApplication.java b/matrix-web-backend/src/main/java/io/github/forezp/AriesApplication.java index 274f6e6..7c9e539 100644 --- a/matrix-web-backend/src/main/java/io/github/forezp/AriesApplication.java +++ b/matrix-web-backend/src/main/java/io/github/forezp/AriesApplication.java @@ -15,7 +15,7 @@ @SpringBootApplication(exclude = {SecurityAutoConfiguration.class}) @MapperScan({"io.github.forezp.modules.system.mapper" - ,"io.github.forezp.modules.task.mapper","io.github.forezp.modules.activiti.mapper"}) + ,"io.github.forezp.modules.task.mapper","io.github.forezp.modules.activiti.mapper","io.github.forezp.modules.personnel.mapper"}) public class AriesApplication extends SpringBootServletInitializer { diff --git a/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/controller/VacationController.java b/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/controller/VacationController.java index 061f335..2955b1f 100644 --- a/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/controller/VacationController.java +++ b/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/controller/VacationController.java @@ -1,8 +1,10 @@ package io.github.forezp.modules.personnel.controller; import io.github.forezp.common.dto.RespDTO; +import io.github.forezp.modules.personnel.service.PlVacationService; import io.github.forezp.modules.personnel.vo.domain.VacationDomain; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @@ -10,10 +12,12 @@ @Slf4j public class VacationController { + @Autowired + PlVacationService plVacationService; @PostMapping("") public RespDTO postVacation(@RequestBody VacationDomain vacationDomain) { - + plVacationService.statVacation(vacationDomain); return RespDTO.onSuc(null); } diff --git a/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/PlVacationService.java b/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/PlVacationService.java index bc1d174..dd23c7e 100644 --- a/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/PlVacationService.java +++ b/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/PlVacationService.java @@ -2,6 +2,7 @@ import io.github.forezp.modules.personnel.entity.PlVacation; import com.baomidou.mybatisplus.extension.service.IService; +import io.github.forezp.modules.personnel.vo.domain.VacationDomain; /** *

@@ -13,4 +14,5 @@ */ public interface PlVacationService extends IService { + void statVacation(VacationDomain vacationDomain); } diff --git a/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/impl/PlVacationServiceImpl.java b/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/impl/PlVacationServiceImpl.java index 7fd3629..bfa4716 100644 --- a/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/impl/PlVacationServiceImpl.java +++ b/matrix-web-backend/src/main/java/io/github/forezp/modules/personnel/service/impl/PlVacationServiceImpl.java @@ -1,11 +1,22 @@ package io.github.forezp.modules.personnel.service.impl; +import io.github.forezp.common.dto.RespDTO; +import io.github.forezp.common.exception.AriesException; +import io.github.forezp.common.exception.ErrorCode; +import io.github.forezp.modules.activiti.controller.TaichiTaskController; +import io.github.forezp.modules.activiti.vo.form.StartTask; import io.github.forezp.modules.personnel.entity.PlVacation; import io.github.forezp.modules.personnel.mapper.PlVacationMapper; import io.github.forezp.modules.personnel.service.PlVacationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import io.github.forezp.modules.personnel.vo.domain.VacationDomain; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** *

* 服务实现类 @@ -15,6 +26,40 @@ * @since 2019-09-02 */ @Service +@Slf4j public class PlVacationServiceImpl extends ServiceImpl implements PlVacationService { + @Autowired + PlVacationMapper plVacationMapper; + @Resource + TaichiTaskController taskController; + @Override + public void statVacation(VacationDomain vacationDomain) { + PlVacation plVacation=new PlVacation(); + BeanUtils.copyProperties(vacationDomain,plVacation); + if(plVacationMapper.insert(plVacation)==0){ + throw new AriesException(ErrorCode.INSERT_DATA_EXIST); + } + + StartTask startTask = new StartTask(); + startTask.setUserId(vacationDomain.getNextUserId()); + startTask.setEntityId(String.valueOf(plVacation.getId())); + startTask.setProcDefKey(plVacation.getProcDefKey()); + startTask.setTitle(plVacation.getName() + "请假申请"); + + RespDTO start = taskController.start(startTask); + if (null == start || start.code != 0) { + throw new AriesException(ErrorCode.FAIL); + } + + log.debug("给业务表 plVacation 赋值 processId"); + plVacation.setProcessId((String) start.data); + boolean suc = updateById(plVacation); + if (!suc) { + log.error("给业务表 plVacation 赋值 processId 异常 ，抛出异常 回滚上述操作"); + throw new AriesException(ErrorCode.FAIL); + } + log.debug("请假申请流程正常开始--哈哈"); + + } } diff --git a/matrix-web-backend/src/main/resources/sql/aries.sql b/matrix-web-backend/src/main/resources/sql/aries.sql index d54cbd3..5488411 100644 --- a/matrix-web-backend/src/main/resources/sql/aries.sql +++ b/matrix-web-backend/src/main/resources/sql/aries.sql @@ -9,7 +9,7 @@ Target Server Version : 50718 File Encoding : utf-8 - Date: 09/02/2019 23:40:15 PM + Date: 09/04/2019 23:01:11 PM */ SET NAMES utf8; @@ -73,7 +73,7 @@ CREATE TABLE `ACT_GE_PROPERTY` ( -- Records of `ACT_GE_PROPERTY` -- ---------------------------- BEGIN; -INSERT INTO `ACT_GE_PROPERTY` VALUES ('next.dbid', '30001', '13'), ('schema.history', 'create(5.22.0.0)', '1'), ('schema.version', '5.22.0.0', '1'); +INSERT INTO `ACT_GE_PROPERTY` VALUES ('next.dbid', '32501', '14'), ('schema.history', 'create(5.22.0.0)', '1'), ('schema.version', '5.22.0.0', '1'); COMMIT; -- ---------------------------- @@ -102,6 +102,13 @@ CREATE TABLE `ACT_HI_ACTINST` ( KEY `ACT_IDX_HI_ACT_INST_EXEC` (`EXECUTION_ID_`,`ACT_ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_HI_ACTINST` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_HI_ACTINST` VALUES ('30003', 'commonvaction:1:27504', '30001', '30001', 'startEvent', null, null, null, 'startEvent', null, '2019-09-04 21:24:48.019', '2019-09-04 21:24:48.109', '90', ''), ('30006', 'commonvaction:1:27504', '30001', '30001', 'aduit1', '30007', null, null, 'userTask', 'fangzhipeng', '2019-09-04 21:24:48.115', null, null, ''); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_HI_ATTACHMENT` -- ---------------------------- @@ -138,6 +145,13 @@ CREATE TABLE `ACT_HI_COMMENT` ( PRIMARY KEY (`ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_HI_COMMENT` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_HI_COMMENT` VALUES ('30008', 'event', '2019-09-04 21:24:48.810', 'fangzhipeng', '30007', null, 'AddUserLink', 'fangzhipeng_|_assignee', null); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_HI_DETAIL` -- ---------------------------- @@ -166,6 +180,13 @@ CREATE TABLE `ACT_HI_DETAIL` ( KEY `ACT_IDX_HI_DETAIL_TASK_ID` (`TASK_ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_HI_DETAIL` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_HI_DETAIL` VALUES ('30005', 'VariableUpdate', '30001', '30001', null, '30003', 'title', 'string', '0', '2019-09-04 21:24:48.020', null, null, null, 'fzp请假申请', null); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_HI_IDENTITYLINK` -- ---------------------------- @@ -183,6 +204,13 @@ CREATE TABLE `ACT_HI_IDENTITYLINK` ( KEY `ACT_IDX_HI_IDENT_LNK_PROCINST` (`PROC_INST_ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_HI_IDENTITYLINK` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_HI_IDENTITYLINK` VALUES ('30002', null, 'starter', 'fangzhipeng', null, '30001'); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_HI_PROCINST` -- ---------------------------- @@ -208,6 +236,13 @@ CREATE TABLE `ACT_HI_PROCINST` ( KEY `ACT_IDX_HI_PRO_I_BUSKEY` (`BUSINESS_KEY_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_HI_PROCINST` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_HI_PROCINST` VALUES ('30001', '30001', '1169239788639391745', 'commonvaction:1:27504', '2019-09-04 21:24:48.018', null, null, 'fangzhipeng', 'startEvent', null, null, null, '', null); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_HI_TASKINST` -- ---------------------------- @@ -237,6 +272,13 @@ CREATE TABLE `ACT_HI_TASKINST` ( KEY `ACT_IDX_HI_TASK_INST_PROCINST` (`PROC_INST_ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_HI_TASKINST` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_HI_TASKINST` VALUES ('30007', 'commonvaction:1:27504', 'aduit1', '30001', '30001', null, null, null, null, 'fangzhipeng', '2019-09-04 21:24:48.123', null, null, null, null, '50', null, null, 'common_vacttion', ''); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_HI_VARINST` -- ---------------------------- @@ -262,6 +304,13 @@ CREATE TABLE `ACT_HI_VARINST` ( KEY `ACT_IDX_HI_PROCVAR_TASK_ID` (`TASK_ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_HI_VARINST` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_HI_VARINST` VALUES ('30004', '30001', '30001', null, 'title', 'string', '0', null, null, null, 'fzp请假申请', null, '2019-09-04 21:24:48.020', '2019-09-04 21:24:48.020'); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_ID_GROUP` -- ---------------------------- @@ -475,6 +524,13 @@ CREATE TABLE `ACT_RU_EXECUTION` ( CONSTRAINT `ACT_FK_EXE_SUPER` FOREIGN KEY (`SUPER_EXEC_`) REFERENCES `ACT_RU_EXECUTION` (`ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_RU_EXECUTION` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_RU_EXECUTION` VALUES ('30001', '1', '30001', '1169239788639391745', null, 'commonvaction:1:27504', null, 'aduit1', '1', '0', '1', '0', '1', '2', '', null, null); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_RU_IDENTITYLINK` -- ---------------------------- @@ -499,6 +555,13 @@ CREATE TABLE `ACT_RU_IDENTITYLINK` ( CONSTRAINT `ACT_FK_TSKASS_TASK` FOREIGN KEY (`TASK_ID_`) REFERENCES `ACT_RU_TASK` (`ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_RU_IDENTITYLINK` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_RU_IDENTITYLINK` VALUES ('30002', '1', null, 'starter', 'fangzhipeng', null, '30001', null); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_RU_JOB` -- ---------------------------- @@ -560,6 +623,13 @@ CREATE TABLE `ACT_RU_TASK` ( CONSTRAINT `ACT_FK_TASK_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `ACT_RU_EXECUTION` (`ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_RU_TASK` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_RU_TASK` VALUES ('30007', '3', '30001', '30001', 'commonvaction:1:27504', null, null, null, 'aduit1', null, 'fangzhipeng', null, '50', '2019-09-04 21:24:48.116', null, 'common_vacttion', '1', '', null); +COMMIT; + -- ---------------------------- -- Table structure for `ACT_RU_VARIABLE` -- ---------------------------- @@ -587,6 +657,13 @@ CREATE TABLE `ACT_RU_VARIABLE` ( CONSTRAINT `ACT_FK_VAR_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `ACT_RU_EXECUTION` (`ID_`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------- +-- Records of `ACT_RU_VARIABLE` +-- ---------------------------- +BEGIN; +INSERT INTO `ACT_RU_VARIABLE` VALUES ('30004', '1', 'string', 'title', '30001', '30001', null, null, null, null, 'fzp请假申请', null); +COMMIT; + -- ---------------------------- -- Table structure for `QRTZ_BLOB_TRIGGERS` -- ---------------------------- @@ -778,7 +855,7 @@ CREATE TABLE `QRTZ_TRIGGERS` ( -- Records of `QRTZ_TRIGGERS` -- ---------------------------- BEGIN; -INSERT INTO `QRTZ_TRIGGERS` VALUES ('SchedulerFactory', 'io.github.forezp.modules.task.job.CleanLogJob', 'common_task', 'io.github.forezp.modules.task.job.CleanLogJob', 'common_task', null, '1567438200000', '1567437600000', '5', 'WAITING', 'CRON', '1566129884000', '0', null, '0', ''); +INSERT INTO `QRTZ_TRIGGERS` VALUES ('SchedulerFactory', 'io.github.forezp.modules.task.job.CleanLogJob', 'common_task', 'io.github.forezp.modules.task.job.CleanLogJob', 'common_task', null, '1567609800000', '1567609200000', '5', 'WAITING', 'CRON', '1566129884000', '0', null, '0', ''); COMMIT; -- ---------------------------- @@ -814,20 +891,27 @@ CREATE TABLE `pl_vacation` ( `name` varchar(66) NOT NULL, `reason` varchar(256) DEFAULT NULL, `remarks` varchar(256) DEFAULT NULL, - `proc_def_key` varchar(66) NOT NULL, - `apply_date` datetime NOT NULL, - `process_id` varchar(66) NOT NULL, - `vacation_type` varchar(255) NOT NULL, - `start_time` datetime NOT NULL, - `end_time` datetime NOT NULL, - `step` varchar(66) NOT NULL, - `create_time` datetime NOT NULL, - `create_by` varchar(66) NOT NULL, - `update_time` datetime NOT NULL, - `update_by` varchar(255) NOT NULL, + `proc_def_key` varchar(66) DEFAULT NULL, + `apply_date` datetime DEFAULT NULL, + `process_id` varchar(66) DEFAULT NULL, + `vacation_type` varchar(255) DEFAULT NULL, + `start_time` datetime DEFAULT NULL, + `end_time` datetime DEFAULT NULL, + `step` varchar(66) DEFAULT NULL, + `create_time` datetime DEFAULT NULL, + `create_by` varchar(66) DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `update_by` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- ---------------------------- +-- Records of `pl_vacation` +-- ---------------------------- +BEGIN; +INSERT INTO `pl_vacation` VALUES ('1169239788639391745', 'fangzhipeng', 'fzp', '11', '1', 'commonvaction', '2019-09-04 21:22:25', '30001', null, '2019-09-03 00:00:00', '2019-09-05 00:00:00', null, '2019-09-04 21:24:24', 'fangzhipeng', '2019-09-04 21:24:24', 'fangzhipeng'); +COMMIT; + -- ---------------------------- -- Table structure for `qrtz_triggers_group` -- ---------------------------- @@ -871,7 +955,7 @@ CREATE TABLE `qrtz_triggers_history` ( -- Records of `qrtz_triggers_history` -- ---------------------------- BEGIN; -INSERT INTO `qrtz_triggers_history` VALUES ('1168544105989062657', 'io.github.forezp.modules.task.job.CleanLogJob', 'common_task', null, null, 'stranger', 'stranger', '2019-09-02 23:20:00', '2019-09-02 23:20:00'); +INSERT INTO `qrtz_triggers_history` VALUES ('1169263848505106434', 'io.github.forezp.modules.task.job.CleanLogJob', 'common_task', null, null, 'stranger', 'stranger', '2019-09-04 23:00:00', '2019-09-04 23:00:00'); COMMIT; -- ---------------------------- @@ -973,13 +1057,6 @@ CREATE TABLE `sys_log` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; --- ---------------------------- --- Records of `sys_log` --- ---------------------------- -BEGIN; -INSERT INTO `sys_log` VALUES ('1168544940038995969', '69e104d2-3ba6-9c9b-2254-bfa5206bfa49', 'GET', '/user/info', '127.0.0.1', '{}', '0', '{\"code\":0,\"data\":{\"roles\":\"administrator\",\"menus\":[{\"code\":\"system\",\"icon\":\"fa-cog\",\"id\":1,\"ismenu\":1,\"isopen\":1,\"levels\":1,\"name\":\"系统管理\",\"num\":4,\"pcode\":\"0\",\"pcodes\":\"[0],\",\"status\":1,\"url\":\"/system\"},{\"code\":\"cms\",\"icon\":\"\",\"id\":2,\"ismenu\":1,\"levels\":1,\"name\":\"CMS管理\",\"num\":5,\"pcode\":\"0\",\"pcodes\":\"[0],\",\"status\":1,\"updateBy\":\"1\",\"updateTime\":1552314338000,\"url\":\"/cms\"},{\"code\":\"operationMgr\",\"icon\":\"null\",\"id\":3,\"ismenu\":1,\"levels\":1,\"name\":\"运维管理\",\"num\":3,\"pcode\":\"0\",\"pcodes\":\"[0],\",\"status\":1,', '180', 'fangzhipeng', '2019-09-02 23:23:19', 'fangzhipeng', '2019-09-02 23:23:19'), ('1168544945114103810', '9ba194ee-da04-556d-f92d-4961fe8805f2', 'GET', '/user/currentUser', '127.0.0.1', '{}', '0', '{\"code\":0,\"data\":{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"mobile\":\"15009223222\",\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"sex\":1,\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\"},\"message\":\"sucess\",\"requestId\":\"9ba194ee-da04-556d-f92d-4961fe8805f2\"}', '18', 'fangzhipeng', '2019-09-02 23:23:20', 'fangzhipeng', '2019-09-02 23:23:20'), ('1168544945223155713', 'aa73f3f0-c36b-f791-abff-fdca4f1133e8', 'GET', '/user/pagelist', '127.0.0.1', '{page=1, pageSize=999}', '0', '{\"code\":0,\"data\":{\"list\":[{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"menus\":[],\"mobile\":\"15009223222\",\"orgName\":\"总公司\",\"orgs\":[{\"orgId\":\"1\",\"simpleName\":\"总公司\"}],\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"roleName\":\"管理员,普通用户\",\"roles\":[{\"name\":\"管理员\",\"roleId\":\"ROLE_ADMIN\"},{\"name\":\"普通用户\",\"roleId\":\"ROLE_USER\"}],\"sex\":1,\"sexName\":\"男\",\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\",\"us', '42', 'fangzhipeng', '2019-09-02 23:23:20', 'fangzhipeng', '2019-09-02 23:23:20'), ('1168546092205940737', '1da5d89a-8252-b076-fe02-27940d784a75', 'POST', '/vacation', '127.0.0.1', '{}', '0', '{\"code\":0,\"message\":\"sucess\",\"requestId\":\"1da5d89a-8252-b076-fe02-27940d784a75\"}', '177440', 'fangzhipeng', '2019-09-02 23:27:44', 'fangzhipeng', '2019-09-02 23:27:44'), ('1168546092235300866', 'dbb1712e-070e-e378-e3bf-fd5b6358b39f', 'GET', '/user/pagelist', '127.0.0.1', '{page=1, pageSize=999}', '0', '{\"code\":0,\"data\":{\"list\":[{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"menus\":[],\"mobile\":\"15009223222\",\"orgName\":\"总公司\",\"orgs\":[{\"orgId\":\"1\",\"simpleName\":\"总公司\"}],\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"roleName\":\"管理员,普通用户\",\"roles\":[{\"name\":\"管理员\",\"roleId\":\"ROLE_ADMIN\"},{\"name\":\"普通用户\",\"roleId\":\"ROLE_USER\"}],\"sex\":1,\"sexName\":\"男\",\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\",\"us', '1330', 'fangzhipeng', '2019-09-02 23:27:44', 'fangzhipeng', '2019-09-02 23:27:44'), ('1168546092243689474', 'd611c956-df36-6cae-f8b0-211d2f36c149', 'GET', '/user/currentUser', '127.0.0.1', '{}', '0', '{\"code\":0,\"data\":{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"mobile\":\"15009223222\",\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"sex\":1,\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\"},\"message\":\"sucess\",\"requestId\":\"d611c956-df36-6cae-f8b0-211d2f36c149\"}', '1324', 'fangzhipeng', '2019-09-02 23:27:44', 'fangzhipeng', '2019-09-02 23:27:44'), ('1168546092243689475', '984b5465-22d8-bf48-ba9c-54cbbf51865b', 'GET', '/user/currentUser', '127.0.0.1', '{}', '0', '{\"code\":0,\"data\":{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"mobile\":\"15009223222\",\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"sex\":1,\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\"},\"message\":\"sucess\",\"requestId\":\"984b5465-22d8-bf48-ba9c-54cbbf51865b\"}', '1309', 'fangzhipeng', '2019-09-02 23:27:44', 'fangzhipeng', '2019-09-02 23:27:44'), ('1168546092252078081', 'cc482817-a775-3aba-d1a7-42d5ad6a48aa', 'GET', '/user/pagelist', '127.0.0.1', '{page=1, pageSize=999}', '0', '{\"code\":0,\"data\":{\"list\":[{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"menus\":[],\"mobile\":\"15009223222\",\"orgName\":\"总公司\",\"orgs\":[{\"orgId\":\"1\",\"simpleName\":\"总公司\"}],\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"roleName\":\"管理员,普通用户\",\"roles\":[{\"name\":\"管理员\",\"roleId\":\"ROLE_ADMIN\"},{\"name\":\"普通用户\",\"roleId\":\"ROLE_USER\"}],\"sex\":1,\"sexName\":\"男\",\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\",\"us', '1328', 'fangzhipeng', '2019-09-02 23:27:44', 'fangzhipeng', '2019-09-02 23:27:44'), ('1168546162523447297', '53ec1708-5b28-c2ef-66c9-1cffd91dd92e', 'GET', '/user/info', '127.0.0.1', '{}', '0', '{\"code\":0,\"data\":{\"roles\":\"administrator\",\"menus\":[{\"code\":\"system\",\"icon\":\"fa-cog\",\"id\":1,\"ismenu\":1,\"isopen\":1,\"levels\":1,\"name\":\"系统管理\",\"num\":4,\"pcode\":\"0\",\"pcodes\":\"[0],\",\"status\":1,\"url\":\"/system\"},{\"code\":\"cms\",\"icon\":\"\",\"id\":2,\"ismenu\":1,\"levels\":1,\"name\":\"CMS管理\",\"num\":5,\"pcode\":\"0\",\"pcodes\":\"[0],\",\"status\":1,\"updateBy\":\"1\",\"updateTime\":1552314338000,\"url\":\"/cms\"},{\"code\":\"operationMgr\",\"icon\":\"null\",\"id\":3,\"ismenu\":1,\"levels\":1,\"name\":\"运维管理\",\"num\":3,\"pcode\":\"0\",\"pcodes\":\"[0],\",\"status\":1,', '125', 'fangzhipeng', '2019-09-02 23:28:10', 'fangzhipeng', '2019-09-02 23:28:10'), ('1168546165547540481', '1b68d2f2-5807-8e42-572d-bbd6151f7b4d', 'GET', '/user/currentUser', '127.0.0.1', '{}', '0', '{\"code\":0,\"data\":{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"mobile\":\"15009223222\",\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"sex\":1,\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\"},\"message\":\"sucess\",\"requestId\":\"1b68d2f2-5807-8e42-572d-bbd6151f7b4d\"}', '16', 'fangzhipeng', '2019-09-02 23:28:11', 'fangzhipeng', '2019-09-02 23:28:11'), ('1168546165614649346', 'e2495c84-3118-9452-e9c0-226baae82bc5', 'GET', '/user/pagelist', '127.0.0.1', '{page=1, pageSize=999}', '0', '{\"code\":0,\"data\":{\"list\":[{\"createBy\":\"1\",\"createTime\":1564502320000,\"email\":\"miles02@163.com\",\"id\":1,\"menus\":[],\"mobile\":\"15009223222\",\"orgName\":\"总公司\",\"orgs\":[{\"orgId\":\"1\",\"simpleName\":\"总公司\"}],\"password\":\"6c7e90436b7f48db03488510cd6ac480\",\"realname\":\"fzp\",\"remarks\":\"qq124746406\",\"roleName\":\"管理员,普通用户\",\"roles\":[{\"name\":\"管理员\",\"roleId\":\"ROLE_ADMIN\"},{\"name\":\"普通用户\",\"roleId\":\"ROLE_USER\"}],\"sex\":1,\"sexName\":\"男\",\"status\":true,\"type\":0,\"updateBy\":\"1\",\"updateTime\":1564502325000,\"userId\":\"fangzhipeng\",\"us', '27', 'fangzhipeng', '2019-09-02 23:28:11', 'fangzhipeng', '2019-09-02 23:28:11'), ('1168546347051851777', 'ad29d3a9-ce1f-b59c-130f-5f7d0415a780', 'POST', '/vacation', '127.0.0.1', '{}', '0', '{\"code\":0,\"message\":\"sucess\",\"requestId\":\"ad29d3a9-ce1f-b59c-130f-5f7d0415a780\"}', '30778', 'fangzhipeng', '2019-09-02 23:28:54', 'fangzhipeng', '2019-09-02 23:28:54'); -COMMIT; - -- ---------------------------- -- Table structure for `sys_login_log` -- ---------------------------- @@ -997,7 +1074,7 @@ CREATE TABLE `sys_login_log` ( -- Records of `sys_login_log` -- ---------------------------- BEGIN; -INSERT INTO `sys_login_log` VALUES ('1155132840004497409', '127.0.0.1', '2', 'admin', '2019-07-27 23:08:15', null), ('1155132863119306753', '127.0.0.1', '2', 'admin', '2019-07-27 23:08:31', null), ('1155132909013381121', '127.0.0.1', '2', 'admin', '2019-07-27 23:08:41', null), ('1155133012012904450', '127.0.0.1', '1', 'fangzhipeng', '2019-07-27 23:09:06', 'fzp'), ('1155862811052277762', '127.0.0.1', '1', 'fangzhipeng', '2019-07-29 23:28:54', 'fzp'), ('1155862831323348994', '127.0.0.1', '1', 'fangzhipeng', '2019-07-29 23:29:09', 'fzp'), ('1156216732610420737', '127.0.0.1', '1', 'fangzhipeng', '2019-07-30 22:55:15', 'fzp'), ('1156216772154318849', '127.0.0.1', '1', 'fangzhipeng', '2019-07-30 22:55:35', 'fzp'), ('1156581085008297986', '127.0.0.1', '1', 'fangzhipeng', '2019-07-31 23:03:04', 'fzp'), ('1156581099440898049', '127.0.0.1', '1', 'fangzhipeng', '2019-07-31 23:03:17', 'fzp'), ('1156937859473289217', '127.0.0.1', '1', 'fangzhipeng', '2019-08-01 22:40:45', 'fzp'), ('1156965933862510594', '127.0.0.1', '1', 'fangzhipeng', '2019-08-02 00:32:19', 'fzp'), ('1156967911451725825', '127.0.0.1', '1', 'fangzhipeng', '2019-08-02 00:40:10', 'fzp'), ('1158391320257728513', '127.0.0.1', '1', 'fangzhipeng', '2019-08-05 22:56:17', 'fzp'), ('1159486786827419650', '127.0.0.1', '1', 'fangzhipeng', '2019-08-08 23:29:17', 'fzp'), ('1160388589270036481', '127.0.0.1', '1', 'fangzhipeng', '2019-08-11 11:12:43', 'fzp'), ('1160394861897781249', '127.0.0.1', '1', 'fangzhipeng', '2019-08-11 11:37:49', 'fzp'), ('1160739349044535297', '127.0.0.1', '1', 'fangzhipeng', '2019-08-12 10:26:40', 'fzp'), ('1161217208645255169', '127.0.0.1', '1', 'fangzhipeng', '2019-08-13 18:05:32', 'fzp'), ('1161672417955500033', '127.0.0.1', '1', 'fangzhipeng', '2019-08-15 00:14:22', 'fzp'), ('1162654984280092674', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 17:18:34', 'fzp'), ('1162692577868902401', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 19:48:07', 'fzp'), ('1162692738808541185', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 19:48:45', 'fzp'), ('1162693299696037889', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 19:50:59', 'fzp'), ('1162908331914498049', '127.0.0.1', '1', 'fangzhipeng', '2019-08-18 10:05:17', 'fzp'), ('1166364932453355521', '127.0.0.1', '1', 'fangzhipeng', '2019-08-27 23:00:45', 'fzp'), ('1168521587580399617', '127.0.0.1', '1', 'fangzhipeng', '2019-09-02 21:50:31', 'fzp'); +INSERT INTO `sys_login_log` VALUES ('1155132840004497409', '127.0.0.1', '2', 'admin', '2019-07-27 23:08:15', null), ('1155132863119306753', '127.0.0.1', '2', 'admin', '2019-07-27 23:08:31', null), ('1155132909013381121', '127.0.0.1', '2', 'admin', '2019-07-27 23:08:41', null), ('1155133012012904450', '127.0.0.1', '1', 'fangzhipeng', '2019-07-27 23:09:06', 'fzp'), ('1155862811052277762', '127.0.0.1', '1', 'fangzhipeng', '2019-07-29 23:28:54', 'fzp'), ('1155862831323348994', '127.0.0.1', '1', 'fangzhipeng', '2019-07-29 23:29:09', 'fzp'), ('1156216732610420737', '127.0.0.1', '1', 'fangzhipeng', '2019-07-30 22:55:15', 'fzp'), ('1156216772154318849', '127.0.0.1', '1', 'fangzhipeng', '2019-07-30 22:55:35', 'fzp'), ('1156581085008297986', '127.0.0.1', '1', 'fangzhipeng', '2019-07-31 23:03:04', 'fzp'), ('1156581099440898049', '127.0.0.1', '1', 'fangzhipeng', '2019-07-31 23:03:17', 'fzp'), ('1156937859473289217', '127.0.0.1', '1', 'fangzhipeng', '2019-08-01 22:40:45', 'fzp'), ('1156965933862510594', '127.0.0.1', '1', 'fangzhipeng', '2019-08-02 00:32:19', 'fzp'), ('1156967911451725825', '127.0.0.1', '1', 'fangzhipeng', '2019-08-02 00:40:10', 'fzp'), ('1158391320257728513', '127.0.0.1', '1', 'fangzhipeng', '2019-08-05 22:56:17', 'fzp'), ('1159486786827419650', '127.0.0.1', '1', 'fangzhipeng', '2019-08-08 23:29:17', 'fzp'), ('1160388589270036481', '127.0.0.1', '1', 'fangzhipeng', '2019-08-11 11:12:43', 'fzp'), ('1160394861897781249', '127.0.0.1', '1', 'fangzhipeng', '2019-08-11 11:37:49', 'fzp'), ('1160739349044535297', '127.0.0.1', '1', 'fangzhipeng', '2019-08-12 10:26:40', 'fzp'), ('1161217208645255169', '127.0.0.1', '1', 'fangzhipeng', '2019-08-13 18:05:32', 'fzp'), ('1161672417955500033', '127.0.0.1', '1', 'fangzhipeng', '2019-08-15 00:14:22', 'fzp'), ('1162654984280092674', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 17:18:34', 'fzp'), ('1162692577868902401', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 19:48:07', 'fzp'), ('1162692738808541185', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 19:48:45', 'fzp'), ('1162693299696037889', '127.0.0.1', '1', 'fangzhipeng', '2019-08-17 19:50:59', 'fzp'), ('1162908331914498049', '127.0.0.1', '1', 'fangzhipeng', '2019-08-18 10:05:17', 'fzp'), ('1166364932453355521', '127.0.0.1', '1', 'fangzhipeng', '2019-08-27 23:00:45', 'fzp'), ('1168521587580399617', '127.0.0.1', '1', 'fangzhipeng', '2019-09-02 21:50:31', 'fzp'), ('1169238146573602818', '127.0.0.1', '1', 'fangzhipeng', '2019-09-04 21:17:52', 'fzp'), ('1169257594827202562', '127.0.0.1', '1', 'fangzhipeng', '2019-09-04 22:34:59', 'fzp'); COMMIT; -- ----------------------------