From 478b26d76795e44d3745a2afa08a247c7d529212 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 四月 2025 18:25:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/workorderShe.vue | 4
h5/utils/encrypt.js | 28 ++++
admin/src/api/system/role.js | 1
admin/src/api/business/workorder.js | 19 +--
server/src/main/java/com/doumee/api/business/CompanyMemberController.java | 15 ++
admin/src/api/system/snippet.js | 1
server/src/main/java/com/doumee/api/business/NoticesController.java | 13 ++
admin/src/api/business/multifile.js | 9
admin/src/api/business/workorderLog.js | 9
server/src/main/java/com/doumee/api/business/MemberController.java | 19 +++
admin/src/api/system/jobLog.js | 1
admin/src/api/business/category.js | 13 +-
h5/package.json | 3
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue | 6
admin/src/views/business/workorderDcaChild.vue | 4
admin/src/api/system/dictData.js | 1
h5/utils/decryption.js | 52 ++++++++
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue | 2
admin/src/api/business/member.js | 14 +-
admin/src/assets/style/variables.scss | 2
server/src/main/java/com/doumee/api/business/CompanyController.java | 17 ++
admin/src/api/system/loginLog.js | 1
admin/src/api/system/user.js | 1
server/src/main/java/com/doumee/api/business/WorkorderController.java | 13 ++
server/src/main/java/com/doumee/api/business/CategoryController.java | 19 +++
admin/src/api/system/monitor.js | 1
admin/src/api/system/menu.js | 1
server/src/main/java/com/doumee/api/business/WorkorderLogController.java | 15 ++
admin/src/components/business/OperaWorkorderDetailSheWindow.vue | 2
admin/src/api/system/permission.js | 1
admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue | 2
admin/src/api/business/notices.js | 9
admin/src/api/system/dict.js | 1
admin/src/views/business/workorderDbh.vue | 9
admin/src/api/business/managers.js | 9
admin/src/api/system/job.js | 1
admin/src/api/system/traceLog.js | 1
admin/src/api/business/company.js | 13 +-
server/src/main/java/com/doumee/api/business/ManagersController.java | 15 ++
39 files changed, 284 insertions(+), 63 deletions(-)
diff --git a/admin/src/api/business/category.js b/admin/src/api/business/category.js
index d60d34e..5ed8bda 100644
--- a/admin/src/api/business/category.js
+++ b/admin/src/api/business/category.js
@@ -1,24 +1,25 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/category/page', data, {
+ return request.post('/business/category/page', encryptData(data), {
trim: true
})
}
export function allList (data) {
- return request.post('/business/category/list', data, {
+ return request.post('/business/category/list', encryptData(data), {
trim: true
})
}
export function treeList (data) {
- return request.post('/business/category/tree', data, {
+ return request.post('/business/category/tree', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/category/exportExcel', data, {
+ return request.post('/business/category/exportExcel', encryptData(data), {
trim: true,
download: true
})
@@ -26,12 +27,12 @@
// 鍒涘缓
export function create (data) {
- return request.post('/business/category/create', data)
+ return request.post('/business/category/create', encryptData(data))
}
// 淇敼
export function updateById (data) {
- return request.post('/business/category/updateById', data)
+ return request.post('/business/category/updateById', encryptData(data))
}
// 鍒犻櫎
diff --git a/admin/src/api/business/company.js b/admin/src/api/business/company.js
index e4d26dd..f19de73 100644
--- a/admin/src/api/business/company.js
+++ b/admin/src/api/business/company.js
@@ -1,35 +1,36 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/company/page', data, {
+ return request.post('/business/company/page', encryptData(data), {
trim: true
})
}
export function treeList (data) {
- return request.post('/business/company/tree', data, {
+ return request.post('/business/company/tree', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/company/exportExcel', data, {
+ return request.post('/business/company/exportExcel', encryptData(data), {
trim: true,
download: true
})
}
export function companySync (data) {
- return request.post('/business/company/syncAll', data)
+ return request.post('/business/company/syncAll', encryptData(data))
}
// 鍒涘缓
export function create (data) {
- return request.post('/business/company/create', data)
+ return request.post('/business/company/create', encryptData(data))
}
// 淇敼
export function updateById (data) {
- return request.post('/business/company/updateById', data)
+ return request.post('/business/company/updateById', encryptData(data))
}
// 鍒犻櫎
diff --git a/admin/src/api/business/managers.js b/admin/src/api/business/managers.js
index 237a691..ca63784 100644
--- a/admin/src/api/business/managers.js
+++ b/admin/src/api/business/managers.js
@@ -1,15 +1,16 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/managers/page', data, {
+ return request.post('/business/managers/page', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/managers/exportExcel', data, {
+ return request.post('/business/managers/exportExcel', encryptData(data), {
trim: true,
download: true
})
@@ -17,12 +18,12 @@
// 鍒涘缓
export function create (data) {
- return request.post('/business/managers/create', data)
+ return request.post('/business/managers/create', encryptData(data))
}
// 淇敼
export function updateById (data) {
- return request.post('/business/managers/updateById', data)
+ return request.post('/business/managers/updateById', encryptData(data))
}
// 鍒犻櫎
diff --git a/admin/src/api/business/member.js b/admin/src/api/business/member.js
index 8b01c26..d05164c 100644
--- a/admin/src/api/business/member.js
+++ b/admin/src/api/business/member.js
@@ -1,15 +1,15 @@
import request from '../../utils/request'
-
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/member/page', data, {
+ return request.post('/business/member/page', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/member/exportExcel', data, {
+ return request.post('/business/member/exportExcel', encryptData(data), {
trim: true,
download: true
})
@@ -17,15 +17,15 @@
// 鍒涘缓
export function create (data) {
- return request.post('/business/member/create', data)
+ return request.post('/business/member/create', encryptData(data))
}
export function memberSync (data) {
- return request.post('/business/member/syncAll', data)
+ return request.post('/business/member/syncAll', encryptData(data))
}
// 淇敼
export function updateById (data) {
- return request.post('/business/member/updateById', data)
+ return request.post('/business/member/updateById', encryptData(data))
}
// 鍒犻櫎
@@ -33,7 +33,7 @@
return request.get(`/business/member/delete/${id}`)
}
export function allList (data) {
- return request.post('/business/member/list', data, {
+ return request.post('/business/member/list', encryptData(data), {
trim: true
})
}
diff --git a/admin/src/api/business/multifile.js b/admin/src/api/business/multifile.js
index 1fd3d9d..d5c051a 100644
--- a/admin/src/api/business/multifile.js
+++ b/admin/src/api/business/multifile.js
@@ -1,15 +1,16 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/multifile/page', data, {
+ return request.post('/business/multifile/page', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/multifile/exportExcel', data, {
+ return request.post('/business/multifile/exportExcel', encryptData(data), {
trim: true,
download: true
})
@@ -17,12 +18,12 @@
// 鍒涘缓
export function create (data) {
- return request.post('/business/multifile/create', data)
+ return request.post('/business/multifile/create', encryptData(data))
}
// 淇敼
export function updateById (data) {
- return request.post('/business/multifile/updateById', data)
+ return request.post('/business/multifile/updateById', encryptData(data))
}
// 鍒犻櫎
diff --git a/admin/src/api/business/notices.js b/admin/src/api/business/notices.js
index 669d5f4..8dea92f 100644
--- a/admin/src/api/business/notices.js
+++ b/admin/src/api/business/notices.js
@@ -1,15 +1,16 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/notices/page', data, {
+ return request.post('/business/notices/page', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/notices/exportExcel', data, {
+ return request.post('/business/notices/exportExcel', encryptData(data), {
trim: true,
download: true
})
@@ -17,12 +18,12 @@
// 鍒涘缓
export function create (data) {
- return request.post('/business/notices/create', data)
+ return request.post('/business/notices/create', encryptData(data))
}
// 淇敼
export function updateById (data) {
- return request.post('/business/notices/updateById', data)
+ return request.post('/business/notices/updateById', encryptData(data))
}
// 鍒犻櫎
diff --git a/admin/src/api/business/workorder.js b/admin/src/api/business/workorder.js
index 238e1dd..0c01fe5 100644
--- a/admin/src/api/business/workorder.js
+++ b/admin/src/api/business/workorder.js
@@ -1,40 +1,34 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/workorder/page', data, {
+ return request.post('/business/workorder/page', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/workorder/exportExcel', data, {
+ return request.post('/business/workorder/exportExcel', encryptData(data), {
trim: true,
download: true
})
}
-// 鍒涘缓
-export function create (data) {
- return request.post('/business/workorder/create', data)
-}
-// 淇敼
-export function updateById (data) {
- return request.post('/business/workorder/updateById', data)
-}
export function getIndexData (data) {
- return request.post('/business/workorder/getIndexData', data)
+ return request.post('/business/workorder/getIndexData', encryptData(data))
}
export function getWorkOrderData (data) {
- return request.post('/business/workorder/getWorkOrderData', data)
+ return request.post('/business/workorder/getWorkOrderData', encryptData(data))
}
// 鍒犻櫎
export function getById (id) {
return request.get(`/business/workorder/${id}`)
}
+/*
export function deleteById (id) {
return request.get(`/business/workorder/delete/${id}`)
}
@@ -47,3 +41,4 @@
}
})
}
+*/
diff --git a/admin/src/api/business/workorderLog.js b/admin/src/api/business/workorderLog.js
index e05a087..328e12b 100644
--- a/admin/src/api/business/workorderLog.js
+++ b/admin/src/api/business/workorderLog.js
@@ -1,15 +1,16 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/workorderLog/page', data, {
+ return request.post('/business/workorderLog/page', encryptData(data), {
trim: true
})
}
// 瀵煎嚭Excel
export function exportExcel (data) {
- return request.post('/business/workorderLog/exportExcel', data, {
+ return request.post('/business/workorderLog/exportExcel', encryptData(data), {
trim: true,
download: true
})
@@ -17,12 +18,12 @@
// 鍒涘缓
export function create (data) {
- return request.post('/business/workorderLog/create', data)
+ return request.post('/business/workorderLog/create', encryptData(data))
}
// 淇敼
export function updateById (data) {
- return request.post('/business/workorderLog/updateById', data)
+ return request.post('/business/workorderLog/updateById', encryptData(data))
}
// 鍒犻櫎
diff --git a/admin/src/api/system/dict.js b/admin/src/api/system/dict.js
index 08833cb..02a45f3 100644
--- a/admin/src/api/system/dict.js
+++ b/admin/src/api/system/dict.js
@@ -1,4 +1,5 @@
import request from '@/utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
diff --git a/admin/src/api/system/dictData.js b/admin/src/api/system/dictData.js
index 467c6c7..b482fb7 100644
--- a/admin/src/api/system/dictData.js
+++ b/admin/src/api/system/dictData.js
@@ -1,4 +1,5 @@
import request from '@/utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
diff --git a/admin/src/api/system/job.js b/admin/src/api/system/job.js
index 24fa35b..a4709a0 100644
--- a/admin/src/api/system/job.js
+++ b/admin/src/api/system/job.js
@@ -1,5 +1,6 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
return request.post('/system/job/page', data, {
diff --git a/admin/src/api/system/jobLog.js b/admin/src/api/system/jobLog.js
index d772ead..090b8c4 100644
--- a/admin/src/api/system/jobLog.js
+++ b/admin/src/api/system/jobLog.js
@@ -1,5 +1,6 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
return request.post('/system/job/log/page', data, {
diff --git a/admin/src/api/system/loginLog.js b/admin/src/api/system/loginLog.js
index 7103b4c..1791f6c 100644
--- a/admin/src/api/system/loginLog.js
+++ b/admin/src/api/system/loginLog.js
@@ -1,5 +1,6 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
return request.post('/system/loginLog/page', data, {
diff --git a/admin/src/api/system/menu.js b/admin/src/api/system/menu.js
index 19f25a0..46891ef 100644
--- a/admin/src/api/system/menu.js
+++ b/admin/src/api/system/menu.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchTree (data) {
return request.post('/system/menu/treeList', data)
diff --git a/admin/src/api/system/monitor.js b/admin/src/api/system/monitor.js
index d8b3590..2ae8bc8 100644
--- a/admin/src/api/system/monitor.js
+++ b/admin/src/api/system/monitor.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鑾峰彇绯荤粺淇℃伅
export function getSystemInfo () {
return request.get('/system/monitor/getSystemInfo')
diff --git a/admin/src/api/system/permission.js b/admin/src/api/system/permission.js
index 16c5fe1..3525c28 100644
--- a/admin/src/api/system/permission.js
+++ b/admin/src/api/system/permission.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ鏍戝垪琛�
export function fetchTree () {
return request.get('/system/permission/tree')
diff --git a/admin/src/api/system/role.js b/admin/src/api/system/role.js
index 5d9e34b..afd1042 100644
--- a/admin/src/api/system/role.js
+++ b/admin/src/api/system/role.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
return request.post('/system/role/page', data)
diff --git a/admin/src/api/system/snippet.js b/admin/src/api/system/snippet.js
index 715f757..e488afc 100644
--- a/admin/src/api/system/snippet.js
+++ b/admin/src/api/system/snippet.js
@@ -1,5 +1,6 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
return request.post('/system/job/snippet/page', data, {
diff --git a/admin/src/api/system/traceLog.js b/admin/src/api/system/traceLog.js
index 10e0270..4f9f2ce 100644
--- a/admin/src/api/system/traceLog.js
+++ b/admin/src/api/system/traceLog.js
@@ -1,5 +1,6 @@
import request from '../../utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
return request.post('/system/traceLog/page', data, {
diff --git a/admin/src/api/system/user.js b/admin/src/api/system/user.js
index 4080420..90ada8c 100644
--- a/admin/src/api/system/user.js
+++ b/admin/src/api/system/user.js
@@ -1,5 +1,6 @@
import request from '@/utils/request'
+import { encryptData } from '@/utils/request/decryption.js'
// 鏌ヨ
export function fetchList (data) {
return request.post('/system/user/page', data)
diff --git a/admin/src/assets/style/variables.scss b/admin/src/assets/style/variables.scss
index 147d8e7..445550d 100644
--- a/admin/src/assets/style/variables.scss
+++ b/admin/src/assets/style/variables.scss
@@ -26,7 +26,7 @@
.el-image-viewer__wrapper{
z-index: 3000 !important;
}
-.statusInfo0{color: #186acf}
+.statusInfo0{color: #cf3a18}
.statusInfo1{color: #cf3a18
}
.statusInfo2{color: #cf3a18}
diff --git a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
index bd64f1d..2a9ff24 100644
--- a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
@@ -149,7 +149,7 @@
statusMap: {
0: '寰呭垎閰峎TS',
1: '寰呭垎閰嶄换鍔�',
- 2: '寰呭鐞�',
+ 2: '寰呭伐绋嬪笀澶勭悊',
3: '宸茶В鍐�',
4: '宸茶В鍐�',
5: '宸茶В鍐�'
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
index 0c8ad32..b6e62d9 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue
@@ -148,7 +148,7 @@
statusMap: {
0: '寰呭垎閰峎TS',
1: '寰呭垎閰嶄换鍔�',
- 2: '寰呭鐞�',
+ 2: '寰呭伐绋嬪笀澶勭悊',
3: '宸茶В鍐�',
4: '宸茶В鍐�',
5: '宸茶В鍐�'
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
index d1d92d5..8cc3844 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
@@ -93,8 +93,8 @@
<el-table-column label="涓嶇鍚堝師鍥�" prop="eventInfo" min-width="120" />
<el-table-column label="澶勭悊鐘舵��" prop="status" min-width="80">
<template slot-scope="{row}">
- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>
- <span :class="'statusInfo'+row.status" v-else-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
+<!-- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>-->
+ <span :class="'statusInfo'+row.status" v-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
<span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</span>
</template>
</el-table-column>
@@ -147,7 +147,7 @@
statusMap: {
0: '寰呭垎閰峎TS',
1: '寰呭垎閰嶄换鍔�',
- 2: '寰呭鐞�',
+ 2: '寰呭伐绋嬪笀澶勭悊',
3: '宸茶В鍐�',
4: '宸茶В鍐�',
5: '宸茶В鍐�'
diff --git a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
index dd199a5..d5f9b49 100644
--- a/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailSheWindow.vue
@@ -181,7 +181,7 @@
statusMap: {
0: '寰呭垎閰峎TS',
1: '寰呭垎閰嶄换鍔�',
- 2: '寰呭鐞�',
+ 2: '寰呭伐绋嬪笀澶勭悊',
3: '宸茶В鍐�',
4: '宸茶В鍐�',
5: '宸茶В鍐�'
diff --git a/admin/src/views/business/workorderDbh.vue b/admin/src/views/business/workorderDbh.vue
index c4a78c2..36bcd57 100644
--- a/admin/src/views/business/workorderDbh.vue
+++ b/admin/src/views/business/workorderDbh.vue
@@ -55,9 +55,11 @@
<el-table-column prop="typeName" label="椋庨櫓绫诲瀷" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
+<!--
<span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>
- <span :class="'statusInfo'+row.status" v-else-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
- <span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</span>
+-->
+ <span :class="'statusInfo'+row.status" v-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
+ <span :class="'statusInfo'+row.status" v-else>鏈鐞�</span>
</template>
</el-table-column>
<el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
@@ -70,8 +72,7 @@
<span v-else >{{row.memberName}} </span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>
- <el-table-column prop="memberNames" label="閫氱煡浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>this绠′粬浜�
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
diff --git a/admin/src/views/business/workorderDcaChild.vue b/admin/src/views/business/workorderDcaChild.vue
index d62bdfa..0284d0c 100644
--- a/admin/src/views/business/workorderDcaChild.vue
+++ b/admin/src/views/business/workorderDcaChild.vue
@@ -62,8 +62,8 @@
<el-table-column prop="problemTitle" label="涓嶇鍚堥」" min-width="250px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>
- <span :class="'statusInfo'+row.status" v-else-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
+ <!-- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>-->
+ <span :class="'statusInfo'+row.status" v-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
<span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</span>
</template>
</el-table-column>
diff --git a/admin/src/views/business/workorderShe.vue b/admin/src/views/business/workorderShe.vue
index 7a4f74e..7b7e7e8 100644
--- a/admin/src/views/business/workorderShe.vue
+++ b/admin/src/views/business/workorderShe.vue
@@ -56,8 +56,8 @@
<el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>
- <span :class="'statusInfo'+row.status" v-else-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
+ <!-- <span :class="'statusInfo'+row.status" v-if="row.status ==0">寰呭鐞�</span>-->
+ <span :class="'statusInfo'+row.status" v-if="row.status ==3 ||row.status ==4||row.status ==5">宸插鐞�</span>
<span :class="'statusInfo'+row.status" v-else>澶勭悊涓�</span>
</template>
</el-table-column>
diff --git a/h5/package.json b/h5/package.json
index 891ce1e..94360fc 100644
--- a/h5/package.json
+++ b/h5/package.json
@@ -3,6 +3,7 @@
"@wecom/jssdk": "^2.3.0",
"echarts": "^5.6.0",
"uview-ui": "^2.0.38",
- "vconsole": "^3.15.1"
+ "vconsole": "^3.15.1",
+ "crypto-js": "^4.1.1"
}
}
diff --git a/h5/utils/decryption.js b/h5/utils/decryption.js
new file mode 100644
index 0000000..ae73403
--- /dev/null
+++ b/h5/utils/decryption.js
@@ -0,0 +1,52 @@
+// AES
+import CryptoJS from 'crypto-js'
+import JSEncrypt from 'jsencrypt'
+import {
+ generateRandomObj,
+ rsaPassWord
+} from './encrypt.js'
+// 绉侀挜
+// const privateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJkOgs/FrhpXs3QzdhiQ9eFdK7HECPNPadhecJA5SU2kEx+FlRnbA7Z9/Tqg9RYV4zuuxp3cYp9fa8AywRzVIHYLCokt39bUYIsEVJQdh4KRr1usl/x8Wv24GjcnuDlsLnwAgSsqNcVM/4XhtaeqyrmNMEbT7YqxJjBGJNamwSfXAgMBAAECgYADkiQZJtqGAM/OATlbH16tMFhJoHI5AvxMMP/dTYjZR9+uV5Z/8O0oP849pO2y4zXW+Z/mpPKkFzzTUhvRSWOldBFOmjktPdCBA8NuyFT3+dlew202pEbjDxdnTjb+GTNnli0cHoILsJGoqEeCCddNbtlidv0kFQWubbgfuSNf2QJBAOHmb9v36hnmcH3eLEo2wy7bEE30q+UoUGzAlLw2Tv/APh82NV6VVB11duYDeifAE0wJFtImp9zEDrVcmiN5PNMCQQCtc1kwdP15Dfj+miTkmjKbsona3+m06XQ0VbeUelQ07VtAG9zpkaza7c8JEA15cOcxHECFG5f2E4f3KBl543ZtAkBBtj6jxiIbFqVyd8Z6cCOm5aKAisPWDTwX5o1dko64ZruraKFtuhKV3y2PC0PlfEIgxCQXTZdW6NE+gIl1+DZxAkAsC3iAh5S+IsAx1u67ZjSnuOSsweNU31t01rdxasbrUcK0Ot8UKLveNDk4sezaA8ORgv0XT/R8tmT2bCZb/1jZAkBUqgcdO5b9YM9wumvKIDHhKuIobrRYlIhSfh36Iaor0VO9a+Xl0c5lwmZmZDyZHE/mfhuVkjdifOwEeORnWPs7";
+// const privateKey = uni.getStorageSync('aes_private_key')
+
+export function decryptedData (msg, data) {
+ console.log(msg)
+ console.log(data)
+ // 鍙樻崲key:灏嗗綋鏈堜綅鏁板瓧绗︿覆鍘婚櫎锛岀劧鍚庡�掑簭
+ const monthIndex = new Date().getMonth() + 1
+ const msgStr = msg.slice(0, monthIndex) + msg.slice(monthIndex + 1)
+ const reverseMsgStr = msgStr.split('').reverse().join('')
+ const str1 = data.replace(/\s/g, '')
+ console.log(reverseMsgStr)
+ console.log(str1)
+ // 瑙ｅ瘑骞惰繑鍥炵粨鏋�
+ return (
+ JSON.parse(
+ CryptoJS.AES.decrypt({
+ ciphertext: CryptoJS.enc.Base64.parse(str1)
+ },
+ CryptoJS.enc.Utf8.parse(reverseMsgStr), {
+ mode: CryptoJS.mode.ECB,
+ padding: CryptoJS.pad.Pkcs7,
+ iv: CryptoJS.enc.Utf8.parse('AES/CBC/PKCS5Padding')
+ }
+ ).toString(CryptoJS.enc.Utf8)
+ ) || {}
+ )
+}
+
+// 瀵规暟鎹姞瀵�
+export function encryptData (data) {
+ const str = CryptoJS.AES.encrypt(
+ JSON.stringify(data),
+ CryptoJS.enc.Utf8.parse(generateRandomObj), {
+ mode: CryptoJS.mode.ECB,
+ padding: CryptoJS.pad.Pkcs7,
+ iv: CryptoJS.enc.Utf8.parse('AES/CBC/PKCS5Padding')
+ }
+ ).toString()
+ return {
+ data: str,
+ ivKey: rsaPassWord
+ }
+}
diff --git a/h5/utils/encrypt.js b/h5/utils/encrypt.js
new file mode 100644
index 0000000..c4a1978
--- /dev/null
+++ b/h5/utils/encrypt.js
@@ -0,0 +1,28 @@
+// RSA
+import JSEncrypt from 'jsencrypt'
+/******************************************************************************/
+// 鍏挜
+
+// const publicKey = uni.getStorageSync('aes_public_key')
+const publicKey =
+ "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOgrUW4jM5Y" +
+ "2irUCpvpyBn41aTRfGHNQuBHIByK9fbc" +
+ "lNXXt7/QuQj3NQCfwknBBCHcM7A38eC249UxjFkLHAm+I9o15INjF/TrHtlzkzzS9jiek" +
+ "godhUuM4eVxXQUcDNdAgSkKFt9T5WRXg2cjEZQyoi5DlIWLmOqixmx8OKFRQIDAQAB";
+
+function generateRandomString () {
+ const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+ let result = ''
+ const charactersLength = characters.length
+ for (let i = 0; i < 16; i++) {
+ result += characters.charAt(Math.floor(Math.random() * charactersLength))
+ }
+ return result
+}
+
+export const generateRandomObj = generateRandomString()
+// 璋冪敤鍑芥暟鐢熸垚闅忔満瀛楃涓�
+const encryptor = new JSEncrypt() // 鍒涘缓鍔犲瘑瀵硅薄瀹炰緥
+// console.log(publicKey)
+encryptor.setPublicKey(publicKey) // 璁剧疆鍏挜
+export const rsaPassWord = encryptor.encrypt(generateRandomObj)
diff --git a/server/src/main/java/com/doumee/api/business/CategoryController.java b/server/src/main/java/com/doumee/api/business/CategoryController.java
index b69a568..1a46aa7 100644
--- a/server/src/main/java/com/doumee/api/business/CategoryController.java
+++ b/server/src/main/java/com/doumee/api/business/CategoryController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -32,6 +34,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:create")
public ApiResponse create(@RequestBody Category category) {
return ApiResponse.success(categoryService.create(category));
@@ -39,6 +43,8 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
categoryService.deleteById(id);
@@ -47,6 +53,8 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
categoryService.deleteByIdInBatch(this.getIdList(ids));
@@ -55,6 +63,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:update")
public ApiResponse updateById(@RequestBody Category category) {
categoryService.updateById(category);
@@ -63,12 +73,16 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:query")
public ApiResponse<PageData<Category>> findPage (@RequestBody PageWrap<Category> pageWrap) {
return ApiResponse.success(categoryService.findPage(pageWrap));
}
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/list")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:query")
public ApiResponse<List<Category>> findList (@RequestBody Category pageWrap) {
return ApiResponse.success(categoryService.findList(pageWrap));
@@ -76,6 +90,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:category:exportExcel")
public void exportExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Category.class).export(categoryService.findPage(pageWrap).getRecords(), "鍒嗙被淇℃伅琛�", response);
@@ -83,6 +98,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(categoryService.findById(id));
@@ -91,6 +108,8 @@
@ApiOperation("鍒嗙被鏍戞煡璇�")
@PostMapping("/tree")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:category:query")
public ApiResponse<List<Category>> tree (@RequestBody Category param){
return ApiResponse.success(categoryService.treeList(param));
diff --git a/server/src/main/java/com/doumee/api/business/CompanyController.java b/server/src/main/java/com/doumee/api/business/CompanyController.java
index 3d9eb96..c1a27d5 100644
--- a/server/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/src/main/java/com/doumee/api/business/CompanyController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -32,6 +34,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:company:create")
public ApiResponse create(@RequestBody Company company) {
return ApiResponse.success(companyService.create(company));
@@ -39,6 +43,8 @@
@PreventRepeat
@ApiOperation("鍚屾閮ㄩ棬淇℃伅")
@PostMapping("/syncAll")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:company:create")
public ApiResponse syncAll(@RequestBody Company company) {
return ApiResponse.success(companyService.syncAll(company));
@@ -46,6 +52,8 @@
@ApiOperation("缁勭粐鏍戞煡璇�")
@PostMapping("/tree")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:company:query")
public ApiResponse<List<Company>> tree (@RequestBody Company company){
return ApiResponse.success(companyService.companyTree());
@@ -54,6 +62,8 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:company:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
companyService.deleteById(id);
@@ -63,6 +73,8 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@RequiresPermissions("business:company:delete")
+ @EncryptionResp
+ @EncryptionReq
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
companyService.deleteByIdInBatch(this.getIdList(ids));
return ApiResponse.success(null);
@@ -78,6 +90,8 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:company:query")
public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
return ApiResponse.success(companyService.findPage(pageWrap));
@@ -85,6 +99,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:company:exportExcel")
public void exportExcel (@RequestBody PageWrap<Company> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Company.class).export(companyService.findPage(pageWrap).getRecords(), "缁勭粐淇℃伅琛�", response);
@@ -92,6 +107,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:company:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(companyService.findById(id));
diff --git a/server/src/main/java/com/doumee/api/business/CompanyMemberController.java b/server/src/main/java/com/doumee/api/business/CompanyMemberController.java
index 6777284..5b882ae 100644
--- a/server/src/main/java/com/doumee/api/business/CompanyMemberController.java
+++ b/server/src/main/java/com/doumee/api/business/CompanyMemberController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -30,6 +32,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:companymember:create")
public ApiResponse create(@RequestBody CompanyMember companyMember) {
return ApiResponse.success(companyMemberService.create(companyMember));
@@ -37,6 +41,8 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:companymember:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
companyMemberService.deleteById(id);
@@ -45,6 +51,8 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:companymember:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
companyMemberService.deleteByIdInBatch(this.getIdList(ids));
@@ -53,6 +61,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:companymember:update")
public ApiResponse updateById(@RequestBody CompanyMember companyMember) {
companyMemberService.updateById(companyMember);
@@ -61,6 +71,8 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:companymember:query")
public ApiResponse<PageData<CompanyMember>> findPage (@RequestBody PageWrap<CompanyMember> pageWrap) {
return ApiResponse.success(companyMemberService.findPage(pageWrap));
@@ -68,6 +80,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:companymember:exportExcel")
public void exportExcel (@RequestBody PageWrap<CompanyMember> pageWrap, HttpServletResponse response) {
ExcelExporter.build(CompanyMember.class).export(companyMemberService.findPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
@@ -75,6 +88,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:companymember:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(companyMemberService.findById(id));
diff --git a/server/src/main/java/com/doumee/api/business/ManagersController.java b/server/src/main/java/com/doumee/api/business/ManagersController.java
index cb962e0..fde8b3a 100644
--- a/server/src/main/java/com/doumee/api/business/ManagersController.java
+++ b/server/src/main/java/com/doumee/api/business/ManagersController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -30,6 +32,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:managers:create")
public ApiResponse create(@RequestBody Managers managers) {
return ApiResponse.success(managersService.create(managers));
@@ -37,6 +41,8 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:managers:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
managersService.deleteById(id);
@@ -45,6 +51,8 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:managers:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
managersService.deleteByIdInBatch(this.getIdList(ids));
@@ -53,6 +61,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:managers:update")
public ApiResponse updateById(@RequestBody Managers managers) {
managersService.updateById(managers);
@@ -61,6 +71,8 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:managers:query")
public ApiResponse<PageData<Managers>> findPage (@RequestBody PageWrap<Managers> pageWrap) {
return ApiResponse.success(managersService.findPage(pageWrap));
@@ -68,6 +80,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:managers:exportExcel")
public void exportExcel (@RequestBody PageWrap<Managers> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Managers.class).export(managersService.findPage(pageWrap).getRecords(), "璐ｄ换浜轰俊鎭〃", response);
@@ -75,6 +88,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:managers:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(managersService.findById(id));
diff --git a/server/src/main/java/com/doumee/api/business/MemberController.java b/server/src/main/java/com/doumee/api/business/MemberController.java
index 8781748..ce6caaa 100644
--- a/server/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/src/main/java/com/doumee/api/business/MemberController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -32,6 +34,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:create")
public ApiResponse create(@RequestBody Member member) {
return ApiResponse.success(memberService.create(member));
@@ -39,6 +43,8 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
memberService.deleteById(id);
@@ -47,6 +53,8 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
memberService.deleteByIdInBatch(this.getIdList(ids));
@@ -54,6 +62,8 @@
}
@ApiOperation("鍏ㄩ噺淇℃伅鍚屾")
@PostMapping("/syncAll")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:create")
public ApiResponse syncAll( ){
memberService.syncQwAll();
@@ -61,6 +71,8 @@
}
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:update")
public ApiResponse updateById(@RequestBody Member member) {
memberService.updateById(member);
@@ -69,12 +81,16 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:query")
public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
return ApiResponse.success(memberService.findPage(pageWrap));
}
@ApiOperation("鏌ヨ鍏ㄩ儴")
@PostMapping("/list")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:query")
public ApiResponse<List<Member>> findList (@RequestBody Member pageWrap) {
return ApiResponse.success(memberService.findList(pageWrap));
@@ -82,6 +98,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:member:exportExcel")
public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
@@ -89,6 +106,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:member:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(memberService.findById(id));
diff --git a/server/src/main/java/com/doumee/api/business/NoticesController.java b/server/src/main/java/com/doumee/api/business/NoticesController.java
index b5a081d..9112f7e 100644
--- a/server/src/main/java/com/doumee/api/business/NoticesController.java
+++ b/server/src/main/java/com/doumee/api/business/NoticesController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -30,6 +32,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:notices:create")
public ApiResponse create(@RequestBody Notices notices) {
return ApiResponse.success(noticesService.create(notices));
@@ -37,6 +41,8 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:notices:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
noticesService.deleteById(id);
@@ -45,6 +51,8 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:notices:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
noticesService.deleteByIdInBatch(this.getIdList(ids));
@@ -53,6 +61,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:notices:update")
public ApiResponse updateById(@RequestBody Notices notices) {
noticesService.updateById(notices);
@@ -68,6 +78,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:notices:exportExcel")
public void exportExcel (@RequestBody PageWrap<Notices> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Notices.class).export(noticesService.findPage(pageWrap).getRecords(), "绯荤粺娑堟伅淇℃伅琛�", response);
@@ -75,6 +86,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:notices:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(noticesService.findById(id));
diff --git a/server/src/main/java/com/doumee/api/business/WorkorderController.java b/server/src/main/java/com/doumee/api/business/WorkorderController.java
index a99183f..f8aaa44 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.Constants;
@@ -42,6 +44,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
+ @EncryptionReq
+ @EncryptionResp
@PostMapping("/create")
@RequiresPermissions("business:workorder:create")
public ApiResponse create(@RequestBody Workorder workorder) {
@@ -73,17 +77,23 @@
}
@ApiOperation("宸ヤ綔鍙扮粺璁℃暟鎹�")
@PostMapping("/getIndexData")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<WorkorderIndexNumVO> getIndexData(@RequestBody Workorder workorder) {
return ApiResponse.success( workorderService.getIndexData(workorder));
}
@ApiOperation("宸ヤ綔鍙扮粺璁℃姤琛ㄦ暟鎹�")
@PostMapping("/getWorkOrderData")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO workorder) {
return ApiResponse.success( workorderService.getWorkOrderData(workorder));
}
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionReq
+ @EncryptionResp
@RequiresPermissions("business:workorder:query")
public ApiResponse<PageData<Workorder>> findPage (@RequestBody PageWrap<Workorder> pageWrap) {
return ApiResponse.success(workorderService.findPage(pageWrap));
@@ -91,6 +101,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:workorder:exportExcel")
public void exportExcel (@RequestBody PageWrap<Workorder> pageWrap, HttpServletResponse response) {
//0SHE浜嬩欢 1DCA浜嬩欢鎻愪氦璁板綍 2DCA宸ュ崟 3璺岀粖婊戜簨浠�
@@ -173,6 +184,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:workorder:query")
+ @EncryptionResp
+ @EncryptionReq
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(workorderService.getDetail(id,null));
}
diff --git a/server/src/main/java/com/doumee/api/business/WorkorderLogController.java b/server/src/main/java/com/doumee/api/business/WorkorderLogController.java
index c50ed6d..7ac743c 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderLogController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderLogController.java
@@ -1,6 +1,8 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -30,6 +32,8 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:workorderlog:create")
public ApiResponse create(@RequestBody WorkorderLog workorderLog) {
return ApiResponse.success(workorderLogService.create(workorderLog));
@@ -37,6 +41,8 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:workorderlog:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
workorderLogService.deleteById(id);
@@ -45,6 +51,8 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:workorderlog:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
workorderLogService.deleteByIdInBatch(this.getIdList(ids));
@@ -53,6 +61,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:workorderlog:update")
public ApiResponse updateById(@RequestBody WorkorderLog workorderLog) {
workorderLogService.updateById(workorderLog);
@@ -61,6 +71,8 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:workorderlog:query")
public ApiResponse<PageData<WorkorderLog>> findPage (@RequestBody PageWrap<WorkorderLog> pageWrap) {
return ApiResponse.success(workorderLogService.findPage(pageWrap));
@@ -68,6 +80,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @EncryptionReq
@RequiresPermissions("business:workorderlog:exportExcel")
public void exportExcel (@RequestBody PageWrap<WorkorderLog> pageWrap, HttpServletResponse response) {
ExcelExporter.build(WorkorderLog.class).export(workorderLogService.findPage(pageWrap).getRecords(), "宸ュ崟鎿嶄綔鍘嗗彶琛�", response);
@@ -75,6 +88,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
+ @EncryptionResp
+ @EncryptionReq
@RequiresPermissions("business:workorderlog:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(workorderLogService.findById(id));
--
Gitblit v1.9.3