Merge remote-tracking branch 'origin/master'

k94314517

2025-04-18 478b26d76795e44d3745a2afa08a247c7d529212

Merge remote-tracking branch 'origin/master'

 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))
}

// åˆ é™¤

 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))
}

// åˆ é™¤

 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))
}

// åˆ é™¤

 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
  })
}

 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))
}

// åˆ é™¤

 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))
}

// åˆ é™¤

 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 @@
    }
  })
}
*/

 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))
}

// åˆ é™¤

 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) {

 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) {

 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, {

 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, {

 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, {

 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)

 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')

 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')

 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)

 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, {

 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, {

 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)

 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}

 admin/src/components/business/OperaWorkorderDetailDbhWindow.vue

@@ -149,7 +149,7 @@
      statusMap: {
        0: '待分配WTS',
        1: '待分配任务',
        2: '待处理',
        2: '待工程师处理',
        3: '已解决',
        4: '已解决',
        5: '已解决'

 admin/src/components/business/OperaWorkorderDetailDcaInfoWindow.vue

@@ -148,7 +148,7 @@
      statusMap: {
        0: '待分配WTS',
        1: '待分配任务',
        2: '待处理',
        2: '待工程师处理',
        3: '已解决',
        4: '已解决',
        5: '已解决'

 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: '待分配WTS',
        1: '待分配任务',
        2: '待处理',
        2: '待工程师处理',
        3: '已解决',
        4: '已解决',
        5: '已解决'

 admin/src/components/business/OperaWorkorderDetailSheWindow.vue

@@ -181,7 +181,7 @@
      statusMap: {
        0: '待分配WTS',
        1: '待分配任务',
        2: '待处理',
        2: '待工程师处理',
        3: '已解决',
        4: '已解决',
        5: '已解决'

 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'])"

 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>

 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>

 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"
  }
}

 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
  }
}

 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)

 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));

 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));

 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));

 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));

 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));

 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));

 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));
    }

 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));