From 7c23d914bcce65cfa3450b119d3ffcf0556c6145 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 23 十二月 2024 14:09:18 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

---
 admin/.env                                                                                                                 |    2 
 admin/src/views/contract/components/contractEdit.vue                                                                       |   21 ++
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java                          |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java                         |    3 
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java                                |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java            |   68 ++++--
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java                   |   16 +
 admin/src/views/contract/components/contractDetail.vue                                                                     |    4 
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java                               |    9 
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java                               |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java                  |    8 
 admin/src/views/finance/components/details.vue                                                                             |   75 ++++---
 admin/src/views/workorder/workorderList.vue                                                                                |    1 
 server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java                                         |    1 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java                              |   11 +
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java                                |    2 
 admin/src/views/Inspection/components/taskDetail.vue                                                                       |   12 +
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java                |   12 
 admin/src/views/business/areas.vue                                                                                         |    3 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java                              |    1 
 server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java                              |    3 
 admin/.env.development                                                                                                     |    8 
 admin/src/views/finance/components/bullEditFu.vue                                                                          |    4 
 server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java                                  |    3 
 admin/src/components/business/OperaAreasWindow.vue                                                                         |    8 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java                        |    2 
 server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java                                        |    4 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java                                 |    9 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java                    |    8 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java                     |    3 
 admin/src/views/Inspection/plan.vue                                                                                        |   44 +++-
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java |    2 
 /dev/null                                                                                                                  |  144 ----------------
 admin/src/api/company.js                                                                                                   |    4 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java                       |   12 +
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java                |    1 
 server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java                                       |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java                   |   20 ++
 38 files changed, 263 insertions(+), 273 deletions(-)

diff --git a/admin/.env b/admin/.env
index 6aaad6a..2ec7c8a 100644
--- a/admin/.env
+++ b/admin/.env
@@ -3,7 +3,7 @@
 # 璺敱鏂瑰紡
 VUE_APP_ROUTER_MODE = 'hash'
 
-# 椤圭洰涓婁笅鏂囪矾寰� 
+# 椤圭洰涓婁笅鏂囪矾寰�
 VUE_APP_CONTEXT_PATH = '/fn_admin'
 
 # 鎺ュ彛鍓嶇紑
diff --git a/admin/.env.development b/admin/.env.development
index a124a35..e812482 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,8 +3,8 @@
 # 椤圭洰涓婁笅鏂囪矾寰�
 VUE_APP_CONTEXT_PATH = './'
 
-#VUE_APP_API_URL  = 'http://localhost:10010'
-VUE_APP_API_URL  = 'http://192.168.0.163:10010'
-# VUE_APP_API_URL  = 'https://dmtest.ahapp.net/fn_admin'
-#  VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
+# VUE_APP_API_URL  = 'http://localhost:10010'
+# VUE_APP_API_URL  = 'http://192.168.0.163:10010'
+VUE_APP_API_URL  = 'https://dmtest.ahapp.net/fn_admin'
+# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
 
diff --git a/admin/src/api/company.js b/admin/src/api/company.js
index 832abb0..ad54d7a 100644
--- a/admin/src/api/company.js
+++ b/admin/src/api/company.js
@@ -11,3 +11,7 @@
 export function companyList (data) {
   return request.post('/visitsAdmin/cloudService/business/company/list', data)
 }
+// 鍒楄〃
+export function companyListConstract (data) {
+  return request.post('/visitsAdmin/cloudService/business/company/listForConstract', data)
+}
diff --git a/admin/src/components/business/OperaAreasWindow.vue b/admin/src/components/business/OperaAreasWindow.vue
index 2458dad..5cdd9cc 100644
--- a/admin/src/components/business/OperaAreasWindow.vue
+++ b/admin/src/components/business/OperaAreasWindow.vue
@@ -9,9 +9,12 @@
       <el-form-item :label="form.type==1?'甯傚悕绉�':'鍘垮尯鍚嶇О'" prop="name">
         <el-input v-model="form.name" :placeholder="form.type==1?'杈撳叆甯傚悕绉�':'杈撳叆鍘垮尯鍚嶇О'" v-trim/>
       </el-form-item>
-      <el-form-item label="鎺掑簭鐮�" prop="sortnum">
-        <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+      <el-form-item label="琛屾斂鍖轰唬鐮�" prop="code">
+        <el-input v-model="form.code" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
       </el-form-item>
+<!--      <el-form-item label="鎺掑簭鐮�" prop="sortnum">
+        <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+      </el-form-item>-->
     </el-form>
   </GlobalAlertWindow>
 </template>
@@ -30,6 +33,7 @@
         id: null,
         parentId: null,
         name: null,
+        code:null,
         sortnum: '0',
         type: null
       },
diff --git a/admin/src/views/Inspection/components/taskDetail.vue b/admin/src/views/Inspection/components/taskDetail.vue
index 43adcf6..a357861 100644
--- a/admin/src/views/Inspection/components/taskDetail.vue
+++ b/admin/src/views/Inspection/components/taskDetail.vue
@@ -11,7 +11,7 @@
       </el-table-column>
       <el-table-column prop="realname" label="宸℃浜�" min-width="100" show-overflow-tooltip />
       <el-table-column prop="editDate" label="宸℃鏃堕棿" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip>
+      <el-table-column prop="files" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip >
         <template v-slot="{ row }">
           <span class="gray" v-if="row.dealStatus == 0">姝ｅ父</span>
           <span class="red" v-if="row.dealStatus == 1">寮傚父</span>
@@ -19,7 +19,15 @@
       </el-table-column>
       <el-table-column prop="" label="宸℃闄勪欢" min-width="100" show-overflow-tooltip>
         <template v-slot="{ row }">
-          
+          <div class="value" v-if="row.multifileList != null && row.multifileList.length">
+            <div v-for="item in row.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
+              <video v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')" ref="videoRef" controls preload="auto"
+                     style="width: 60px;height: 60px;object-fit: contain;" :src="item.fileurlFull" />
+              <el-image v-else-if="item.fileurlFull" style="width:60px; height: 60px" :src="item.fileurlFull"
+                        :preview-src-list="[item.fileurlFull]">
+              </el-image>
+            </div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="dealInfo" label="宸℃璇存槑" min-width="100" show-overflow-tooltip />
diff --git a/admin/src/views/Inspection/plan.vue b/admin/src/views/Inspection/plan.vue
index 421f804..31bd4c2 100644
--- a/admin/src/views/Inspection/plan.vue
+++ b/admin/src/views/Inspection/plan.vue
@@ -2,14 +2,17 @@
   <TableLayout :permissions="['business:ywpatrolscheme:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+      <el-form-item label="寮�濮嬫棩鏈�" prop="selDate">
+        <el-date-picker type="daterange" v-model="searchForm.selDate"  @change="changeSelDate" clearable value-format="yyyy-MM-dd"
+        />
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡" prop="selDateSec">
+        <el-date-picker type="daterange" v-model="searchForm.selDateSec"  @change="changeSelDateSec" clearable value-format="yyyy-MM-dd"
+         />
+      </el-form-item>
       <el-form-item label="璁″垝鍚嶇О" prop="title">
         <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="璁″垝鏃ユ湡" prop="selDate">
-        <el-date-picker type="daterange" v-model="searchForm.selDate" clearable value-format="yyyy-MM-dd"
-          @change="changeDate" />
-      </el-form-item>
-
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
         <el-button @click="reset">閲嶇疆</el-button>
@@ -90,7 +93,9 @@
     return {
       // 鎼滅储
       searchForm: {
-        title: ''
+        title: '',
+        selDate:[],
+        selDateSec:[]
       }
     }
   },
@@ -113,16 +118,7 @@
         this.search()
       })
     },
-    changeDate(e) {
-      if (e && e.length > 0) {
-        this.$set(this.searchForm, 'startDate', e[0])
-        this.$set(this.searchForm, 'endDate', e[1])
-      } else {
-        this.$set(this.searchForm, 'startDate', '')
-        this.$set(this.searchForm, 'endDate', '')
-      }
 
-    },
     reset() {
       this.searchForm = {}
       this.search()
@@ -137,6 +133,24 @@
       this.$refs.operaYwPatrolSchemeWindow.initData()
 
     },
+    changeSelDate(e) {
+      if (e && e.length > 0) {
+        this.$set(this.searchForm, 'startDate', e[0] )
+        this.$set(this.searchForm, 'endDate', e[1]  )
+      } else {
+        this.$set(this.searchForm, 'startDate', '')
+        this.$set(this.searchForm, 'endDate', '')
+      }
+    },
+    changeSelDateSec(e) {
+      if (e && e.length > 0) {
+        this.$set(this.searchForm, 'startDateSec', e[0] )
+        this.$set(this.searchForm, 'endDateSec', e[1]  )
+      } else {
+        this.$set(this.searchForm, 'startDateSec', '')
+        this.$set(this.searchForm, 'endDateSec', '')
+      }
+    },
   }
 }
 </script>
diff --git a/admin/src/views/business/areas.vue b/admin/src/views/business/areas.vue
index 0908620..d308427 100644
--- a/admin/src/views/business/areas.vue
+++ b/admin/src/views/business/areas.vue
@@ -17,8 +17,11 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column prop="name" label="鍦板尯鍚嶇О" min-width="100px"></el-table-column>
+        <el-table-column prop="code" label="琛屾斂鍖轰唬鐮�" align="center" min-width="140px"></el-table-column>
         <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
+<!--
         <el-table-column prop="sortnum" label="鎺掑簭鐮�" align="center" min-width="140px"></el-table-column>
+-->
         <el-table-column
           v-if="containPermissions(['business:areas:update', 'business:areas:create', 'business:areas:delete'])"
           label="鎿嶄綔"
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index a9c43db..3b49554 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -235,7 +235,7 @@
           label="璐﹀崟鏉ユ簮">
           <template slot-scope="{row}">
             <span v-if="row.type === 0">鍚堝悓璐﹀崟</span>
-            <span v-if="row.type === 1">鑷缓璐﹀崟</span>
+            <span v-else>鑷缓璐﹀崟</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -345,7 +345,7 @@
       page: 1,
       total: 0,
       tableData: [],
-      
+
       loading: false
     }
   },
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index 7e13e64..84a9fe8 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -309,7 +309,7 @@
         </div>
       </div>
     </div>
-    <div class="window__footer" style="position: sticky; bottom: 0; left: 0; z-index: 9; background: #ffffff;">
+    <div class="window__footer">
       <slot name="footer">
         <el-button @click="confirm" :loading="confirmWorking" type="primary">{{ activeTabs === 0 ? '涓嬩竴姝�' :
           '鎻愪氦'}}</el-button>
@@ -331,7 +331,7 @@
 import { ywList } from '@/api/customer'
 import { getUserList } from '@/api/system/user'
 import { getProjectList, tree } from '@/api/project/ywProject'
-import { companyList } from '@/api/company'
+import {companyListConstract as companyList } from '@/api/company'
 import { Message, Loading } from 'element-ui'
 import { mapState } from 'vuex'
 export default {
@@ -378,6 +378,7 @@
             advanceDays: ''
           }
         ],
+
 
         wyDeposit: '',
         wyPayType: '',
@@ -447,6 +448,7 @@
         { name: '鍏�/m虏路骞�', value: 2 },
         { name: '鍏�/鍦�', value: 6 },
       ],
+
 
       houseLvThree: []
     }
@@ -860,6 +862,7 @@
     close() {
       if (this.activeTabs === 0) {
         this.$emit('close')
+        this.visible = false
       } else {
         this.activeTabs = 0
         this.zlList = []
@@ -880,7 +883,19 @@
   left: 0;
   z-index: 999;
 }
-
+.window__footer {
+  position: absolute;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+  z-index: 9;
+  background: #ffffff;
+  user-select: none;
+  border-top: 1px solid #eee;
+  height: 60px;
+  line-height: 60px;
+  text-align: center;
+}
 .tabs {
   border-bottom: 1px solid #DFE2E8;
   display: flex;
diff --git a/admin/src/views/finance/components/bullEditFu.vue b/admin/src/views/finance/components/bullEditFu.vue
index 723cd41..3c1007e 100644
--- a/admin/src/views/finance/components/bullEditFu.vue
+++ b/admin/src/views/finance/components/bullEditFu.vue
@@ -30,7 +30,7 @@
                                 <el-option :value="0" label="绉熻祦璐�"></el-option>
                                 <el-option :value="1" label="鐗╀笟璐�"></el-option>
                                 <el-option :value="2" label="绉熻祦鎶奸噾"></el-option>
-                                <el-option :value="3" label="鐗╀笟璇侀噾"></el-option>
+                                <el-option :value="3" label="鐗╀笟鎶奸噾"></el-option>
                                 <el-option :value="4" label="姘寸數璐�"></el-option>
                                 <el-option :value="5" label="鏉傞」璐�"></el-option>
                                 <el-option :value="6" label="鍏朵粬"></el-option>
@@ -210,7 +210,7 @@
         this.$refs.selectHouse.open('閫夋嫨鎴挎簮', { contractId: this.form.contractId, type: 0 })
       },
       getCompanyList () {
-        companyList({})
+        companyList({ type: 2 })
           .then(res => {
             this.comparyList = res
           })
diff --git a/admin/src/views/finance/components/details.vue b/admin/src/views/finance/components/details.vue
index e8ff47b..42ad3b1 100644
--- a/admin/src/views/finance/components/details.vue
+++ b/admin/src/views/finance/components/details.vue
@@ -1,41 +1,43 @@
 <template>
     <GlobalWindow :title="title" :withFooter="false" :visible.sync="visible" :confirm-working="isWorking" @close="close"
         @confirm="confirm">
-        <div class="home_title">
-            <div class="left">
-                <span class="mr10">瀵规柟鍗曚綅鍚嶇О锛歿{info.customerName}}</span>
-                <el-tag type="success" v-if="info.status === 0">寮�鍚�</el-tag>
-                <el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
+        <div style="position: sticky; top: 0; left: 0; width: 100%; background: #ffffff;">
+            <div class="home_title">
+                <div class="left">
+                    <span class="mr10">瀵规柟鍗曚綅鍚嶇О锛歿{info.customerName}}</span>
+                    <el-tag type="success" v-if="info.status === 0">寮�鍚�</el-tag>
+                    <el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
+                </div>
+                <el-button type="danger" v-if="isShow(info.status, info.contractStatus)" @click="closeDW()">鍏抽棴娴佹按</el-button>
             </div>
-            <el-button type="danger" v-if="info.status !== 1 || !['3','4'].includes(info.contractStatus)" @click="closeDW()">鍏抽棴娴佹按</el-button>
-        </div>
-        <div class="line"></div>
-        <div class="main">
-            <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
-                <div class="item" style="flex: 1;">
-                    <div class="la">缁撴竻鐘舵��</div>
-                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 0">寰呮敹娆�</div>
-                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 1">宸茬粨娓�</div>
-                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 2">閮ㄥ垎缁撴竻</div>
-                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 3">寰呬粯娆�</div>
-                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 4">寰呴��娆�</div>
-                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 5">宸插叧闂�</div>
-                </div>
-                <div class="item" style="flex: 1;">
-                    <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
-                    <div class="val" style="margin-top: 10px;">{{info1.receivableFee}}</div>
-                </div>
-                <div class="item" style="flex: 1;">
-                    <div class="la">瀹瀧{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
-                    <div class="val" style="margin-top: 10px;">{{info1.actReceivableFee}}</div>
-                </div>
-                <div class="item" style="flex: 1;">
-                    <div class="la">闇�{{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
-                    <div class="val" style="margin-top: 10px;">{{info1.needReceivableFee}}</div>
-                </div>
-                <div class="item" style="flex: 1;">
-                    <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}鏃ユ湡</div>
-                    <div class="val" style="margin-top: 10px;">{{info1.planPayDate}}</div>
+            <div class="line"></div>
+            <div class="main">
+                <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
+                    <div class="item" style="flex: 1;">
+                        <div class="la">缁撴竻鐘舵��</div>
+                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 0">寰呮敹娆�</div>
+                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 1">宸茬粨娓�</div>
+                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 2">閮ㄥ垎缁撴竻</div>
+                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 3">寰呬粯娆�</div>
+                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 4">寰呴��娆�</div>
+                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 5">宸插叧闂�</div>
+                    </div>
+                    <div class="item" style="flex: 1;">
+                        <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+                        <div class="val" style="margin-top: 10px;">{{info1.receivableFee}}</div>
+                    </div>
+                    <div class="item" style="flex: 1;">
+                        <div class="la">瀹瀧{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+                        <div class="val" style="margin-top: 10px;">{{info1.actReceivableFee}}</div>
+                    </div>
+                    <div class="item" style="flex: 1;">
+                        <div class="la">闇�{{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+                        <div class="val" style="margin-top: 10px;">{{info1.needReceivableFee}}</div>
+                    </div>
+                    <div class="item" style="flex: 1;">
+                        <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}鏃ユ湡</div>
+                        <div class="val" style="margin-top: 10px;">{{info1.planPayDate}}</div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -225,6 +227,11 @@
       tabsClick(val) {
         this.activeTabs = val
       },
+      isShow (status, contractStatus) {
+        if (status === 1) return false
+        if (contractStatus === '3' || contractStatus === '4') return false
+        return true
+      },
       closeDW () {
         this.$confirm('纭鍏抽棴姝ゆ祦姘村悧?', '鎻愮ず', {
           confirmButtonText: '纭畾',
diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index a2b0b1e..f3ad3de 100644
--- a/admin/src/views/workorder/workorderList.vue
+++ b/admin/src/views/workorder/workorderList.vue
@@ -103,7 +103,6 @@
       showDetail: false,
       searchForm: {
         selDate: [],
-        areaType: '',
         areaIds: '',
         projectId: '',
         buildingId: '',
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index a9d3ae1..e6e84ea 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -68,7 +68,8 @@
         queryDto.setDeleted(Boolean.FALSE);
         SystemDict dictData = systemDictService.findOne(queryDto);
         if (dictData == null) {
-            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊间笉瀛樺湪");
+            return new SystemDictData();
+//            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊间笉瀛樺湪");
         }
         SystemDictData data = new SystemDictData();
         data.setDictId(dictData.getId());
diff --git a/server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java
index 8167d7d..856b1f9 100644
--- a/server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemUserCloudController.java
@@ -122,8 +122,8 @@
     @ApiOperation("鏌ヨ鎵�鏈夊唴閮ㄤ汉鍛樼敤鎴�")
     @PostMapping("/findInternalList")
     @CloudRequiredPermission("system:user:query")
-    public ApiResponse<List<SystemUser>> findInternalList () {
-        return ApiResponse.success(systemUserService.findInternalList());
+    public ApiResponse<List<SystemUser>> findInternalList (@RequestBody SystemUser systemUser) {
+        return ApiResponse.success(systemUserService.findInternalList(systemUser));
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
index 2fe3b3c..eeeb248 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
@@ -86,7 +86,7 @@
      * 鏌ヨ鎵�鏈夊唴閮ㄤ汉鍛樺垪琛�
      * @return
      */
-    List<SystemUser> findInternalList();
+    List<SystemUser> findInternalList(SystemUser systemUser);
 
     /**
      * 鏉′欢缁熻
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index bf8ef74..e21a1e7 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -235,12 +235,13 @@
 
 
     @Override
-    public List<SystemUser> findInternalList() {
+    public List<SystemUser> findInternalList(SystemUser systemUser) {
         MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.selectAll(SystemUser.class);
         queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
         queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
         queryWrapper.eq(Company::getType,Constants.ONE);
+        queryWrapper.like(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getRealname()),SystemUser::getRealname,systemUser.getRealname());
         queryWrapper.orderByDesc(SystemUser::getCreateTime);
         List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
         return result;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
index 80392ff..d7600a1 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
@@ -42,6 +42,7 @@
      */
     @Value("${debug_model}")
     private Boolean timing;
+
     @ApiOperation("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
     @GetMapping("/updateWxAccessToken")
     public ApiResponse updateWxAccessToken() {
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
deleted file mode 100644
index 7e24363..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Approve;
-import com.doumee.service.business.ApproveService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/12/28 14:09
- */
-@Api(tags = "瀹℃壒淇℃伅璁板綍琛�")
-@RestController
-@RequestMapping("/business/approve")
-public class ApproveController extends BaseController {
-
-    @Autowired
-    private ApproveService approveService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:approve:create")
-    public ApiResponse create(@RequestBody Approve approve) {
-        return ApiResponse.success(approveService.create(approve));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:approve:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        approveService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:approve:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        approveService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:approve:update")
-    public ApiResponse updateById(@RequestBody Approve approve) {
-        approveService.updateById(approve);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:approve:query")
-    public ApiResponse<PageData<Approve>> findPage (@RequestBody PageWrap<Approve> pageWrap) {
-        return ApiResponse.success(approveService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:approve:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Approve> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Approve.class).export(approveService.findPage(pageWrap).getRecords(), "瀹℃壒淇℃伅璁板綍琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:approve:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(approveService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java
deleted file mode 100644
index 1065317..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.ApproveParam;
-import com.doumee.dao.business.vo.ApproveParamDataVO;
-import com.doumee.service.business.ApproveParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/12/28 11:46
- */
-@Api(tags = "瀹℃壒妯＄増閰嶇疆淇℃伅琛�")
-@RestController
-@RequestMapping("/business/approveParam")
-public class ApproveParamController extends BaseController {
-
-    @Autowired
-    private ApproveParamService approveParamService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:approveparam:create")
-    public ApiResponse create(@RequestBody ApproveParam approveParam) {
-        return ApiResponse.success(approveParamService.create(approveParam));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:approveparam:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        approveParamService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:approveparam:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        approveParamService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:approveparam:update")
-    public ApiResponse updateById(@RequestBody ApproveParam approveParam) {
-        approveParamService.updateById(approveParam);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:approveparam:query")
-    public ApiResponse<PageData<ApproveParam>> findPage (@RequestBody PageWrap<ApproveParam> pageWrap) {
-        return ApiResponse.success(approveParamService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:approveparam:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<ApproveParam> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(ApproveParam.class).export(approveParamService.findPage(pageWrap).getRecords(), "瀹℃壒妯＄増閰嶇疆淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:approveparam:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(approveParamService.findById(id));
-    }
-
-
-    @ApiOperation("鑾峰彇閰嶇疆淇℃伅")
-    @GetMapping("/getApproveParamData")
-    @RequiresPermissions("business:approveparam:query")
-    public ApiResponse<ApproveParamDataVO> getApproveParamData() {
-        return ApiResponse.success(approveParamService.getApproveParamData());
-    }
-
-
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java
deleted file mode 100644
index cd76650..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.ApproveTempl;
-import com.doumee.service.business.ApproveTemplService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "瀹℃壒妯＄増淇℃伅琛�")
-@RestController
-@RequestMapping("/business/approveTempl")
-public class ApproveTemplController extends BaseController {
-
-    @Autowired
-    private ApproveTemplService approveTemplService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:approvetempl:create")
-    public ApiResponse create(@RequestBody ApproveTempl approveTempl) {
-        return ApiResponse.success(approveTemplService.create(approveTempl));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:approvetempl:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        approveTemplService.deleteById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:approvetempl:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        approveTemplService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:approvetempl:update")
-    public ApiResponse updateById(@RequestBody ApproveTempl approveTempl) {
-        approveTemplService.updateById(approveTempl);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:approvetempl:query")
-    public ApiResponse<PageData<ApproveTempl>> findPage (@RequestBody PageWrap<ApproveTempl> pageWrap) {
-        return ApiResponse.success(approveTemplService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:approvetempl:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<ApproveTempl> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(ApproveTempl.class).export(approveTemplService.findPage(pageWrap).getRecords(), "瀹℃壒妯＄増淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:approvetempl:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(approveTemplService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
deleted file mode 100644
index 83108c2..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.CarDriver;
-import com.doumee.service.business.CarDriverService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鍙告満淇℃伅琛�")
-@RestController
-@RequestMapping("/business/carDriver")
-public class CarDriverController extends BaseController {
-
-    @Autowired
-    private CarDriverService carDriverService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:cardriver:create")
-    public ApiResponse create(@RequestBody CarDriver carDriver) {
-        return ApiResponse.success(carDriverService.create(carDriver));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:cardriver:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        carDriverService.deleteById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:cardriver:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        carDriverService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:cardriver:update")
-    public ApiResponse updateById(@RequestBody CarDriver carDriver) {
-        carDriverService.updateById(carDriver);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:cardriver:query")
-    public ApiResponse<PageData<CarDriver>> findPage (@RequestBody PageWrap<CarDriver> pageWrap) {
-        return ApiResponse.success(carDriverService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:cardriver:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<CarDriver> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(CarDriver.class).export(carDriverService.findPage(pageWrap).getRecords(), "鍙告満淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:cardriver:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(carDriverService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
deleted file mode 100644
index 2c81369..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.admin.response.CarEventDTO;
-import com.doumee.dao.business.model.CarEvent;
-import com.doumee.service.business.CarEventService;
-import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃")
-@RestController
-@RequestMapping("/business/carEvent")
-public class CarEventController extends BaseController {
-
-    @Autowired
-    private HkSyncParkServiceImpl hkSyncParkService;
-
-    @Autowired
-    private CarEventService carEventService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-//    @RequiresPermissions("business:carevent:create")
-    public ApiResponse create(@RequestBody CarEvent carEvent) {
-        return ApiResponse.success(carEventService.create(carEvent));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:carevent:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        carEventService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:carevent:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        carEventService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:carevent:update")
-    public ApiResponse updateById(@RequestBody CarEvent carEvent) {
-        carEventService.updateById(carEvent);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    //@RequiresPermissions("business:carevent:query")
-    public ApiResponse<PageData<CarEventDTO>> findPage (@RequestBody PageWrap<CarEvent> pageWrap) {
-        return ApiResponse.success(carEventService.findVisitCarPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    //@RequiresPermissions("business:carevent:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<CarEvent> pageWrap, HttpServletResponse response) {
-//        ExcelExporter.build(CarEventVo.class).exportWithFirstAndEnd (carEventService.findPageExcel(pageWrap),"鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", null, "鍋滆溅鍦轰簨浠舵帹閫佽褰曞鍑烘姤琛�",null , response);
-        ExcelExporter.build(CarEventDTO.class).export(carEventService.findVisitCarPage(pageWrap).getRecords(), "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", response);
-    }
-    @ApiOperation("鏍规嵁鏃ユ湡(starttime)鍚屾杩囪溅鏁版嵁")
-    @PostMapping("/syncByDate")
-    @RequiresPermissions("business:carevent:sync")
-    public ApiResponse syncByDate(@RequestBody CarEvent param) {
-        hkSyncParkService.syncParkRecords(param.getCreateDate());
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:carevent:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(carEventService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java
deleted file mode 100644
index c114dcf..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.CarParks;
-import com.doumee.service.business.CarParksService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鍋滆溅搴撲俊鎭〃")
-@RestController
-@RequestMapping("/business/carParks")
-public class CarParksController extends BaseController {
-
-    @Autowired
-    private CarParksService carParksService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:carparks:create")
-    public ApiResponse create(@RequestBody CarParks carParks) {
-        return ApiResponse.success(carParksService.create(carParks));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:carparks:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        carParksService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:carparks:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        carParksService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:carparks:update")
-    public ApiResponse updateById(@RequestBody CarParks carParks) {
-        carParksService.updateById(carParks);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:carparks:query")
-    public ApiResponse<PageData<CarParks>> findPage (@RequestBody PageWrap<CarParks> pageWrap) {
-        return ApiResponse.success(carParksService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:carparks:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<CarParks> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(CarParks.class).export(carParksService.findPage(pageWrap).getRecords(), "鍋滆溅搴撲俊鎭〃", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:carparks:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(carParksService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
deleted file mode 100644
index e3ce650..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.CarUseBook;
-import com.doumee.service.business.CarUseBookService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�")
-@RestController
-@RequestMapping("/business/carUseBook")
-public class CarUseBookController extends BaseController {
-
-    @Autowired
-    private CarUseBookService carUseBookService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:carusebook:create")
-    public ApiResponse create(@RequestBody CarUseBook carUseBook)   throws Exception {
-        return ApiResponse.success(carUseBookService.create(carUseBook));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:carusebook:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        carUseBookService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:carusebook:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        carUseBookService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:carusebook:update")
-    public ApiResponse updateById(@RequestBody CarUseBook carUseBook) {
-        carUseBookService.updateById(carUseBook);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:carusebook:query")
-    public ApiResponse<PageData<CarUseBook>> findPage (@RequestBody PageWrap<CarUseBook> pageWrap) {
-        return ApiResponse.success(carUseBookService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:carusebook:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<CarUseBook> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(CarUseBook.class).export(carUseBookService.findPage(pageWrap).getRecords(), "杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�", response);
-    }
-
-//    @ApiOperation("鏍规嵁ID鏌ヨ")
-//    @GetMapping("/{id}")
-//    @RequiresPermissions("business:carusebook:query")
-//    public ApiResponse findById(@PathVariable Integer id) {
-//        return ApiResponse.success(carUseBookService.findById(id));
-//    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
deleted file mode 100644
index 3847b84..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Cars;
-import com.doumee.service.business.CarsService;
-import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "杞﹁締淇℃伅琛�")
-@RestController
-@RequestMapping("/business/cars")
-public class CarsController extends BaseController {
-
-    @Autowired
-    private CarsService carsService;
-    @Autowired
-    private HkSyncVehicleFromHKServiceImpl hkSyncVehicleFromHKService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:cars:create")
-    public ApiResponse create(@RequestBody Cars cars) {
-        return ApiResponse.success(carsService.create(cars));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:cars:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        carsService.deleteById(id,getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:cars:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        carsService.deleteByIdInBatch(idList,getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:cars:update")
-    public ApiResponse updateById(@RequestBody Cars cars) {
-        carsService.updateById(cars);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("鍏ㄩ噺鍚屾杞﹁締淇℃伅")
-    @PostMapping("/sync")
-    @RequiresPermissions("business:cars:sync")
-    public ApiResponse sync(@RequestBody Cars cars) {
-        hkSyncVehicleFromHKService.syncVehicleData();
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:cars:query")
-    public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap) {
-        return ApiResponse.success(carsService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:cars:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Cars> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Cars.class).export(carsService.findPage(pageWrap).getRecords(), "杞﹁締淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:cars:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(carsService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
deleted file mode 100644
index 614ee4a..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.Category;
-import com.doumee.service.business.CategoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "鍒嗙被淇℃伅琛�")
-@RestController
-@RequestMapping("/business/category")
-public class CategoryController extends BaseController {
-
-    @Autowired
-    private CategoryService categoryService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:category:create")
-    public ApiResponse create(@RequestBody Category category) {
-        return ApiResponse.success(categoryService.create(category));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:category:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        categoryService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:category:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        categoryService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:category:update")
-    public ApiResponse updateById(@RequestBody Category category) {
-        categoryService.updateById(category);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:category:query")
-    public ApiResponse<PageData<Category>> findPage (@RequestBody PageWrap<Category> pageWrap) {
-        return ApiResponse.success(categoryService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:category:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Category.class).export(categoryService.findPage(pageWrap).getRecords(), "鍒嗙被淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:category:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(categoryService.findById(id));
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/findListByStatus")
-    @RequiresPermissions("business:category:query")
-    public ApiResponse<List<Category>> findListByStatus(@RequestParam("type") Integer type){
-        Category category = new Category();
-        category.setIsdeleted(Constants.ZERO);
-        category.setStatus(Constants.ZERO);
-        category.setType(type);
-        return ApiResponse.success(categoryService.findList(category));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
deleted file mode 100644
index beec7ca..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.config.DataSyncConfig;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.admin.request.UpdateCompanySortDTO;
-import com.doumee.dao.admin.response.CompanyDTO;
-import com.doumee.dao.business.model.Company;
-import com.doumee.service.business.CompanyService;
-import com.doumee.service.business.ext.ERPSyncService;
-import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "浼佷笟淇℃伅琛�")
-@RestController
-@RequestMapping("/business/company")
-public class CompanyController extends BaseController {
-
-    @Autowired
-    private CompanyService companyService;
-
-    @Autowired
-    private ERPSyncService erpSyncService;
-    @Autowired
-    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
-    @Autowired
-    private DataSyncConfig dataSyncConfig;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:company:create")
-    public ApiResponse create(@RequestBody Company company) {
-        return ApiResponse.success(companyService.create(company));
-    }
-
-    @PreventRepeat
-    @ApiOperation("鍒涘缓鍔冲姟鍏徃")
-    @PostMapping("/createLaborServices")
-    @RequiresPermissions("business:company:create")
-    public ApiResponse<Integer> createLaborServices(@RequestBody Company company){
-        return ApiResponse.success(companyService.createLaborServices(company));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:company:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        companyService.deleteById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:company:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        companyService.deleteByIdInBatch(idList,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:company:update")
-    public ApiResponse updateById(@RequestBody Company company) {
-        companyService.updateById(company);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:company:query")
-    public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
-        return ApiResponse.success(companyService.findPage(pageWrap));
-    }
-
-    @ApiOperation("缁勭粐鏍戞煡璇�")
-    @GetMapping("/tree")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", required = true)
-    })
-    @RequiresPermissions("business:company:query")
-    public ApiResponse<List<Company>> tree (@RequestParam Integer type) {
-        return ApiResponse.success(companyService.companyTree(type));
-    }
-
-
-    @ApiOperation("鎺掑簭")
-    @PostMapping("/updateSort")
-    @RequiresPermissions("business:company:query")
-    public ApiResponse updateSort (@Validated @RequestBody UpdateCompanySortDTO dto) {
-        companyService.updateSort(dto);
-        return ApiResponse.success(null);
-    }
-
-
-    @ApiOperation("淇敼鐘舵��")
-    @PostMapping("/updateStatusById")
-    @RequiresPermissions("business:company:update")
-    public ApiResponse updateStatusById(@RequestBody Company company) {
-        companyService.updateStatusById(company);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:company:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Company> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Company.class).export(companyService.findPage(pageWrap).getRecords(), "浼佷笟淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:company:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(companyService.findById(id));
-    }
-
-    @ApiOperation("鏍规嵁鍒嗙被ID鏌ヨ")
-    @PostMapping("/findLaborServicesList")
-    @RequiresPermissions("business:company:query")
-    public ApiResponse<List<Company>> findLaborServicesList(Company query){
-        Company company = new Company();
-        company.setIsdeleted(Constants.ZERO);
-        company.setType(query.getType());
-        company.setCategoryId(query.getCategoryId());
-        return ApiResponse.success(companyService.findList(company));
-    }
-
-
-    /**
-     * 鏌ヨ閮ㄩ棬鍙婂叾瀛愰儴闂ㄤ俊鎭�
-     * @param type 0 鏌ヨ鎵�鏈変俊鎭� 1 鏌ヨ鍐呴儴淇℃伅
-     * @return
-     */
-    @ApiOperation("鏍规嵁绫诲瀷鏌ヨ缁勭粐淇℃伅")
-    @GetMapping("/findCompanyTreePage")
-    @RequiresPermissions("business:company:query")
-    public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
-        return ApiResponse.success(companyService.findCompanyTreePage(type));
-    }
-
-
-
-    @ApiOperation("鍏ㄩ噺閮ㄩ棬淇℃伅鍚屾")
-    @PostMapping("/syncAll")
-    @RequiresPermissions("business:company:sync")
-    public ApiResponse sync(){
-        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
-            return ApiResponse.success( erpSyncService.syncCompany(null));
-        }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
-             hkSyncOrgUserFHKService.syncOrgData(this.getLoginUser(null));
-            return ApiResponse.success("鍚屾鎴愬姛");
-        }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
-            //濡傛灉鏄嚜寤虹郴绲憋紝鍚屾瀹夐槻骞冲彴鍒濆鍖栨暟鎹�
-            hkSyncOrgUserFHKService.syncOrgData(this.getLoginUser(null));
-            return ApiResponse.success("鍚屾鎴愬姛");
-        }
-        return ApiResponse.failed("鏃犳晥鎿嶄綔");
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
deleted file mode 100644
index 9592c47..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.Device;
-import com.doumee.service.business.DeviceService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "璁惧淇℃伅琛�")
-@RestController
-@RequestMapping("/business/device")
-public class DeviceController extends BaseController {
-
-    @Autowired
-    private DeviceService deviceService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:device:create")
-    public ApiResponse create(@RequestBody Device device) {
-        return ApiResponse.success(deviceService.create(device));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:device:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        deviceService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("淇敼鏄惁闂ㄧ鍏ュ彛")
-    @PostMapping("/updateEntranceById")
-    @RequiresPermissions("business:company:update")
-    public ApiResponse updateStatusById(@RequestBody Device param) {
-        Device d = new Device();
-        d.setId(param.getId());
-        d.setEditDate(new Date());
-        d.setIsEntrance(Constants.formatIntegerNum(param.getIsEntrance()));
-        deviceService.updateById(d);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:device:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        deviceService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:device:update")
-    public ApiResponse updateById(@RequestBody Device device) {
-        deviceService.updateById(device);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:device:query")
-    public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap) {
-        return ApiResponse.success(deviceService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:device:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Device> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Device.class).export(deviceService.findPage(pageWrap).getRecords(), "璁惧淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:device:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(deviceService.findById(id));
-    }
-
-    @ApiOperation("鑾峰彇闂ㄧ闆嗗悎-鎻愪緵缁欓棬绂佺粍")
-    @PostMapping("/getList")
-    @RequiresPermissions("business:device:query")
-    public ApiResponse findList(@RequestBody Device device) {
-        return ApiResponse.success(deviceService.findIdAndNameList(device));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
deleted file mode 100644
index 928cb5e..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.admin.response.DeviceEventDTO;
-import com.doumee.dao.business.model.DeviceEvent;
-import com.doumee.service.business.DeviceEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
-@RestController
-@RequestMapping("/business/deviceEvent")
-public class DeviceEventController extends BaseController {
-
-    @Autowired
-    private DeviceEventService deviceEventService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-//    @RequiresPermissions("business:deviceevent:create")
-    public ApiResponse create(@RequestBody DeviceEvent deviceEvent) {
-        return ApiResponse.success(deviceEventService.create(deviceEvent));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:deviceevent:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        deviceEventService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:deviceevent:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        deviceEventService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:deviceevent:update")
-    public ApiResponse updateById(@RequestBody DeviceEvent deviceEvent) {
-        deviceEventService.updateById(deviceEvent);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    //@RequiresPermissions("business:deviceevent:query")
-    public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) {
-        return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    //@RequiresPermissions("business:deviceevent:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(DeviceEventDTO.class).export(deviceEventService.findDeviceEventDTOPage(pageWrap).getRecords(), "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃", response);
-    }
-//    public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) {
-//        ExcelExporter.build(DeviceEventVo.class).export(deviceEventService.findDeviceEventExcel(pageWrap), "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃", response);
-//    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:deviceevent:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(deviceEventService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
deleted file mode 100644
index b7c8fe2..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.DeviceRole;
-import com.doumee.service.business.DeviceRoleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "闂ㄧ瑙掕壊淇℃伅琛�")
-@RestController
-@RequestMapping("/business/deviceRole")
-public class DeviceRoleController extends BaseController {
-
-    @Autowired
-    private DeviceRoleService deviceRoleService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:devicerole:create")
-    public ApiResponse create(@RequestBody DeviceRole deviceRole) {
-        return ApiResponse.success(deviceRoleService.create(deviceRole));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:devicerole:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        deviceRoleService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:devicerole:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        deviceRoleService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:devicerole:update")
-    public ApiResponse updateById(@RequestBody DeviceRole deviceRole) {
-        deviceRoleService.updateById(deviceRole);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼榛樿闂ㄧ缁勭姸鎬�")
-    @PostMapping("/updateStatusById")
-    @RequiresPermissions("business:devicerole:update")
-    public ApiResponse updateStatusById(@RequestBody DeviceRole deviceRole) {
-        deviceRoleService.updateStatusById(deviceRole);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("榛樿涓嬪彂闂ㄧ缁勮鑹�")
-    @PostMapping("/updateMemberRole")
-    public ApiResponse updateMemberRole(@RequestBody DeviceRole deviceRole) {
-        deviceRoleService.updateMemberRole(deviceRole);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:devicerole:query")
-    public ApiResponse<PageData<DeviceRole>> findPage (@RequestBody PageWrap<DeviceRole> pageWrap) {
-        return ApiResponse.success(deviceRoleService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:devicerole:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "闂ㄧ瑙掕壊淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:devicerole:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(deviceRoleService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
deleted file mode 100644
index 6d951cb..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
-import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.service.business.ext.ERPSyncService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "ERP鏁版嵁鍚屾鎺ュ彛")
-@RestController
-@RequestMapping("/business/erpsync")
-public class ERPSyncController extends BaseController {
-    @Autowired
-    private ERPSyncService erpSyncService;
-
-    @PreventRepeat
-    @ApiOperation("銆怑RP銆戝叏閲忓悓姝RP缁勭粐鎺ュ彛")
-    @PostMapping("/getCompanies")
-    @RequiresPermissions("business:erpsync:company")
-    public ApiResponse getCompanies(@RequestBody OrgListRequest param) {
-        String result = erpSyncService.syncCompany(param);
-        return ApiResponse.success(result);
-    }
-    @PreventRepeat
-    @ApiOperation("銆怑RP銆戝叏閲忓悓姝RP浜哄憳鎺ュ彛")
-    @PostMapping("/getUsers")
-    @RequiresPermissions("business:erpsync:users")
-    public ApiResponse getUsers(@RequestBody UserListRequest param) {
-        String result = erpSyncService.syncUsers(param);
-        return ApiResponse.success(result);
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
deleted file mode 100644
index 8fdb392..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Empower;
-import com.doumee.service.business.EmpowerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "浜哄憳鎺堟潈瀵煎叆璁板綍")
-@RestController
-@RequestMapping("/business/empower")
-public class EmpowerController extends BaseController {
-
-    @Autowired
-    private EmpowerService empowerService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:empower:create")
-    public ApiResponse create(@RequestBody Empower empower) {
-        return ApiResponse.success(empowerService.create(empower));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:empower:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        empowerService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:empower:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        empowerService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:empower:update")
-    public ApiResponse updateById(@RequestBody Empower empower) {
-        empowerService.updateById(empower);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:empower:query")
-    public ApiResponse<PageData<Empower>> findPage (@RequestBody PageWrap<Empower> pageWrap) {
-        return ApiResponse.success(empowerService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:empower:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Empower> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Empower.class).export(empowerService.findPage(pageWrap).getRecords(), "鎺堟潈璁板綍", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:empower:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(empowerService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java
deleted file mode 100644
index f161033..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.FormParam;
-import com.doumee.service.business.FormParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "琛ㄥ崟閰嶇疆淇℃伅琛�")
-@RestController
-@RequestMapping("/business/formParam")
-public class FormParamController extends BaseController {
-
-    @Autowired
-    private FormParamService formParamService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:formparam:create")
-    public ApiResponse create(@RequestBody FormParam formParam) {
-        return ApiResponse.success(formParamService.create(formParam));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:formparam:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        formParamService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:formparam:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        formParamService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:formparam:update")
-    public ApiResponse updateById(@RequestBody FormParam formParam) {
-        formParamService.updateById(formParam);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:formparam:query")
-    public ApiResponse<PageData<FormParam>> findPage (@RequestBody PageWrap<FormParam> pageWrap) {
-        return ApiResponse.success(formParamService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:formparam:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<FormParam> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(FormParam.class).export(formParamService.findPage(pageWrap).getRecords(), "琛ㄥ崟閰嶇疆淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:formparam:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(formParamService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java
deleted file mode 100644
index 7c491ce..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.HiddenDanger;
-import com.doumee.service.business.HiddenDangerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "闅愭偅淇℃伅琛�")
-@RestController
-@RequestMapping("/business/hiddenDanger")
-public class HiddenDangerController extends BaseController {
-
-    @Autowired
-    private HiddenDangerService hiddenDangerService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:hiddendanger:create")
-    public ApiResponse create(@RequestBody HiddenDanger hiddenDanger) {
-        return ApiResponse.success(hiddenDangerService.create(hiddenDanger));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:hiddendanger:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        hiddenDangerService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:hiddendanger:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        hiddenDangerService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:hiddendanger:update")
-    public ApiResponse updateById(@RequestBody HiddenDanger hiddenDanger) {
-        hiddenDangerService.updateById(hiddenDanger);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:hiddendanger:query")
-    public ApiResponse<PageData<HiddenDanger>> findPage (@RequestBody PageWrap<HiddenDanger> pageWrap) {
-        return ApiResponse.success(hiddenDangerService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:hiddendanger:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<HiddenDanger> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(HiddenDanger.class).export(hiddenDangerService.findPage(pageWrap).getRecords(), "闅愭偅淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:hiddendanger:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(hiddenDangerService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java
deleted file mode 100644
index 6e20e04..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.HiddenDangerLog;
-import com.doumee.service.business.HiddenDangerLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鐞嗚碃鎿嶄綔鍘嗗彶琛�")
-@RestController
-@RequestMapping("/business/hiddenDangerLog")
-public class HiddenDangerLogController extends BaseController {
-
-    @Autowired
-    private HiddenDangerLogService hiddenDangerLogService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:hiddendangerlog:create")
-    public ApiResponse create(@RequestBody HiddenDangerLog hiddenDangerLog) {
-        return ApiResponse.success(hiddenDangerLogService.create(hiddenDangerLog));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:hiddendangerlog:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        hiddenDangerLogService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:hiddendangerlog:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        hiddenDangerLogService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:hiddendangerlog:update")
-    public ApiResponse updateById(@RequestBody HiddenDangerLog hiddenDangerLog) {
-        hiddenDangerLogService.updateById(hiddenDangerLog);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:hiddendangerlog:query")
-    public ApiResponse<PageData<HiddenDangerLog>> findPage (@RequestBody PageWrap<HiddenDangerLog> pageWrap) {
-        return ApiResponse.success(hiddenDangerLogService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:hiddendangerlog:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<HiddenDangerLog> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(HiddenDangerLog.class).export(hiddenDangerLogService.findPage(pageWrap).getRecords(), "鐞嗚碃鎿嶄綔鍘嗗彶琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:hiddendangerlog:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(hiddenDangerLogService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java
deleted file mode 100644
index d0f1c31..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.HiddenDangerParam;
-import com.doumee.service.business.HiddenDangerParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛�")
-@RestController
-@RequestMapping("/business/hiddenDangerParam")
-public class HiddenDangerParamController extends BaseController {
-
-    @Autowired
-    private HiddenDangerParamService hiddenDangerParamService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:hiddendangerparam:create")
-    public ApiResponse create(@RequestBody HiddenDangerParam hiddenDangerParam) {
-        return ApiResponse.success(hiddenDangerParamService.create(hiddenDangerParam));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:hiddendangerparam:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        hiddenDangerParamService.deleteById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:hiddendangerparam:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        hiddenDangerParamService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:hiddendangerparam:update")
-    public ApiResponse updateById(@RequestBody HiddenDangerParam hiddenDangerParam) {
-        hiddenDangerParamService.updateById(hiddenDangerParam);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:hiddendangerparam:query")
-    public ApiResponse<PageData<HiddenDangerParam>> findPage (@RequestBody PageWrap<HiddenDangerParam> pageWrap) {
-        return ApiResponse.success(hiddenDangerParamService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:hiddendangerparam:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<HiddenDangerParam> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(HiddenDangerParam.class).export(hiddenDangerParamService.findPage(pageWrap).getRecords(), "闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:hiddendangerparam:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(hiddenDangerParamService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
deleted file mode 100644
index 582ed58..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.haikang.model.param.request.*;
-import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformCarsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.dao.business.model.Device;
-import com.doumee.service.business.impl.hksync.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "娴峰悍鏁版嵁鍚屾鎺ュ彛")
-@RestController
-@RequestMapping("/business/hksync")
-public class HkSyncController extends BaseController {
-
-    @Autowired
-    private HkSyncDeviceServiceImpl hkSyncDeviceService;
-    @Autowired
-    private HkSyncParkServiceImpl hkSyncParkService;
-    @Autowired
-    private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
-    @Autowired
-    private HkSyncPushServiceImpl hkSyncPushService;
-    @Autowired
-    private HkSyncPlatformsServiceImpl hkSyncPlatformsService;
-    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ユ湀鍙颁俊鎭帴鍙�")
-    @PostMapping("/syncPlatforms")
-    @RequiresPermissions("business:hksync:platforms")
-    public ApiResponse syncPlatforms(@RequestBody PlatformsListRequest param) {
-        String result = hkSyncPlatformsService.syncPlatforms(param);
-        return ApiResponse.success(result);
-    }
-    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ユ湀鍙扮姸鎬佷俊鎭帴鍙�")
-    @PostMapping("/syncPlatformStatus")
-    @RequiresPermissions("business:hksync:platforms")
-    public ApiResponse syncPlatformStatus(@RequestBody PlatformStatusRequest param) {
-        String result = hkSyncPlatformsService.getPlatformStatus(param);
-        return ApiResponse.success(result);
-    }
-    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
-    @PostMapping("/syncDevices")
-    @RequiresPermissions("business:hksync:device")
-    public ApiResponse syncHkDevices(@RequestBody Device param) {
-        String result = hkSyncDeviceService.syncHkDevices(param);
-        return ApiResponse.success(result);
-    }
-    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
-    @PostMapping("/syncParks")
-    @RequiresPermissions("business:hksync:park")
-    public ApiResponse syncHkParks(@RequestBody ParkListRequest param) {
-        String result = hkSyncParkService.syncHkParks(param);
-        return ApiResponse.success(result);
-    }
-    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛")
-    @PostMapping("/syncPrivilege")
-    @RequiresPermissions("business:hksync:privilege")
-    public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) {
-        String result = hkSyncPrivilegeService.syncPrivilege(param);
-        return ApiResponse.success(result);
-    }
-//    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戦棬绂佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
-    @PostMapping("/push/acs")
-    public ApiResponse pushAcs(  HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response) {
-        String result = hkSyncPushService.dealAcsEvent(param,response);
-        return ApiResponse.success(result);
-    }
-//    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戣瀹簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
-    @PostMapping("/push/visit")
-    public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response) {
-        String result = hkSyncPushService.dealVisitEvent(param,response);
-        return ApiResponse.success(result);
-    }
-//    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
-    @PostMapping("/push/parks")
-    public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response) {
-        String result = hkSyncPushService.dealParkEvent(param,response);
-        return ApiResponse.success(result);
-    }
-    @PreventRepeat
-    @ApiOperation("銆愭捣搴枫�戝彇娑堣闃呬簨浠�")
-    @PostMapping("/cancelEventSub")
-    public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response) {
-         hkSyncPushService.cancelEventSub();
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("銆愭捣搴枫�戞湀鍙板伐浣滅姸鎬佷簨浠舵帹閫�")
-    @PostMapping("/push/platform/workstatus")
-    public ApiResponse pushPlatformStatus(@RequestBody EventPlatformRequest param, HttpServletResponse response) {
-         hkSyncPushService.dealPlatformStatusEvent(param,response);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("銆愭捣搴枫�戞湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫�")
-    @PostMapping("/push/platform/carstatus")
-    public ApiResponse pushPlatformCarStatus(@RequestBody EventPlatformCarsRequest param, HttpServletResponse response) {
-         hkSyncPushService.dealPlatformCarsEvent(param,response);
-        return ApiResponse.success(null);
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java
deleted file mode 100644
index 733e71c..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.InoutDayCount;
-import com.doumee.service.business.InoutDayCountService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/10/12 16:19
- */
-@Api(tags = "鍑哄叆鍦轰汉娆¤溅娆℃瘡鏃ョ粺璁¤〃")
-@RestController
-@RequestMapping("/business/inoutDayCount")
-public class InoutDayCountController extends BaseController {
-
-    @Autowired
-    private InoutDayCountService inoutDayCountService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:inoutdaycount:create")
-    public ApiResponse create(@RequestBody InoutDayCount inoutDayCount) {
-        return ApiResponse.success(inoutDayCountService.create(inoutDayCount));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:inoutdaycount:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        inoutDayCountService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:inoutdaycount:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        inoutDayCountService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:inoutdaycount:update")
-    public ApiResponse updateById(@RequestBody InoutDayCount inoutDayCount) {
-        inoutDayCountService.updateById(inoutDayCount);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:inoutdaycount:query")
-    public ApiResponse<PageData<InoutDayCount>> findPage (@RequestBody PageWrap<InoutDayCount> pageWrap) {
-        return ApiResponse.success(inoutDayCountService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:inoutdaycount:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<InoutDayCount> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(InoutDayCount.class).export(inoutDayCountService.findPage(pageWrap).getRecords(), "鍑哄叆鍦轰汉娆¤溅娆℃瘡鏃ョ粺璁¤〃", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:inoutdaycount:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(inoutDayCountService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
deleted file mode 100644
index 5ef9533..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.MemberCard;
-import com.doumee.service.business.MemberCardService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�")
-@RestController
-@RequestMapping("/business/memberCard")
-public class MemberCardController extends BaseController {
-
-    @Autowired
-    private MemberCardService memberCardService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:membercard:create")
-    public ApiResponse create(@RequestBody MemberCard memberCard) {
-        return ApiResponse.success(memberCardService.create(memberCard));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:membercard:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        memberCardService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:membercard:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        memberCardService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:membercard:update")
-    public ApiResponse updateById(@RequestBody MemberCard memberCard) {
-        memberCardService.updateById(memberCard);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎸傚け鎿嶄綔")
-    @PostMapping("/batchLoss")
-    @RequiresPermissions("business:membercard:update")
-    public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) {
-        memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("瑙ｆ寕鎿嶄綔")
-    @PostMapping("/batchUnLoss")
-    @RequiresPermissions("business:membercard:update")
-    public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) {
-        memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("閫�鍗℃搷浣�")
-    @PostMapping("/refundCard")
-    @RequiresPermissions("business:membercard:update")
-    public ApiResponse refundCard(@RequestBody MemberCard memberCard) {
-        memberCardService.updateRefundCard(memberCard);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:membercard:query")
-    public ApiResponse<PageData<MemberCard>> findPage (@RequestBody PageWrap<MemberCard> pageWrap) {
-        return ApiResponse.success(memberCardService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:membercard:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<MemberCard> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(MemberCard.class).export(memberCardService.findPage(pageWrap).getRecords(), "鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:membercard:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(memberCardService.findById(id));
-    }
-
-
-    @ApiOperation("鏍规嵁鏉′欢鏌ヨ鍙敤鍗″彿")
-    @PostMapping("/queryCard")
-    //@RequiresPermissions("business:membercard:query")
-    public ApiResponse<List<MemberCard>> queryCard () {
-        MemberCard card = new MemberCard();
-        return ApiResponse.success(memberCardService.findList(card));
-    }
-
-
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
deleted file mode 100644
index 31466bd..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.config.DataSyncConfig;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.admin.request.LaborMemberDTO;
-import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.business.model.Member;
-import com.doumee.service.business.ext.ERPSyncService;
-import com.doumee.service.business.MemberService;
-import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "浜哄憳淇℃伅琛�")
-@RestController
-@RequestMapping("/business/member")
-public class MemberController extends BaseController {
-    @Autowired
-    private ERPSyncService erpSyncService;
-    @Autowired
-    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
-    @Autowired
-    private DataSyncConfig dataSyncConfig;
-
-    @Autowired
-    private MemberService memberService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:member:create")
-    public ApiResponse create(@RequestBody Member member) {
-        return ApiResponse.success(memberService.create(member));
-    }
-
-    @PreventRepeat
-    @ApiOperation("鍒涘缓鍔冲姟浜哄憳淇℃伅")
-    @PostMapping("/laborMemberCreate")
-    @RequiresPermissions("business:member:create")
-    public ApiResponse<Integer> laborMemberCreate(@RequestBody LaborMemberDTO member){
-        return ApiResponse.success(memberService.laborMemberCreate(member));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:member:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        memberService.deleteById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:member:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍛樺伐鏉冮檺涓嬪彂")
-    @GetMapping("/roleAuth/{id}")
-    @RequiresPermissions("business:empower:create")
-    public ApiResponse roleAuthById(@PathVariable Integer id) {
-        memberService.roleAuthById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-
-    @ApiOperation("鍚屾浜鸿劯淇℃伅")
-    @PostMapping("/updateFace")
-    public ApiResponse updateFace(@RequestBody Member member) {
-        memberService.updateFace(member);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("寮哄埗鍒犻櫎瀹夐槻骞冲彴浜哄憳淇℃伅")
-    @PostMapping("/delHkForce")
-    public ApiResponse delHkForce(@RequestBody Member member) {
-        memberService.delHkForce(member);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("閲嶆柊涓嬪彂浜鸿劯")
-    @PostMapping("/empowerByList")
-    public ApiResponse empowerByList(@RequestBody Member member) {
-        memberService.empowerByList(member);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:member:update")
-    public ApiResponse updateById(@RequestBody Member member) {
-        memberService.updateById(member);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID 绂佸惎鐢�  ")
-    @PostMapping("/updateStatusById")
-    @RequiresPermissions("business:member:update")
-    public ApiResponse updateStatusById(@RequestBody Member member){
-        memberService.updateStatusById(member);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鎷夐粦")
-    @GetMapping("/batchBlock")
-    @RequiresPermissions("business:member:delete")
-    public ApiResponse batchBlock(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        memberService.batchBlock(idList,2,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍐荤粨")
-    @GetMapping("/batchFreeze")
-    @RequiresPermissions("business:member:delete")
-    public ApiResponse batchFreeze(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        memberService.batchBlock(idList,1,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-
-
-    @ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
-    @PostMapping("/updateCanVisitById")
-    @RequiresPermissions("business:member:update")
-    public ApiResponse updateCanVisitById(@RequestBody Member member){
-        memberService.updateCanVisitById(member);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
-        return ApiResponse.success(memberService.findPage(pageWrap));
-    }
-
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:member:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:member:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(memberService.findById(id));
-    }
-
-
-
-
-    /**
-     *
-     * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
-     * @param pageWrap
-     * @return
-     */
-    @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
-    @PostMapping("/findMemberInfoPage")
-    @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
-        if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
-            return ApiResponse.success(memberService.findVisitPage(pageWrap));
-        }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
-            return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
-        }else {
-            return ApiResponse.success(null);
-        }
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
-    @PostMapping("/findVisitPage")
-    @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
-        return ApiResponse.success(memberService.findVisitPage(pageWrap));
-    }
-
-
-    @ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
-    @PostMapping("/findUnusualPage")
-    @RequiresPermissions("business:member:query")
-    public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
-        return ApiResponse.success(memberService.findUnusualPage(pageWrap));
-    }
-
-    @ApiOperation("鏍规嵁绫诲瀷鏌ヨ浜哄憳淇℃伅")
-    @PostMapping("/findTypeMemberInfo")
-    //@RequiresPermissions("business:member:query")
-    public ApiResponse<List<Member>> findTypeMemberInfo (@RequestBody Member member) {
-        return ApiResponse.success(memberService.findList(member));
-    }
-
-    @ApiOperation("鍏ㄩ噺淇℃伅鍚屾")
-    @PostMapping("/syncAll")
-    @RequiresPermissions("business:member:sync")
-    public ApiResponse sync(){
-        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
-            erpSyncService.syncUsers(null);
-        }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
-            hkSyncOrgUserFHKService.syncUserData(this.getLoginUser(null));
-        }
-        return ApiResponse.success("鍚屾鎴愬姛");
-    }
-
-
-
-    @ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
-    @PostMapping("/testFreeFz")
-    public ApiResponse testFreeFz() {
-        memberService.memberFreeze();
-        return ApiResponse.success(null);
-    }
-
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
deleted file mode 100644
index dd316c6..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.MemberRole;
-import com.doumee.service.business.MemberRoleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "浜哄憳瑙掕壊鍏宠仈淇℃伅")
-@RestController
-@RequestMapping("/business/memberRole")
-public class MemberRoleController extends BaseController {
-
-    @Autowired
-    private MemberRoleService memberRoleService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:memberrole:create")
-    public ApiResponse create(@RequestBody MemberRole memberRole) {
-        return ApiResponse.success(memberRoleService.create(memberRole));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:memberrole:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        memberRoleService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:memberrole:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        memberRoleService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:memberrole:update")
-    public ApiResponse updateById(@RequestBody MemberRole memberRole) {
-        memberRoleService.updateById(memberRole);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:memberrole:query")
-    public ApiResponse<PageData<MemberRole>> findPage (@RequestBody PageWrap<MemberRole> pageWrap) {
-        return ApiResponse.success(memberRoleService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:memberrole:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<MemberRole> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(MemberRole.class).export(memberRoleService.findPage(pageWrap).getRecords(), "浜哄憳瑙掕壊鍏宠仈淇℃伅", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:memberrole:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(memberRoleService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
deleted file mode 100644
index 671dd01..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.ParkBook;
-import com.doumee.service.business.ParkBookService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "杞﹁締棰勭害璁板綍淇℃伅琛�")
-@RestController
-@RequestMapping("/business/parkBook")
-public class ParkBookController extends BaseController {
-
-    @Autowired
-    private ParkBookService parkBookService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:parkbook:create")
-    public ApiResponse create(@RequestBody ParkBook parkBook) {
-        return ApiResponse.success(parkBookService.create(parkBook));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:parkbook:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        parkBookService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:parkbook:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        parkBookService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:parkbook:update")
-    public ApiResponse updateById(@RequestBody ParkBook parkBook) {
-        parkBookService.updateById(parkBook);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("閲嶆柊涓嬪彂")
-    @PostMapping("/reUpdate")
-    @RequiresPermissions("business:parkbook:update")
-    public ApiResponse reUpdate(@RequestBody ParkBook parkBook) {
-        parkBookService.reUpdate(parkBook);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:parkbook:query")
-    public ApiResponse<PageData<ParkBook>> findPage (@RequestBody PageWrap<ParkBook> pageWrap) {
-        return ApiResponse.success(parkBookService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:parkbook:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<ParkBook> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(ParkBook.class).export(parkBookService.findPage(pageWrap).getRecords(), "杞﹁締棰勭害璁板綍淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:parkbook:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(parkBookService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
deleted file mode 100644
index 8423731..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Parks;
-import com.doumee.service.business.ParksService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "鍋滆溅搴撲俊鎭〃")
-@RestController
-@RequestMapping("/business/parks")
-public class ParksController extends BaseController {
-
-    @Autowired
-    private ParksService parksService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:parks:create")
-    public ApiResponse create(@RequestBody Parks parks) {
-        return ApiResponse.success(parksService.create(parks));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:parks:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        parksService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:parks:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        parksService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:parks:update")
-    public ApiResponse updateById(@RequestBody Parks parks) {
-        parksService.updateById(parks);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:parks:query")
-    public ApiResponse<PageData<Parks>> findPage (@RequestBody PageWrap<Parks> pageWrap) {
-        return ApiResponse.success(parksService.findPage(pageWrap));
-    }
-
-    @ApiOperation("鎵�灞炲仠杞﹀満鍒楄〃")
-    @PostMapping("/findList")
-    @RequiresPermissions("business:parks:query")
-    public ApiResponse<List<Parks>> findList (@RequestBody Parks parks) {
-        return ApiResponse.success(parksService.findList(parks));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:parks:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Parks> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Parks.class).export(parksService.findPage(pageWrap).getRecords(), "鍋滆溅搴撲俊鎭〃", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:parks:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(parksService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java
deleted file mode 100644
index 88c2471..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Platform;
-import com.doumee.service.business.PlatformService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鏈堝彴淇℃伅琛�")
-@RestController
-@RequestMapping("/business/platform")
-public class PlatformController extends BaseController {
-
-    @Autowired
-    private PlatformService platformService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platform:create")
-    public ApiResponse create(@RequestBody Platform platform) {
-        return ApiResponse.success(platformService.create(platform));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platform:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platform:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        platformService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platform:update")
-    public ApiResponse updateById(@RequestBody Platform platform) {
-        platformService.updateById(platform);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platform:query")
-    public ApiResponse<PageData<Platform>> findPage (@RequestBody PageWrap<Platform> pageWrap) {
-        return ApiResponse.success(platformService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platform:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Platform> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Platform.class).export(platformService.findPage(pageWrap).getRecords(), "鏈堝彴淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platform:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java
deleted file mode 100644
index 8b2ef50..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformEvent;
-import com.doumee.service.business.PlatformEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/08/28 17:24
- */
-@Api(tags = "鏈堝彴杞﹁締杩涘嚭浜嬩欢鎺ㄩ�佽褰曡〃")
-@RestController
-@RequestMapping("/business/platformEvent")
-public class PlatformEventController extends BaseController {
-
-    @Autowired
-    private PlatformEventService platformEventService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformevent:create")
-    public ApiResponse create(@RequestBody PlatformEvent platformEvent) {
-        return ApiResponse.success(platformEventService.create(platformEvent));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformevent:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformEventService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformevent:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        platformEventService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformevent:update")
-    public ApiResponse updateById(@RequestBody PlatformEvent platformEvent) {
-        platformEventService.updateById(platformEvent);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformevent:query")
-    public ApiResponse<PageData<PlatformEvent>> findPage (@RequestBody PageWrap<PlatformEvent> pageWrap) {
-        return ApiResponse.success(platformEventService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformevent:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformEvent> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformEvent.class).export(platformEventService.findPage(pageWrap).getRecords(), "鏈堝彴杞﹁締杩涘嚭浜嬩欢鎺ㄩ�佽褰曡〃", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformevent:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformEventService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java
deleted file mode 100644
index b7cb56a..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformGroup;
-import com.doumee.service.business.PlatformGroupService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鏈堝彴_鍒嗙粍淇℃伅琛�")
-@RestController
-@RequestMapping("/business/platformGroup")
-public class PlatformGroupController extends BaseController {
-
-    @Autowired
-    private PlatformGroupService platformGroupService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformgroup:create")
-    public ApiResponse create(@RequestBody PlatformGroup platformGroup) {
-        return ApiResponse.success(platformGroupService.create(platformGroup));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformgroup:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformGroupService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformgroup:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        platformGroupService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformgroup:update")
-    public ApiResponse updateById(@RequestBody PlatformGroup platformGroup) {
-        platformGroupService.updateById(platformGroup);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformgroup:query")
-    public ApiResponse<PageData<PlatformGroup>> findPage (@RequestBody PageWrap<PlatformGroup> pageWrap) {
-        return ApiResponse.success(platformGroupService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformgroup:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformGroup> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformGroup.class).export(platformGroupService.findPage(pageWrap).getRecords(), "鏈堝彴_鍒嗙粍淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformgroup:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformGroupService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java
deleted file mode 100644
index 01a31bb..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformInterfaceLog;
-import com.doumee.service.business.PlatformInterfaceLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍")
-@RestController
-@RequestMapping("/business/platformInterfaceLog")
-public class PlatformInterfaceLogController extends BaseController {
-
-    @Autowired
-    private PlatformInterfaceLogService platformInterfaceLogService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platforminterfacelog:create")
-    public ApiResponse create(@RequestBody PlatformInterfaceLog platformInterfaceLog) {
-        return ApiResponse.success(platformInterfaceLogService.create(platformInterfaceLog));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platforminterfacelog:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformInterfaceLogService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platforminterfacelog:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        platformInterfaceLogService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platforminterfacelog:update")
-    public ApiResponse updateById(@RequestBody PlatformInterfaceLog platformInterfaceLog) {
-        platformInterfaceLogService.updateById(platformInterfaceLog);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platforminterfacelog:query")
-    public ApiResponse<PageData<PlatformInterfaceLog>> findPage (@RequestBody PageWrap<PlatformInterfaceLog> pageWrap) {
-        return ApiResponse.success(platformInterfaceLogService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platforminterfacelog:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformInterfaceLog> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformInterfaceLog.class).export(platformInterfaceLogService.findPage(pageWrap).getRecords(), "浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platforminterfacelog:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformInterfaceLogService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java
deleted file mode 100644
index 25e9229..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformJob;
-import com.doumee.service.business.PlatformJobService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鏈堝彴璋冨害浣滀笟淇℃伅琛�")
-@RestController
-@RequestMapping("/business/platformJob")
-public class PlatformJobController extends BaseController {
-
-    @Autowired
-    private PlatformJobService platformJobService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformjob:create")
-    public ApiResponse create(@RequestBody PlatformJob platformJob) {
-        return ApiResponse.success(platformJobService.create(platformJob));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformjob:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformJobService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformjob:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        platformJobService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformjob:update")
-    public ApiResponse updateById(@RequestBody PlatformJob platformJob) {
-        platformJobService.updateById(platformJob);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformjob:query")
-    public ApiResponse<PageData<PlatformJob>> findPage (@RequestBody PageWrap<PlatformJob> pageWrap) {
-        return ApiResponse.success(platformJobService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformjob:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformJob> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformJob.class).export(platformJobService.findPage(pageWrap).getRecords(), "鏈堝彴璋冨害浣滀笟淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformjob:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformJobService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java
deleted file mode 100644
index a11a2e1..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformLog;
-import com.doumee.service.business.PlatformLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�")
-@RestController
-@RequestMapping("/business/platformLog")
-public class PlatformLogController extends BaseController {
-
-    @Autowired
-    private PlatformLogService platformLogService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformlog:create")
-    public ApiResponse create(@RequestBody PlatformLog platformLog) {
-        return ApiResponse.success(platformLogService.create(platformLog));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformlog:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformLogService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformlog:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        platformLogService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformlog:update")
-    public ApiResponse updateById(@RequestBody PlatformLog platformLog) {
-        platformLogService.updateById(platformLog);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformlog:query")
-    public ApiResponse<PageData<PlatformLog>> findPage (@RequestBody PageWrap<PlatformLog> pageWrap) {
-        return ApiResponse.success(platformLogService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformlog:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformLog> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformLog.class).export(platformLogService.findPage(pageWrap).getRecords(), "鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformlog:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformLogService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java
deleted file mode 100644
index c528307..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformQueue;
-import com.doumee.service.business.PlatformQueueService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鏈堝彴_鍙彿鎺掗槦淇℃伅琛�")
-@RestController
-@RequestMapping("/business/platformQueue")
-public class PlatformQueueController extends BaseController {
-
-    @Autowired
-    private PlatformQueueService platformQueueService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformqueue:create")
-    public ApiResponse create(@RequestBody PlatformQueue platformQueue) {
-        return ApiResponse.success(platformQueueService.create(platformQueue));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformqueue:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformQueueService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformqueue:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        platformQueueService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformqueue:update")
-    public ApiResponse updateById(@RequestBody PlatformQueue platformQueue) {
-        platformQueueService.updateById(platformQueue);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformqueue:query")
-    public ApiResponse<PageData<PlatformQueue>> findPage (@RequestBody PageWrap<PlatformQueue> pageWrap) {
-        return ApiResponse.success(platformQueueService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformqueue:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformQueue> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformQueue.class).export(platformQueueService.findPage(pageWrap).getRecords(), "鏈堝彴_鍙彿鎺掗槦淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformqueue:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformQueueService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java
deleted file mode 100644
index 3c71e48..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformReason;
-import com.doumee.service.business.PlatformReasonService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/08/13 14:08
- */
-@Api(tags = "鏈堝彴_鍏ュ洯鍘熷洜淇℃伅琛�")
-@RestController
-@RequestMapping("/business/platformReason")
-public class PlatformReasonController extends BaseController {
-
-    @Autowired
-    private PlatformReasonService platformReasonService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformreason:create")
-    public ApiResponse create(@RequestBody PlatformReason platformReason) {
-        return ApiResponse.success(platformReasonService.create(platformReason));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformreason:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformReasonService.deleteById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformreason:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        platformReasonService.deleteByIdInBatch(idList,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformreason:update")
-    public ApiResponse updateById(@RequestBody PlatformReason platformReason) {
-        platformReasonService.updateById(platformReason);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformreason:query")
-    public ApiResponse<PageData<PlatformReason>> findPage (@RequestBody PageWrap<PlatformReason> pageWrap) {
-        return ApiResponse.success(platformReasonService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformreason:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformReason> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformReason.class).export(platformReasonService.findPage(pageWrap).getRecords(), "鏈堝彴_鍏ュ洯鍘熷洜淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformreason:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformReasonService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java
deleted file mode 100644
index 3637cbf..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformShowParam;
-import com.doumee.service.business.PlatformShowParamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�")
-@RestController
-@RequestMapping("/business/platformShowParam")
-public class PlatformShowParamController extends BaseController {
-
-    @Autowired
-    private PlatformShowParamService platformShowParamService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformshowparam:create")
-    public ApiResponse create(@RequestBody PlatformShowParam platformShowParam) {
-        return ApiResponse.success(platformShowParamService.create(platformShowParam));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformshowparam:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformShowParamService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformshowparam:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        platformShowParamService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformshowparam:update")
-    public ApiResponse updateById(@RequestBody PlatformShowParam platformShowParam) {
-        platformShowParamService.updateById(platformShowParam);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformshowparam:query")
-    public ApiResponse<PageData<PlatformShowParam>> findPage (@RequestBody PageWrap<PlatformShowParam> pageWrap) {
-        return ApiResponse.success(platformShowParamService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformshowparam:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformShowParam> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(PlatformShowParam.class).export(platformShowParamService.findPage(pageWrap).getRecords(), "鏈堝彴_鏄剧ず閰嶇疆淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformshowparam:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformShowParamService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java
deleted file mode 100644
index 4f5749f..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.PlatformWaterGas;
-import com.doumee.service.business.PlatformWaterGasService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/08/26 16:22
- */
-@Api(tags = "鏈堝彴_鐢ㄦ按鐢ㄦ皵淇℃伅璁板綍琛�")
-@RestController
-@RequestMapping("/business/platformWaterGas")
-public class PlatformWaterGasController extends BaseController {
-
-    @Autowired
-    private PlatformWaterGasService platformWaterGasService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:platformwatergas:create")
-    public ApiResponse create(@RequestBody PlatformWaterGas platformWaterGas) {
-        return ApiResponse.success(platformWaterGasService.create(platformWaterGas));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:platformwatergas:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        platformWaterGasService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:platformwatergas:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        platformWaterGasService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:platformwatergas:update")
-    public ApiResponse updateById(@RequestBody PlatformWaterGas platformWaterGas) {
-        platformWaterGasService.updateById(platformWaterGas);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:platformwatergas:query")
-    public ApiResponse<PageData<PlatformWaterGas>> findPage (@RequestBody PageWrap<PlatformWaterGas> pageWrap) {
-        return ApiResponse.success(platformWaterGasService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:platformwatergas:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<PlatformWaterGas> pageWrap, HttpServletResponse response) {
-        List<PlatformWaterGas>  waterGasPageData = platformWaterGasService.findPage(pageWrap).getRecords();
-        ExcelExporter.build(PlatformWaterGas.class).export(waterGasPageData, "鏈堝彴_鐢ㄦ按鐢ㄦ皵淇℃伅璁板綍琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:platformwatergas:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(platformWaterGasService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
deleted file mode 100644
index 9f7a68e..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.ProblemLog;
-import com.doumee.dao.business.vo.ProblemLogVo;
-import com.doumee.service.business.ProblemLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "璁垮绛旈璁板綍琛�")
-@RestController
-@RequestMapping("/business/problemLog")
-public class ProblemLogController extends BaseController {
-
-    @Autowired
-    private ProblemLogService problemLogService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-//    @RequiresPermissions("business:problemlog:create")
-    public ApiResponse create(@RequestBody ProblemLog problemLog) {
-        return ApiResponse.success(problemLogService.create(problemLog));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:problemlog:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        problemLogService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:problemlog:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        problemLogService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:problemlog:update")
-    public ApiResponse updateById(@RequestBody ProblemLog problemLog) {
-        problemLogService.updateById(problemLog);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-//    @RequiresPermissions("business:problemlog:query")
-    public ApiResponse<PageData<ProblemLog>> findPage (@RequestBody PageWrap<ProblemLog> pageWrap) {
-        return ApiResponse.success(problemLogService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-//    @RequiresPermissions("business:problemlog:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<ProblemLog> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(ProblemLogVo.class).export(problemLogService.findPageExcel(pageWrap), "璁垮绛旈璁板綍琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:problemlog:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(problemLogService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
deleted file mode 100644
index d0ad255..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.model.Problems;
-import com.doumee.service.business.ProblemsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "璇曢淇℃伅琛�")
-@RestController
-@RequestMapping("/business/problems")
-public class ProblemsController extends BaseController {
-
-    @Autowired
-    private ProblemsService problemsService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:problems:create")
-    public ApiResponse create(@RequestBody Problems problems) {
-        return ApiResponse.success(problemsService.create(problems));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:problems:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        problemsService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:problems:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        problemsService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:problems:updateById")
-    public ApiResponse updateById(@RequestBody Problems problems) {
-        problemsService.updateById(problems);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:problems:query")
-    public ApiResponse<PageData<Problems>> findPage (@RequestBody PageWrap<Problems> pageWrap) {
-        return ApiResponse.success(problemsService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    //@RequiresPermissions("business:problems:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Problems> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Problems.class).export(problemsService.findPage(pageWrap).getRecords(), "璇曢淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    //@RequiresPermissions("business:problems:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(problemsService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
deleted file mode 100644
index e37cb74..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Retention;
-import com.doumee.service.business.RetentionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�")
-@RestController
-@RequestMapping("/business/retention")
-public class RetentionController extends BaseController {
-
-    @Autowired
-    private RetentionService retentionService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:retention:create")
-    public ApiResponse create(@RequestBody Retention retention) {
-        return ApiResponse.success(retentionService.create(retention));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:retention:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        retentionService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:retention:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        retentionService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:retention:update")
-    public ApiResponse updateById(@RequestBody Retention retention) {
-        retentionService.updateById(retention);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    //@RequiresPermissions("business:retention:query")
-    public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap) {
-        return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    //@RequiresPermissions("business:retention:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Retention> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Retention.class).export(retentionService.findTrainTimePage(pageWrap).getRecords(), "瀹炴椂鍦ㄥ満浜哄憳", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:retention:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(retentionService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java
deleted file mode 100644
index 355474c..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.admin.response.StagingDataVO;
-import com.doumee.dao.business.model.Visits;
-import com.doumee.service.business.MemberService;
-import com.doumee.service.business.VisitsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.doumee.api.BaseController;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2024/2/26 11:00
- */
-@Api(tags = "宸ヤ綔鍙版暟鎹�")
-@RestController
-@RequestMapping("/business/staging")
-public class StagingController  extends BaseController {
-
-
-    @Autowired
-    private MemberService memberService;
-
-    @Autowired
-    private VisitsService visitsService;
-
-
-
-    @ApiOperation("澶撮儴鏁版嵁")
-    @GetMapping("/head")
-    public ApiResponse<StagingDataVO> head() {
-        return ApiResponse.success("鏌ヨ鎴愬姛",memberService.stagingHead(new StagingDataVO()));
-    }
-
-
-    @ApiOperation("涓讳綋鏁版嵁")
-    @GetMapping("/body")
-    public ApiResponse<StagingDataVO> body() {
-        return ApiResponse.success("鏌ヨ鎴愬姛",memberService.stagingBody(new StagingDataVO()));
-    }
-
-
-    @ApiOperation("瓒呮椂棰勮浜哄憳")
-    @PostMapping("/timeoutPage")
-    public ApiResponse<PageData<Visits>> timeoutPage (@RequestBody PageWrap<Visits> pageWrap) {
-        pageWrap.getModel().setLevelStatus(Constants.ZERO);
-        return ApiResponse.success(visitsService.retentionPage(pageWrap));
-    }
-
-    @ApiOperation("瓒呮椂棰勮浜哄憳绂诲満")
-    @GetMapping("/level")
-//    @RequiresPermissions("business:visits:level")
-    public ApiResponse level (@RequestParam Integer visitId) {
-        visitsService.visitLevel(visitId);
-        return ApiResponse.success("鎿嶄綔鎴愬姛");
-    }
-
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java
deleted file mode 100644
index 5717c57..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Tasks;
-import com.doumee.service.business.TasksService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
- */
-@Api(tags = "瀹夐槻涓嬪彂骞冲彴浠诲姟淇℃伅琛�")
-@RestController
-@RequestMapping("/business/tasks")
-public class TasksController extends BaseController {
-
-    @Autowired
-    private TasksService tasksService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:tasks:create")
-    public ApiResponse create(@RequestBody Tasks tasks) {
-        return ApiResponse.success(tasksService.create(tasks));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:tasks:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        tasksService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:tasks:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        tasksService.deleteByIdInBatch(this.getIdList(ids));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:tasks:update")
-    public ApiResponse updateById(@RequestBody Tasks tasks) {
-        tasksService.updateById(tasks);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:tasks:query")
-    public ApiResponse<PageData<Tasks>> findPage (@RequestBody PageWrap<Tasks> pageWrap) {
-        return ApiResponse.success(tasksService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:tasks:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Tasks> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Tasks.class).export(tasksService.findPage(pageWrap).getRecords(), "瀹夐槻涓嬪彂骞冲彴浠诲姟淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:tasks:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(tasksService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
deleted file mode 100644
index fee2405..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.TrainTime;
-import com.doumee.service.business.TrainTimeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "浜哄憳鍩硅鏈夋晥鏈熻褰�")
-@RestController
-@RequestMapping("/business/trainTime")
-public class TrainTimeController extends BaseController {
-
-    @Autowired
-    private TrainTimeService trainTimeService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:traintime:create")
-    public ApiResponse create(@RequestBody TrainTime trainTime) {
-        return ApiResponse.success(trainTimeService.create(trainTime));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:traintime:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        trainTimeService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:traintime:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        trainTimeService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:traintime:update")
-    public ApiResponse updateById(@RequestBody TrainTime trainTime) {
-        trainTimeService.updateById(trainTime);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:traintime:query")
-    public ApiResponse<PageData<TrainTime>> findPage (@RequestBody PageWrap<TrainTime> pageWrap) {
-        return ApiResponse.success(trainTimeService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:traintime:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<TrainTime> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(TrainTime.class).export(trainTimeService.findPage(pageWrap).getRecords(), "浜哄憳鍩硅鏈夋晥鏈熻褰�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:traintime:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(trainTimeService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java
deleted file mode 100644
index a5697ef..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.UserAction;
-import com.doumee.service.business.UserActionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/12/14 13:57
- */
-@Api(tags = "浜哄憳鎿嶄綔璁板綍鏃ュ織")
-@RestController
-@RequestMapping("/business/userAction")
-public class UserActionController extends BaseController {
-
-    @Autowired
-    private UserActionService userActionService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:useraction:create")
-    public ApiResponse create(@RequestBody UserAction userAction) {
-        return ApiResponse.success(userActionService.create(userAction));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:useraction:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        userActionService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:useraction:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        userActionService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:useraction:update")
-    public ApiResponse updateById(@RequestBody UserAction userAction) {
-        userActionService.updateById(userAction);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:useraction:query")
-    public ApiResponse<PageData<UserAction>> findPage (@RequestBody PageWrap<UserAction> pageWrap) {
-        return ApiResponse.success(userActionService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:useraction:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<UserAction> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(UserAction.class).export(userActionService.findPage(pageWrap).getRecords(), "浜哄憳鎿嶄綔璁板綍鏃ュ織", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:useraction:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(userActionService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
deleted file mode 100644
index 87df0db..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.VisitEvent;
-import com.doumee.service.business.VisitEventService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "璁垮浜嬩欢鎺ㄩ�佽褰曡〃")
-@RestController
-@RequestMapping("/business/visitEvent")
-public class VisitEventController extends BaseController {
-
-    @Autowired
-    private VisitEventService visitEventService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:visitevent:create")
-    public ApiResponse create(@RequestBody VisitEvent visitEvent) {
-        return ApiResponse.success(visitEventService.create(visitEvent));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:visitevent:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        visitEventService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:visitevent:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        visitEventService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:visitevent:update")
-    public ApiResponse updateById(@RequestBody VisitEvent visitEvent) {
-        visitEventService.updateById(visitEvent);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:visitevent:query")
-    public ApiResponse<PageData<VisitEvent>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
-        return ApiResponse.success(visitEventService.findVisitPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:visitevent:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<VisitEvent> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(VisitEvent.class).export(visitEventService.findPageExcel(pageWrap), "璁垮鍑哄叆浜嬩欢_" + System.currentTimeMillis(), response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:visitevent:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(visitEventService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java
deleted file mode 100644
index 6b3cfa7..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.VisitPark;
-import com.doumee.service.business.VisitParkService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 15:44
- */
-@Api(tags = "璁垮鎶ュ鍋滆溅搴撳叧鑱旇〃")
-@RestController
-@RequestMapping("/business/visitPark")
-public class VisitParkController extends BaseController {
-
-    @Autowired
-    private VisitParkService visitParkService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:visitpark:create")
-    public ApiResponse create(@RequestBody VisitPark visitPark) {
-        return ApiResponse.success(visitParkService.create(visitPark));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:visitpark:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        visitParkService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:visitpark:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        visitParkService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:visitpark:update")
-    public ApiResponse updateById(@RequestBody VisitPark visitPark) {
-        visitParkService.updateById(visitPark);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:visitpark:query")
-    public ApiResponse<PageData<VisitPark>> findPage (@RequestBody PageWrap<VisitPark> pageWrap) {
-        return ApiResponse.success(visitParkService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:visitpark:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<VisitPark> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(VisitPark.class).export(visitParkService.findPage(pageWrap).getRecords(), "璁垮鎶ュ鍋滆溅搴撳叧鑱旇〃", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:visitpark:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(visitParkService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java
deleted file mode 100644
index 91adfc2..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.VisitProblemLog;
-import com.doumee.service.business.VisitProblemLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 15:44
- */
-@Api(tags = "璁垮绛旈璁板綍琛�")
-@RestController
-@RequestMapping("/business/visitProblemLog")
-public class VisitProblemLogController extends BaseController {
-
-    @Autowired
-    private VisitProblemLogService visitProblemLogService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:visitproblemlog:create")
-    public ApiResponse create(@RequestBody VisitProblemLog visitProblemLog) {
-        return ApiResponse.success(visitProblemLogService.create(visitProblemLog));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:visitproblemlog:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        visitProblemLogService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:visitproblemlog:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        visitProblemLogService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:visitproblemlog:update")
-    public ApiResponse updateById(@RequestBody VisitProblemLog visitProblemLog) {
-        visitProblemLogService.updateById(visitProblemLog);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:visitproblemlog:query")
-    public ApiResponse<PageData<VisitProblemLog>> findPage (@RequestBody PageWrap<VisitProblemLog> pageWrap) {
-        return ApiResponse.success(visitProblemLogService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:visitproblemlog:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<VisitProblemLog> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(VisitProblemLog.class).export(visitProblemLogService.findPage(pageWrap).getRecords(), "璁垮绛旈璁板綍琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:visitproblemlog:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(visitProblemLogService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java
deleted file mode 100644
index 56c65a9..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.VisitProblems;
-import com.doumee.service.business.VisitProblemsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 15:44
- */
-@Api(tags = "璇曢淇℃伅琛�")
-@RestController
-@RequestMapping("/business/visitProblems")
-public class VisitProblemsController extends BaseController {
-
-    @Autowired
-    private VisitProblemsService visitProblemsService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:visitproblems:create")
-    public ApiResponse create(@RequestBody VisitProblems visitProblems) {
-        return ApiResponse.success(visitProblemsService.create(visitProblems));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:visitproblems:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        visitProblemsService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:visitproblems:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        visitProblemsService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:visitproblems:update")
-    public ApiResponse updateById(@RequestBody VisitProblems visitProblems) {
-        visitProblemsService.updateById(visitProblems);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:visitproblems:query")
-    public ApiResponse<PageData<VisitProblems>> findPage (@RequestBody PageWrap<VisitProblems> pageWrap) {
-        return ApiResponse.success(visitProblemsService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:visitproblems:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<VisitProblems> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(VisitProblems.class).export(visitProblemsService.findPage(pageWrap).getRecords(), "璇曢淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:visitproblems:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(visitProblemsService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java
deleted file mode 100644
index cbb867e..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.VisitReason;
-import com.doumee.service.business.VisitReasonService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 15:44
- */
-@Api(tags = "璁垮浜嬬敱淇℃伅琛�")
-@RestController
-@RequestMapping("/business/visitReason")
-public class VisitReasonController extends BaseController {
-
-    @Autowired
-    private VisitReasonService visitReasonService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:visitreason:create")
-    public ApiResponse create(@RequestBody VisitReason visitReason) {
-        return ApiResponse.success(visitReasonService.create(visitReason));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:visitreason:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        visitReasonService.deleteById(id,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:visitreason:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        visitReasonService.deleteByIdInBatch(idList,this.getLoginUser(null));
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:visitreason:update")
-    public ApiResponse updateById(@RequestBody VisitReason visitReason) {
-        visitReasonService.updateById(visitReason);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:visitreason:query")
-    public ApiResponse<PageData<VisitReason>> findPage (@RequestBody PageWrap<VisitReason> pageWrap) {
-        return ApiResponse.success(visitReasonService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:visitreason:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<VisitReason> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(VisitReason.class).export(visitReasonService.findPage(pageWrap).getRecords(), "璁垮浜嬬敱淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:visitreason:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(visitReasonService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java
deleted file mode 100644
index 0c8bcca..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.Visitor;
-import com.doumee.service.business.VisitorService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.doumee.api.BaseController;
-
-/**
- * @author 姹熻箘韫�
- * @since 2024/04/28 15:44
- */
-@Api(tags = "璁垮淇℃伅琛�")
-@RestController
-@RequestMapping("/business/visitor")
-public class VisitorController extends BaseController {
-
-    @Autowired
-    private VisitorService visitorService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:visitor:create")
-    public ApiResponse create(@RequestBody Visitor visitor) {
-        return ApiResponse.success(visitorService.create(visitor));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:visitor:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        visitorService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:visitor:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        visitorService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:visitor:update")
-    public ApiResponse updateById(@RequestBody Visitor visitor) {
-        visitorService.updateById(visitor);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:visitor:query")
-    public ApiResponse<PageData<Visitor>> findPage (@RequestBody PageWrap<Visitor> pageWrap) {
-        return ApiResponse.success(visitorService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:visitor:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Visitor> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Visitor.class).export(visitorService.findPage(pageWrap).getRecords(), "璁垮淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:visitor:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(visitorService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
deleted file mode 100644
index 532e499..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.Visits;
-import com.doumee.service.business.VisitsService;
-import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.doumee.api.BaseController;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "璁垮鐢宠淇℃伅琛�")
-@RestController
-@RequestMapping("/business/visits")
-public class VisitsController extends BaseController {
-
-    @Autowired
-    private VisitsService visitsService;
-    @Autowired
-    private HkSyncVisitFromHKServiceImpl hkSyncVisitFromHKService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:visits:create")
-    public ApiResponse create(@RequestBody Visits visits) {
-        return ApiResponse.success(visitsService.create(visits));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:visits:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        visitsService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:visits:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        visitsService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:visits:update")
-    public ApiResponse updateById(@RequestBody Visits visits) {
-        visitsService.updateById(visits);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("鍙栨秷棰勭害")
-    @GetMapping("/visitCancel")
-    @RequiresPermissions("business:visits:cancel")
-    public ApiResponse visitCancel(@RequestParam Integer visitId) {
-        visitsService.visitCancel(visitId);
-        return ApiResponse.success(null);
-    }
-    @ApiOperation("閲嶆柊涓嬪彂澶辫触鐨勯绾�")
-    @GetMapping("/visitResend")
-    @RequiresPermissions("business:visits:update")
-    public ApiResponse   visitResend(@RequestParam Integer visitId) {
-        visitsService.visitResend(visitId);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁鏃ユ湡(starttime)鍚屾璁垮鏁版嵁")
-    @PostMapping("/syncByDate")
-    @RequiresPermissions("business:visits:sync")
-    public ApiResponse syncByDate(@RequestBody Visits visits) {
-        hkSyncVisitFromHKService.syncVistAppointData(visits.getStarttime());
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:visits:query")
-    public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap) {
-        return ApiResponse.success(visitsService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:visits:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Visits> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Visits.class).export(visitsService.findPage(pageWrap).getRecords(), "璁垮鐢宠淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:visits:query")
-    public ApiResponse<Visits> findById(@PathVariable Integer id) {
-        return ApiResponse.success(visitsService.findById(id,null));
-    }
-
-    @ApiOperation("婊炵暀浜哄憳")
-    @PostMapping("/retentionPage")
-    @RequiresPermissions("business:visits:query")
-    public ApiResponse<PageData<Visits>> retentionPage (@RequestBody PageWrap<Visits> pageWrap) {
-        pageWrap.getModel().setLevelStatus(Constants.ZERO);
-        return ApiResponse.success(visitsService.retentionPage(pageWrap));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java
deleted file mode 100644
index b3df154..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.model.WmsInterfaceLog;
-import com.doumee.service.business.WmsInterfaceLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "WMS骞冲彴鎺ュ彛浜や簰璁板綍")
-@RestController
-@RequestMapping("/business/wmsInterfaceLog")
-public class WmsInterfaceLogController extends BaseController {
-
-    @Autowired
-    private WmsInterfaceLogService interfaceLogService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:interfacelog:create")
-    public ApiResponse create(@RequestBody WmsInterfaceLog interfaceLog) {
-        return ApiResponse.success(interfaceLogService.create(interfaceLog));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:interfacelog:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        interfaceLogService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:interfacelog:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        interfaceLogService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:interfacelog:update")
-    public ApiResponse updateById(@RequestBody WmsInterfaceLog interfaceLog) {
-        interfaceLogService.updateById(interfaceLog);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:interfacelog:query")
-    public ApiResponse<PageData<WmsInterfaceLog>> findPage (@RequestBody PageWrap<WmsInterfaceLog> pageWrap) {
-        return ApiResponse.success(interfaceLogService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:interfacelog:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<WmsInterfaceLog> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(WmsInterfaceLog.class).export(interfaceLogService.findPage(pageWrap).getRecords(), "涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:interfacelog:query")
-    public ApiResponse<WmsInterfaceLog> findById(@PathVariable Integer id) {
-        return ApiResponse.success(interfaceLogService.findById(id));
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java
deleted file mode 100644
index 05e12cf..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.doumee.api.business;
-
-import com.alibaba.fastjson.JSONObject;
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
-import com.doumee.core.wms.model.request.WmsBaseRequest;
-import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
-import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.service.business.third.WmsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/30 15:33
- */
-@Api(tags = "WMS骞冲彴鏁版嵁鎺ㄩ�佹帴鍙�")
-@RestController
-@RequestMapping("/wms")
-@Slf4j
-public class WmsPushController extends BaseController {
-
-    @Autowired
-    private WmsService wmsService;
-
-    @PreventRepeat
-    @ApiOperation("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟")
-    @PostMapping("/push/inboundNotice")
-    public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {
-
-        int success = Constants.ZERO;
-        WmsBaseResponse result =null;
-        try {
-             result = wmsService.inboundNotice(param);
-        }catch (BusinessException e){
-            log.error("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            success = Constants.ONE;
-        }catch (Exception e){
-            log.error("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            e.printStackTrace();
-            success = Constants.ONE;
-        }finally {
-            wmsService.saveInterfaceLog("/wms/push/inboundNotice", "鎺ㄩ�佸叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
-                    success, JSONObject.toJSONString(result),Constants.ONE);
-        }
-        return result;
-    }
-
-    @PreventRepeat
-    @ApiOperation("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟")
-    @PostMapping("/push/outboundNotice")
-    public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
-        int success = Constants.ZERO;
-        WmsBaseResponse result =null;
-        try {
-              result = wmsService.outboundNotice(param);
-        }catch (BusinessException e){
-            log.error("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            success = Constants.ONE;
-        }catch (Exception e){
-            log.error("銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            e.printStackTrace();
-            success = Constants.ONE;
-        }finally {
-            wmsService.saveInterfaceLog("/wms/push/outboundNotice", "銆怶MS銆戞帹閫佸嚭搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),success
-                    , JSONObject.toJSONString(result),Constants.ONE);
-        }
-
-        return result;
-    }
-    @PreventRepeat
-    @ApiOperation("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟")
-    @PostMapping("/push/cancelInbound")
-    public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
-        int success = Constants.ZERO;
-        WmsBaseResponse result =null;
-        try {
-            result = wmsService.cancelInbound(param);
-        }catch (BusinessException e){
-            log.error("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            success = Constants.ONE;
-        }catch (Exception e){
-            log.error("銆怶MS銆戞帹閫佸彇娑堝叆搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            e.printStackTrace();
-            success = Constants.ONE;
-        }finally {
-            wmsService.saveInterfaceLog("/wms/push/cancelInbound", "鎺ㄩ�佸彇娑堝叆搴撳崟閫氱煡浠诲姟",JSONObject.toJSONString(param),
-                    success, JSONObject.toJSONString(result),Constants.ONE);
-        }
-        return result;
-    }
-    @PreventRepeat
-    @ApiOperation("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟")
-    @PostMapping("/push/cancelOutbound")
-    public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
-        int success = Constants.ZERO;
-        WmsBaseResponse result =null;
-        try {
-            result = wmsService.cancelOutbound(param);
-        }catch (BusinessException e){
-            log.error("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            success = Constants.ONE;
-        }catch (Exception e){
-            log.error("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            e.printStackTrace();
-            success = Constants.ONE;
-        }finally {
-            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "鎺ㄩ�佸彇娑堝嚭搴撳崟閫氱煡浠诲姟",
-                    JSONObject.toJSONString(param),  success, JSONObject.toJSONString(result),Constants.ONE);
-        }
-        return result;
-    }
-    @PreventRepeat
-    @ApiOperation("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟")
-    @PostMapping("/push/doneTask")
-    public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
-        int success = Constants.ZERO;
-        WmsBaseResponse result =null;
-        try {
-            result = wmsService.doneTask(param);
-        }catch (BusinessException e){
-            log.error("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            success = Constants.ONE;
-        }catch (Exception e){
-            log.error("銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟===澶辫触锛�"+e.getMessage());
-            e.printStackTrace();
-            success = Constants.ONE;
-        }finally {
-            wmsService.saveInterfaceLog("/wms/push/doneTask", "鎺ㄩ�佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟",JSONObject.toJSONString(param),
-                    success, JSONObject.toJSONString(result),Constants.ONE);
-        }
-        return result;
-    }
-}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
index e76ef3f..42c3b1f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -1,6 +1,5 @@
 package com.doumee.cloud.admin;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.api.BaseController;
 import com.doumee.config.DataSyncConfig;
 import com.doumee.config.annotation.CloudRequiredPermission;
@@ -37,7 +36,7 @@
     @Autowired
     private CompanyService companyService;
 
-    @Autowired
+//    @Autowired
     private ERPSyncService erpSyncService;
     @Autowired
     private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@@ -123,6 +122,12 @@
     public ApiResponse<List<Company>> list (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(companyService.findList(company));
     }
+    @ApiOperation("鏂板缓鍚堝悓鎵�灞炲叕鍙哥瓫閫�")
+    @PostMapping("/listForConstract")
+    @CloudRequiredPermission("business:company:query")
+    public ApiResponse<List<Company>> listForConstract (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        return ApiResponse.success(companyService.listForConstract(company));
+    }
 
 
 
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java
index fbef94b..af2ece6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java
@@ -21,7 +21,7 @@
 @RestController
 @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/erpsync")
 public class ERPSyncCloudController extends BaseController {
-    @Autowired
+//    @Autowired
     private ERPSyncService erpSyncService;
 
     @PreventRepeat
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 3b928b1..e5f73cb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -44,7 +44,7 @@
 @RestController
 @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/member")
 public class MemberCloudController extends BaseController {
-    @Autowired
+//    @Autowired
     private ERPSyncService erpSyncService;
     @Autowired
     private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
index 2e1e381..1d28bbf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -105,7 +105,6 @@
     @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=鍛ㄦ湡璐圭敤锛�1=涓�娆℃�ц垂鐢�")
     @TableField(exist = false)
     private Integer feeType;
-
     @ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1")
     private Integer companyId;
 
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java
index a7c167c..bc6ea4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java
@@ -122,4 +122,15 @@
     @ApiModelProperty(value = "瓒呮湡浠诲姟鏁�")
     @TableField(exist = false)
     private Integer timeOutTaskNum;
+
+    @ApiModelProperty(value = "寮�濮嬫棩鏈燂紙鎼滅储鎴鏃ユ湡锛�")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDateSec;
+
+    @ApiModelProperty(value = "缁撴潫鏃ユ湡锛堟悳绱㈡埅姝㈡棩鏈燂級")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDateSec;
+
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
index 1cf5188..4167a7c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
@@ -35,7 +35,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,7 +43,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
index 52b009b..8b9b37c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java
@@ -33,6 +33,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelColumn(name="涓婃姤鏃堕棿",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -83,7 +84,6 @@
 
     @ApiModelProperty(value = "鎻愭姤鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelColumn(name="涓婃姤鏃堕棿",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date submitDate;
 
     @ApiModelProperty(value = "宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�", example = "1")
@@ -97,7 +97,7 @@
     private String code;
 
     @ApiModelProperty(value = "澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�", example = "1")
-    @ExcelColumn(name="宸ュ崟鐘舵��",index = 7,width = 10,valueMapping = "0=寰呭鐞�;1=宸插垎娲�;1=宸插鐞�;")
+    @ExcelColumn(name="宸ュ崟鐘舵��",index = 7,width = 10,valueMapping = "0=寰呭鐞�;1=宸插垎娲�;2=宸插鐞�;")
     private Integer dealStatus;
 
     @ApiModelProperty(value = "鍒嗘淳浜虹紪鐮�(鍏宠仈system_user)", example = "1")
@@ -136,9 +136,12 @@
     @TableField(exist = false)
     private String buildingName;
     @ApiModelProperty(value = "鎴挎簮鍚嶇О")
-    @ExcelColumn(name="鎴挎簮",index = 2,width = 10)
     @TableField(exist = false)
     private String roomName;
+    @ApiModelProperty(value = "鎶ヤ慨鍖哄煙")
+    @ExcelColumn(name="鎶ヤ慨鍖哄煙",index = 2,width = 10)
+    @TableField(exist = false)
+    private String areaNameInfo;
     @ApiModelProperty(value = "妤煎眰鍚嶇О")
     @TableField(exist = false)
     private String floorName;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index d890255..09e5135 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -129,4 +129,6 @@
 
     Integer createFinanceCompany(Company company);
     Integer updateFinanceCompany(Company company);
+
+    List<Company>  listForConstract(Company company);
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
index 2416bac..28835e0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
@@ -102,6 +102,7 @@
         wrapper.lambda().eq(Areas::getId,areas.getId());
         Areas update = new Areas();
         update.setName(areas.getName());
+        update.setCode(areas.getCode());
         update.setSortnum(areas.getSortnum());
         areasMapper.update(update,wrapper);
         //鍒锋柊缂撳瓨鏁版嵁
@@ -326,7 +327,7 @@
        CITY_LIST=null;
        AREA_LIST = null;
        ALL_AREA_TREE = null;
-       ALL_AREA_LIST =  areasMapper.selectList(new QueryWrapper<>(a).lambda().orderByDesc(Areas::getSortnum));
+       ALL_AREA_LIST =  areasMapper.selectList(new QueryWrapper<>(a).lambda().orderByAsc(Areas::getCode));
        if(ALL_AREA_LIST!=null){
            for(Areas model : ALL_AREA_LIST){
                 if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 2108dd2..f306f85 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -432,6 +432,18 @@
     }
 
     @Override
+    public  List<Company>  listForConstract(Company company) {
+        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(Company.class);
+        queryWrapper.like(company.getName() != null,Company::getName, company.getName());
+        queryWrapper.eq(Company::getStatus, Constants.ZERO);
+        queryWrapper.eq(Company::getType, Constants.TWO);
+        queryWrapper.eq(Company::getIsdeleted, Constants.ZERO);
+        queryWrapper.exists("select b.id from yw_account b where b.isdeleted=0 and b.company_id=t.id and b.status=0");
+        queryWrapper.orderByDesc(Company::getCreateDate);
+        return companyMapper.selectList(queryWrapper);
+    }
+    @Override
     public List<Company> findList(Company company) {
         MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
         if (company.getId() != null) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index fb15ce1..12976d2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1016,6 +1016,8 @@
             throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
         }
        if(model.getCompanyId()!=null) {
+           member.setEditor(member.getLoginUserInfo().getId());
+           member.setEditDate(new Date());
            if(Constants.equalsInteger(member.getHeadStatus(),Constants.ONE)){
                //濡傛灉鏄彇娑堜富绠�
                companyMapper.update(null,new UpdateWrapper<Company>().lambda()
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 485be32..4b51994 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -467,8 +467,8 @@
                     }else if(fee.compareTo(new BigDecimal(0)) < 0){
                         //濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
                     }
+                    b.setReceivableFee(editBill.getReceivableFee());
                 }
-                b.setReceivableFee(editBill.getReceivableFee());
                 b.setEditDate(param.getEditDate());
                 b.setEditor(param.getEditor());
                 b.setBtActDate(param.getBtActDate());
@@ -700,12 +700,18 @@
         }
         int num =1;
         for(int i=0;i<billList1.size();i++){
+            if(Constants.formatBigdecimal(billList1.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+                billList1.get(i).setPayStatus(Constants.ONE);
+            }
             if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ZERO)){
                 billList1.get(i).setSortnum(num);
                 num++;
             }
         }
         for(int i=0;i<billList2.size();i++){
+            if(Constants.formatBigdecimal(billList2.get(i).getReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+                billList2.get(i).setPayStatus(Constants.ONE);
+            }
             if(Constants.equalsInteger(billList2.get(i).getCostType(),Constants.ONE)) {
                 billList2.get(i).setSortnum(num);
                 num++;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java
index 9118073..a1a9b36 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java
@@ -52,7 +52,6 @@
         if(Objects.isNull(ywDeviceRecord)
         || Objects.isNull(ywDeviceRecord.getDeviceId())
         || Objects.isNull(ywDeviceRecord.getStatus())
-        || StringUtils.isBlank(ywDeviceRecord.getContent())
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
index 0afc0a7..d6f34b7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
@@ -290,11 +290,13 @@
                 .eq(YwPatrolScheme::getIsdeleted,Constants.ZERO)
                 .like(StringUtils.isNotBlank(model.getTitle()),YwPatrolScheme::getTitle,model.getTitle())
                 //鏌ヨ鏈夋椂娈典氦闆嗙殑鏁版嵁
-                .apply(Objects.nonNull(model.getStartDate())&&Objects.nonNull(model.getEndDate()),
-                        " t.START_DATE <= '"+pageWrap.getModel().getEndDate()+"' and t.END_DATE >= '"+pageWrap.getModel().getStartDate()+"' "
-                )
-//                .ge(Objects.nonNull(model.getStartDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
-//                .le(Objects.nonNull(model.getEndDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
+              /*  .apply(Objects.nonNull(model.getStartDate())&&Objects.nonNull(model.getEndDate()),
+                        " t.START_DATE <= '"+pageWrap.getModel().getEndDate()+"' or t.END_DATE >= '"+pageWrap.getModel().getStartDate()+"' "
+                )*/
+                .ge( model.getStartDate()!=null,YwPatrolScheme::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
+                .le(Objects.nonNull(model.getEndDate()),YwPatrolScheme::getStartDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
+                .ge(Objects.nonNull(model.getStartDateSec()),YwPatrolScheme::getEndDate, Utils.Date.getStart(pageWrap.getModel().getStartDateSec()))
+                .le(Objects.nonNull(model.getEndDateSec()),YwPatrolScheme::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDateSec()))
                 .orderByDesc(YwPatrolScheme::getCreateDate)
         ;
         IPage<YwPatrolScheme> iPage = ywPatrolSchemeMapper.selectJoinPage(page,YwPatrolScheme.class,queryWrapper);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
index 9557e62..087d9a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
@@ -135,7 +135,33 @@
                 .orderByDesc(YwPatrolScheme::getCreateDate)
         ;
         IPage<YwPatrolTaskRecord> iPage = ywPatrolTaskRecordMapper.selectJoinPage(page,YwPatrolTaskRecord.class,queryWrapper); 
+        if(iPage!=null && iPage.getRecords()!=null){
+            for(YwPatrolTaskRecord m : iPage.getRecords()){
+                getFileListByModel(m);
+            }
+        }
         return PageData.from(iPage);
+    }
+
+    private void getFileListByModel(YwPatrolTaskRecord ywPatrolTaskRecord) {
+        //闄勪欢鏁版嵁
+        List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
+                .selectAll(Multifile.class)
+                .selectAs(SystemUser::getRealname,Multifile::getUserName)
+                .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
+                .eq(Multifile::getObjId,ywPatrolTaskRecord.getId())
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey()));
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
+            for (Multifile multifile:multifileList) {
+                if(StringUtils.isNotBlank(multifile.getFileurl())){
+                    multifile.setFileurlFull(path + multifile.getFileurl());
+                }
+            }
+            ywPatrolTaskRecord.setMultifileList(multifileList);
+        }
     }
 
     @Override
@@ -188,17 +214,24 @@
 
         if(ywPatrolTaskRecordMapper.selectCount(new QueryWrapper<YwPatrolTaskRecord>().lambda()
                 .eq(YwPatrolTaskRecord::getTaskId,ywPatrolTask.getId())
+                .eq(YwPatrolTaskRecord::getStatus,Constants.ZERO)
                 .ne(YwPatrolTaskRecord::getId,ywPatrolTaskRecord.getId()))==Constants.ZERO){
-            ywPatrolTask.setStatus(Constants.THREE);
+            ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda()
+                    .eq(YwPatrolTask::getId,ywPatrolTask.getId())
+                    .set(YwPatrolTask::getStatus,Constants.THREE)
+                    .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
+                    .set(YwPatrolTask::getDealDate,DateUtil.getCurrDateTime())
+                    .set(YwPatrolTask::getDealUserId,loginUserInfo.getId())
+                    .set(YwPatrolTask::getEditor,loginUserInfo.getId())
+            );
         }else{
-            ywPatrolTask.setStatus(Constants.ONE);
+            ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda()
+                    .eq(YwPatrolTask::getId,ywPatrolTask.getId())
+                    .set(YwPatrolTask::getStatus,Constants.ONE)
+                    .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
+                    .set(YwPatrolTask::getEditor,loginUserInfo.getId())
+            );
         }
-        //鏌ヨ鏄惁瀛樺湪鍏朵粬鏈�
-       ywPatrolTaskMapper.update(null,new UpdateWrapper<YwPatrolTask>().lambda().eq(YwPatrolTask::getId,ywPatrolTask.getId())
-               .set(YwPatrolTask::getStatus,ywPatrolTask.getStatus())
-               .set(YwPatrolTask::getEditDate,DateUtil.getCurrDateTime())
-               .set(YwPatrolTask::getEditor,loginUserInfo.getId())
-       );
         //闄勪欢鏁版嵁
         if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywPatrolTaskRecord.getMultifileList())){
             for (Multifile multifile:ywPatrolTaskRecord.getMultifileList()) {
@@ -246,24 +279,7 @@
         if(Objects.isNull(ywPatrolTaskRecord)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈尮閰嶅埌宸℃鐐�!");
         }
-        //闄勪欢鏁版嵁
-        List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
-                .selectAll(Multifile.class)
-                .selectAs(SystemUser::getRealname,Multifile::getUserName)
-                .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
-                .eq(Multifile::getObjId,ywPatrolTaskRecord.getId())
-                .eq(Multifile::getIsdeleted,Constants.ZERO)
-                .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey()));
-        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
-            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
-                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
-            for (Multifile multifile:multifileList) {
-                if(StringUtils.isNotBlank(multifile.getFileurl())){
-                    multifile.setFileurlFull(path + multifile.getFileurl());
-                }
-            }
-            ywPatrolTaskRecord.setMultifileList(multifileList);
-        }
+        getFileListByModel(ywPatrolTaskRecord);
 
         return ywPatrolTaskRecord;
 
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
index d0566c3..84f274d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
@@ -86,8 +86,8 @@
                 .selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode)
                 .selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle)
                 .selectAs(SystemUser::getRealname,YwPatrolTask::getUserName)
-                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and t.ISDELETED = 0  ) ",YwPatrolTask::getPatrolNum)
-                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and t.STATUS = 1 and t.ISDELETED = 0) ",YwPatrolTask::getPatrolNum)
+                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and ytr.ISDELETED = 0  ) ",YwPatrolTask::getPatrolNum)
+                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and ytr.STATUS = 1 and ytr.ISDELETED = 0) ",YwPatrolTask::getFinishNum)
                 .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTask::getDealUserId)
                 .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
                 .eq(YwPatrolTask::getIsdeleted, Constants.ZERO)
@@ -140,8 +140,8 @@
                 .selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode)
                 .selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle)
                 .selectAs(SystemUser::getRealname,YwPatrolTask::getUserName)
-                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and t.ISDELETED = 0  ) ",YwPatrolTask::getPatrolNum)
-                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and t.STATUS = 1 and t.ISDELETED = 0) ",YwPatrolTask::getPatrolNum)
+                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and ytr.ISDELETED = 0  ) ",YwPatrolTask::getPatrolNum)
+                .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id  and ytr.STATUS = 1 and ytr.ISDELETED = 0) ",YwPatrolTask::getFinishNum)
                 .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTask::getDealUserId)
                 .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
                 .eq(YwPatrolTask::getIsdeleted, Constants.ZERO)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
index 2e2061a..2e0587a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
@@ -282,6 +282,7 @@
         List<YwRoom>  ywRoomList = ywRoomMapper.selectList(new QueryWrapper<YwRoom>().lambda()
                 .eq(YwRoom::getIsdeleted,Constants.ZERO)
                 .eq(YwRoom::getStatus,Constants.ZERO)
+                .eq(YwRoom::getIsInvestment,Constants.ONE)
                 .eq(Objects.nonNull(dataDTO.getProjectId()),YwRoom::getProjectId,dataDTO.getProjectId())
                 .apply(Objects.nonNull(dataDTO)&&Objects.nonNull(dataDTO.getStartDate())&&Objects.nonNull(dataDTO.getEndDate())," id not in  (" +
                         " SELECT y2.room_id FROM  yw_contract y1 left join yw_contract_room y2 on y1.id = y2.contract_id where 1 = 1 and y1.`STATUS` in( 0,1,2) " +
@@ -291,7 +292,7 @@
                         " SELECT y2.room_id FROM  yw_contract y1 left join yw_contract_room y2 on y1.id = y2.contract_id where 1 = 1 and y1.`STATUS` = 3 " +
                         " and y1.START_DATE < '"+dataDTO.getEndDate()+" 00:00:00' and y1.BT_DATE > '"+ dataDTO.getStartDate() +"  00:00:00' " +
                         "  ) ")
-                .orderByAsc(YwRoom::getSortnum)
+                .orderByAsc(YwRoom::getRoomNum)
         );
 
         for (YwRoom data:ywRoomList) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
index c8a86f3..42f163b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
@@ -499,10 +499,28 @@
                 queryWrapper.orderByAsc(sortData.getProperty());
             }
         }
+        if(StringUtils.isNotBlank(pageWrap.getModel().getBuildingName())){
+            queryWrapper.and(rw ->{
+                rw.like(YwBuilding::getName,pageWrap.getModel().getBuildingName()).or()
+                        .like(YwRoom::getName,pageWrap.getModel().getBuildingName());
+            });
+        }
         queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryStartTime())
                 .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwWorkorder::getCreateDate, pageWrap.getModel().getQueryEndTime());
         queryWrapper.orderByDesc(YwContract::getCreateDate );
-        return PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper));
+
+        PageData<YwWorkorder> result =   PageData.from(ywWorkorderMapper.selectPage(page, queryWrapper));
+        if(result!=null && result.getRecords()!=null){
+            for(YwWorkorder m : result.getRecords()){
+                if(Constants.equalsInteger(m.getAreaType(),Constants.ZERO)){
+                        //0瀹ゅ唴缁翠慨
+                    m.setAreaNameInfo(StringUtils.defaultString(m.getBuildingName(),"")+"/"+StringUtils.defaultString(m.getRoomNum(),""));
+                }else{
+                    m.setAreaNameInfo(StringUtils.defaultString(m.getBuildingName(),"")+"/"+StringUtils.defaultString(m.getFloorName(),""));
+                }
+            }
+        }
+        return result;
     }
 
     @Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 549fa40..613cd7a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -10,16 +10,18 @@
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.erp.ErpConstants;
 import com.doumee.core.erp.ErpTool;
-import com.doumee.core.erp.model.openapi.request.erp.*;
+import com.doumee.core.erp.model.openapi.request.*;
+import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.erp.model.openapi.response.*;
 import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.haikang.model.HKConstants;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.erp.model.openapi.request.*;
-import com.doumee.core.erp.model.openapi.response.*;
-import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
-import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.DESUtil;
 import com.doumee.core.utils.DateUtil;
@@ -31,8 +33,8 @@
 import com.doumee.dao.business.join.DeviceEventJoinMapper;
 import com.doumee.dao.business.join.VisitEventJoinMapper;
 import com.doumee.dao.business.model.*;
-import com.doumee.service.business.ext.ERPSyncService;
 import com.doumee.service.business.InterfaceLogService;
+import com.doumee.service.business.ext.ERPSyncService;
 import com.doumee.service.business.impl.MemberServiceImpl;
 import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -119,7 +121,7 @@
     private WxPlatNotice wxPlatNotice;
 
     @Override
-    @PostConstruct
+//    @PostConstruct
     public  int  initHkConfig(){
         ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode();
         ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 4c8ffca..80961fd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -59,7 +59,7 @@
     private MemberJoinMapper memberMapper;
     @Autowired
     private MemberMapper memberMapper1;
-    @Autowired
+//    @Autowired
     private ERPSyncService erpSyncService;
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;

--
Gitblit v1.9.3