Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-07-04 ff779cb22ce9d538c8306e9f218ae24a497057b3

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 admin/.env.development

@@ -1,4 +1,5 @@
# å¼€å‘环境配置
NODE_ENV = 'development'

VUE_APP_API_URL  = 'http://192.168.0.135:10010'
VUE_APP_API_URL  = 'http://localhost:10010'
#VUE_APP_API_URL  = 'http://192.168.0.173/admin_interface'

 admin/src/components/business/OperaCarUseBookWindow.vue

@@ -43,8 +43,8 @@
            </div>
            <div class="item">
              <div class="label">目的地类别</div>
              <div class="value status-green" v-if="model.type === 0">【市内用车】</div>
              <spdivan class="value status-red"   v-if="model.type === 1">【市内用车】</spdivan>
              <div class="value status-green" v-if="model.type == 0">【市内用车】</div>
              <div class="value status-red"   v-if="model.type == 1">【市外用车】</div>
            </div>
            <div class="item">
              <div class="label">目的地</div>

 admin/src/components/system/user/OperaUserWindow.vue

@@ -7,7 +7,7 @@
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules">
      <el-form-item label="用户名" prop="username" required>
      <el-form-item label="用户名" prop="username" required v-if="form.id ==null">
        <el-input v-model="form.username" placeholder="请输入用户名" v-trim maxlength="50"/>
      </el-form-item>
      <el-form-item label="姓名" prop="realname" required>
@@ -122,6 +122,7 @@
          this.form.id = null
          this.form.departmentId = null
          this.form.positionIds = []
          this.form.username=null
        })
        return
      }

 admin/src/views/business/internalCompany.vue

@@ -166,11 +166,12 @@
        direction
      })
        .then(() => {
          if (direction === 'top') {
         /* if (direction === 'top') {
            menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex - 1, 1)[0])
          } else {
            menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex + 1, 1)[0])
          }
          }*/
          this.search()
        })
        .catch(e => {
          this.$tip.apiFailed(e)

 admin/src/views/business/visitorManagement.vue

@@ -40,6 +40,12 @@
                        <span v-if="row.sex === 2">女</span>
                    </template>
                </el-table-column>
                <el-table-column prop="status" label="状态" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="(row.status || 0) === 0" style="color: green">正常</span>
                        <span v-else style="color: red">异常</span>
                    </template>
                </el-table-column>
                <el-table-column label="证件类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.idcardType === 0">身份证</span>

 server/db/business.platform.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:create', '新建月台信息表', '月台信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:delete', '删除月台信息表', '月台信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:update', '修改月台信息表', '月台信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:query', '查询月台信息表', '月台信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platform:exportExcel', '导出月台信息表(Excel)', '月台信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_books.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:create', '新建月台入园预约信息表', '月台入园预约信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:delete', '删除月台入园预约信息表', '月台入园预约信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:update', '修改月台入园预约信息表', '月台入园预约信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:query', '查询月台入园预约信息表', '月台入园预约信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbooks:exportExcel', '导出月台入园预约信息表(Excel)', '月台入园预约信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_broadcast_log.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:create', '新建月台_LED和广播提醒下发记录', '月台_LED和广播提醒下发记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:delete', '删除月台_LED和广播提醒下发记录', '月台_LED和广播提醒下发记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:update', '修改月台_LED和广播提醒下发记录', '月台_LED和广播提醒下发记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:query', '查询月台_LED和广播提醒下发记录', '月台_LED和广播提醒下发记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformbroadcastlog:exportExcel', '导出月台_LED和广播提醒下发记录(Excel)', '月台_LED和广播提醒下发记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_device.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:create', '新建月台_关联监控点LED和广播信息表', '月台_关联监控点LED和广播信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:delete', '删除月台_关联监控点LED和广播信息表', '月台_关联监控点LED和广播信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:update', '修改月台_关联监控点LED和广播信息表', '月台_关联监控点LED和广播信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:query', '查询月台_关联监控点LED和广播信息表', '月台_关联监控点LED和广播信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformdevice:exportExcel', '导出月台_关联监控点LED和广播信息表(Excel)', '月台_关联监控点LED和广播信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_group.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:create', '新建月台_分组信息表', '月台_分组信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:delete', '删除月台_分组信息表', '月台_分组信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:update', '修改月台_分组信息表', '月台_分组信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:query', '查询月台_分组信息表', '月台_分组信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformgroup:exportExcel', '导出月台_分组信息表(Excel)', '月台_分组信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_interface_log.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:create', '新建作业调度平台接口交互记录', '作业调度平台接口交互记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:delete', '删除作业调度平台接口交互记录', '作业调度平台接口交互记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:update', '修改作业调度平台接口交互记录', '作业调度平台接口交互记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:query', '查询作业调度平台接口交互记录', '作业调度平台接口交互记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platforminterfacelog:exportExcel', '导出作业调度平台接口交互记录(Excel)', '作业调度平台接口交互记录', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_job.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:create', '新建月台调度作业信息表', '月台调度作业信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:delete', '删除月台调度作业信息表', '月台调度作业信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:update', '修改月台调度作业信息表', '月台调度作业信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:query', '查询月台调度作业信息表', '月台调度作业信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformjob:exportExcel', '导出月台调度作业信息表(Excel)', '月台调度作业信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_log.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:create', '新建月台_作业操作历史表', '月台_作业操作历史表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:delete', '删除月台_作业操作历史表', '月台_作业操作历史表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:update', '修改月台_作业操作历史表', '月台_作业操作历史表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:query', '查询月台_作业操作历史表', '月台_作业操作历史表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformlog:exportExcel', '导出月台_作业操作历史表(Excel)', '月台_作业操作历史表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_queue.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:create', '新建月台_叫号排队信息表', '月台_叫号排队信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:delete', '删除月台_叫号排队信息表', '月台_叫号排队信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:update', '修改月台_叫号排队信息表', '月台_叫号排队信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:query', '查询月台_叫号排队信息表', '月台_叫号排队信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformqueue:exportExcel', '导出月台_叫号排队信息表(Excel)', '月台_叫号排队信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_show_param.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:create', '新建月台_显示配置信息表', '月台_显示配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:delete', '删除月台_显示配置信息表', '月台_显示配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:update', '修改月台_显示配置信息表', '月台_显示配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:query', '查询月台_显示配置信息表', '月台_显示配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformshowparam:exportExcel', '导出月台_显示配置信息表(Excel)', '月台_显示配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_wms_detail.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:create', '新建月台_WMS作业通知单明细', '月台_WMS作业通知单明细', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:delete', '删除月台_WMS作业通知单明细', '月台_WMS作业通知单明细', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:update', '修改月台_WMS作业通知单明细', '月台_WMS作业通知单明细', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:query', '查询月台_WMS作业通知单明细', '月台_WMS作业通知单明细', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsdetail:exportExcel', '导出月台_WMS作业通知单明细(Excel)', '月台_WMS作业通知单明细', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/db/business.platform_wms_job.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:create', '新建月台_WMS作业通知单行数据', '月台_WMS作业通知单行数据', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:delete', '删除月台_WMS作业通知单行数据', '月台_WMS作业通知单行数据', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:update', '修改月台_WMS作业通知单行数据', '月台_WMS作业通知单行数据', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:query', '查询月台_WMS作业通知单行数据', '月台_WMS作业通知单行数据', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:platformwmsjob:exportExcel', '导出月台_WMS作业通知单行数据(Excel)', '月台_WMS作业通知单行数据', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
@@ -45,7 +46,6 @@
    @ApiOperation(value = "当月会议表", notes = "当月会议表")
    @GetMapping("/monthMeeting")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "yearMonth", value = "年月  yyyy-MM", required = true)
    })
    public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth) {
@@ -66,9 +66,6 @@

    @ApiOperation("我的会议列表")
    @PostMapping("/myMeetingPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<IPage<MeetingListResponse>> myMeetingPage(@RequestBody PageWrap<MeetingPageRequest> pageWrap) {
        LoginUserInfo user = getLoginUser(null);
        pageWrap.getModel().setUserId(user.getId());
@@ -81,7 +78,6 @@
    @ApiOperation("会议详情")
    @GetMapping("/meetingDetail")
    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
@@ -91,7 +87,6 @@
    @ApiOperation("获取会议开门二维码")
    @GetMapping("/getQrCode")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse<String> getQrCode(@RequestParam Integer id) {
@@ -102,9 +97,7 @@
    @ApiOperation("获取会议开门二维码-图片流")
    @GetMapping("/getQrCodeImg")
    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws  Exception {
        LoginUserInfo user = getLoginUser(null);
@@ -117,9 +110,6 @@

    @ApiOperation("会议预约")
    @PostMapping("/reservationMeeting")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest) {
        LoginUserInfo user = getLoginUser(null);
        bookingsRequest.setCreator(user.getId());
@@ -128,14 +118,21 @@
    }

    @ApiOperation("取消会议预约")
    @GetMapping("/reservationCancel")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse reservationCancel(@RequestParam Integer id) {
    @PostMapping("/reservationCancel")
    public ApiResponse reservationCancel(@RequestBody BusinessOverDTO businessOverDTO) {
        LoginUserInfo user = getLoginUser(null);
        bookingsService.reservationCancel(id,user.getId());
        businessOverDTO.setUserId(user.getId());
        bookingsService.reservationCancel(businessOverDTO);
        return ApiResponse.success("操作成功");
    }


    @ApiOperation("提前结束会议")
    @PostMapping("/reservationOver")
    public ApiResponse reservationOver(@RequestBody BusinessOverDTO businessOverDTO) {
        LoginUserInfo user = getLoginUser(null);
        businessOverDTO.setUserId(user.getId());
        bookingsService.reservationOver(businessOverDTO);
        return ApiResponse.success("操作成功");
    }


 server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java

@@ -60,7 +60,7 @@
        bookquery.eq(Bookings::getIsdeleted, Constants.ZERO);
        bookquery.eq(Bookings::getStatus, Constants.ZERO);
        bookquery.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') " );
        Integer   todayBookingsNum= bookingsJoinMapper.selectCount(bookquery);
        Long  todayBookingsNum= bookingsJoinMapper.selectCount(bookquery);
        json.put("todayBookingsNum",todayBookingsNum);

        //今日会议时长（小时）
@@ -136,7 +136,7 @@
        MPJLambdaWrapper<Rooms> rm1 = new MPJLambdaWrapper<>();
        rm1.eq(Rooms::getIsdeleted, Constants.ZERO);
        rm1.eq(Rooms::getStatus, Constants.ZERO);
        Integer roomNum=  roomsJoinMapper.selectCount(rm1);
        Long roomNum=  roomsJoinMapper.selectCount(rm1);
        json.put("roomNum",roomNum);

        //员工数量

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java

@@ -8,6 +8,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
@@ -130,18 +131,25 @@
        return ApiResponse.success("操作成功",bookingsService.reservationMeeting(bookingsRequest));
    }


    @ApiOperation("取消会议预约")
    @GetMapping("/reservationCancel")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse reservationCancel(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
//        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
    @PostMapping("/reservationCancel")
    public ApiResponse reservationCancel(@RequestBody BusinessOverDTO businessOverDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo user = getLoginUser(token);
        bookingsService.reservationCancel(id,user.getId());
        businessOverDTO.setUserId(user.getId())   ;
        bookingsService.reservationCancel(businessOverDTO);
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("提前结束会议")
    @PostMapping("/reservationOver")
    public ApiResponse reservationOver(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo user = getLoginUser(token);
        businessOverDTO.setUserId(user.getId());
        bookingsService.reservationOver(businessOverDTO);
        return ApiResponse.success("操作成功");
    }



}

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java

@@ -8,6 +8,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.system.vo.UserResponse;
import com.doumee.dao.web.request.BookingsRequest;
@@ -143,16 +144,23 @@
    }

    @ApiOperation("取消会议预约")
    @GetMapping("/reservationCancel")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "会议主键", required = true),
    })
    public ApiResponse reservationCancel(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
    @PostMapping("/reservationCancel")
    public ApiResponse reservationCancel(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo user = getLoginUser(token);
        bookingsService.reservationCancel(id,user.getId());
        businessOverDTO.setUserId(user.getId());
        bookingsService.reservationCancel(businessOverDTO);
        return ApiResponse.success("操作成功");
    }


    @ApiOperation("提前结束会议")
    @PostMapping("/reservationOver")
    public ApiResponse reservationOver(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo user = getLoginUser(token);
        businessOverDTO.setUserId(user.getId());
        bookingsService.reservationOver(businessOverDTO);
        return ApiResponse.success("操作成功");
    }


}

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;

 server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml

@@ -16,6 +16,7 @@
      config:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        namespace: dmvisit
#        namespace: dev_renkang
        username: nacos
        password: nacos
#        file-extension: yaml
@@ -23,6 +24,7 @@
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dev_renkang
        namespace: dmvisit
        username: nacos
        password: nacos

 server/meeting/meeting_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java

ÎļþÒÑɾ³ý

 server/meeting/meeting_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java

ÎļþÒÑɾ³ý

 server/meeting/meeting_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java

ÎļþÒÑɾ³ý

 server/meeting/meeting_service/src/main/java/com/doumee/dao/admin/request/BusinessOverDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.doumee.dao.admin.request;

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.DESUtil;
import com.doumee.dao.admin.response.DevWgResponseParam;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;

@Data
@ApiModel("会议结束请求类")
public class BusinessOverDTO {
    @ApiModelProperty(value = "业务主键")
    private  Integer id  ;
    @ApiModelProperty(value = "业务操作备注")
    private  String businessRemark;
    @ApiModelProperty(value = "用户主键",required = true)
    private  Integer userId  ;

}

 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java

@@ -24,7 +24,8 @@

    @Select(" select a.id , a.START_TIME , a.END_TIME , b.`NAME` as roomName , a.`NAME` as meetingName  ,date_format(a.START_TIME,'%Y-%m-%d') as meetingDate , a.START_TIME as startTime, a.status ," +
            " CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime,  c.REALNAME as bookingUser ," +
            " CASE  WHEN a.START_TIME > now() and a.`STATUS` = 0  THEN 1  WHEN a.END_TIME < now()  or a.`STATUS` = 1  THEN 3 ELSE 2  END meetingStatus , b.IMGURL as imgUrl ," +
            " CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1  WHEN a.END_TIME < now() AND a.`STATUS` = 0  THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " b.IMGURL as imgUrl ," +
            " a.remark  " +
            " from meeting_book a inner join meeting_rooms b  on a.ROOM_ID = b.ID  " +
            " inner join system_user c on a.CREATOR = c.id  " +
@@ -35,12 +36,12 @@

    @Select(" select a.id , a.START_TIME , a.END_TIME , b.id as roomId,  b.`NAME` as roomName , a.`NAME` as meetingName  ,date_format(a.START_TIME,'%Yå¹´%m月%d日') as meetingDate ," +
            " CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime,  c.REALNAME as bookingUserName ," +
            " CASE  WHEN a.START_TIME > now() and a.`STATUS` = 0  THEN 1  WHEN a.END_TIME < now()  or a.`STATUS` = 1  THEN 3 ELSE 2  END meetingStatus ," +
            "  CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1  WHEN a.END_TIME < now() AND a.`STATUS` = 0  THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " a.CONTENT as meetingContent, c.MOBILE as bookingUserMobile , e.`NAME` as bookingUserDepartment , a.CREATOR as bookingUserId  , a.remark  " +
            " from meeting_book a inner join meeting_rooms b  on a.ROOM_ID = b.ID  " +
            " inner join system_user c on a.CREATOR = c.id " +
            " inner join system_department_user d on c.id = d.USER_ID " +
            " INNER JOIN system_department e on d.DEPARTMENT_ID = e.ID   " +
            " left join system_user c on a.CREATOR = c.id " +
            " left join system_department_user d on c.id = d.USER_ID " +
            " left JOIN system_department e on d.DEPARTMENT_ID = e.ID   " +
            "  where a.id = #{id} ")
    MeetingDetailResponse meetingDetail(@Param("id") Integer id);


 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -58,4 +59,7 @@
    @ExcelColumn(name="时间段编码（关联room_time表）")
    private Integer timeId;

    @ApiModelProperty(value = "结束时间  HH:mm",hidden = true)
    @TableField(exist = false)
    private String endTime;
}

 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java

@@ -81,7 +81,7 @@
    @ApiModelProperty(value = "会议内容")
    private String content;

    @ApiModelProperty(value = "状态 0启用 1禁用")
    @ApiModelProperty(value = "状态 0已预约 1已撤销 2已结束 ")
    private Integer status;

    @ApiModelProperty(value = "取消人")
@@ -93,7 +93,17 @@
    @ApiModelProperty(value = "发送通知：0=未发送 1=已发送")
    private Integer sendNotice;

    @ApiModelProperty(value = "取消备注")
    private String cancelInfo;

    @ApiModelProperty(value = "提前结束人")
    private Integer doneUserId;

    @ApiModelProperty(value = "提前结束时间")
    private Date doneDate;

    @ApiModelProperty(value = "取消备注")
    private String doneInfo;

    @ApiModelProperty(value = "预约人")
    @TableField(exist = false)
@@ -162,4 +172,8 @@
    @ApiModelProperty(value = "weekday")
    @TableField(exist = false)
    private String weekday;

    @ApiModelProperty(value = "会议状态: 1=未开始；2=进行中；3=已结束 ; 4=即将开始; 5=已撤销")
    @TableField(exist = false)
    private Integer meetingStatus;
}

 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java

@@ -59,8 +59,8 @@
    @ExcelColumn(name="开放开始时间")
    private String startTime;

    @ApiModelProperty(value = "开发结束时间")
    @ExcelColumn(name="开发结束时间")
    @ApiModelProperty(value = "开放结束时间")
    @ExcelColumn(name="开放结束时间")
    private String endTime;

    @ApiModelProperty(value = "状态 0可选 1不可选 ", example = "1")

 server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/MeetingPageRequest.java

@@ -31,4 +31,9 @@

    @ApiModelProperty(value = "会议室主键")
    private Integer roomsId;

    @ApiModelProperty(value = "会议状态: 1=未开始；2=进行中；3=已结束 ; 4=即将开始; 5=已撤销")
    private Integer meetingStatus;


}

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java

@@ -4,6 +4,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.business.vo.RoomStatisticsVo;
@@ -168,7 +169,7 @@
     * @param id
     * @param userId
     */
    void reservationCancel(Integer id,Integer userId);
    void reservationCancel(BusinessOverDTO businessOverDTO);


    /**
@@ -207,4 +208,6 @@
    void sendBookingsNotice();

    IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap);

    void reservationOver(BusinessOverDTO businessOverDTO);
}

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -16,6 +16,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.MeetConstants;
import com.doumee.core.wx.SendWxMessage;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.request.QrOpenDoorDto;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.*;
@@ -188,6 +189,7 @@
        bookquery.selectAs(BookingTime::getTimeId, Bookings::getRoomTimeId);
        bookquery.selectAs(BookingTime::getId, Bookings::getBookingTimeId);
        bookquery.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
        bookquery.eq(BookingTime::getIsdeleted, MeetConstants.ZERO);
        bookquery.eq(Bookings::getRoomId, bookings.getRoomId());
        bookquery.eq(Bookings::getStatus, MeetConstants.ZERO);
        //bookquery.ge(Bookings::getStartTime, bookings.getStartTime());
@@ -199,6 +201,14 @@
        List<Bookings> bookList = bookingsJoinMapper.selectJoinList(Bookings.class, bookquery);
        for (int i = 0; i < bookings.getBookingTimeList().size(); i++) {
            BookingTime s = bookings.getBookingTimeList().get(i);
            RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
            if(Objects.isNull(roomTime)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"存在未查询到的配置日期，请刷新重试");
            }
            String endRoomTime = gsDate + " " + roomTime.getEndTime()+":00";
            if(DateUtil.StringToDate(endRoomTime, "yyyy-MM-dd HH:mm:ss").getTime()<=System.currentTimeMillis()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),endRoomTime + "已超过当前时间，无法进行预约");
            }
            if (!Objects.isNull(bookList) && bookList.size() > MeetConstants.ZERO) {
                List<Bookings> detailDataDtoStream =
                        bookList.stream().filter(a -> MeetConstants.equalsInteger(s.getTimeId(), a.getRoomTimeId())
@@ -213,7 +223,6 @@
                                        .filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
                                        .collect(Collectors.toList());
                        if (chriList.size() > 0) {
                            RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
                            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该会议：" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "时间段内已被使用");
                        }
                    } else {
@@ -223,7 +232,6 @@
                                        .filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
                                        .collect(Collectors.toList());
                        if (chriList.size() > 0) {
                            RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
                            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该会议：" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "时间段内已被使用");
                        }
                    }
@@ -245,14 +253,13 @@


        bookings.getBookingTimeList().stream().forEach(s -> {
            s.setId(null);
            s.setCreator(user.getId());
            s.setCreateDate(new Date());
            s.setIsdeleted(MeetConstants.ZERO);
            s.setBookingId(bookings.getId());
            bookingTimeJoinMapper.insert(s);
        });


    }

    public void updateManager(Bookings bookings, LoginUserInfo user) {
@@ -265,16 +272,18 @@
            userRel.setIsdeleted(MeetConstants.ONE);
            userRelJoinMapper.update(userRel, updateWrapper);
        }
        bookings.getSysList().stream().forEach(s -> {
            s.setIsdeleted(MeetConstants.ZERO);
            s.setCreateDate(new Date());
            s.setCreator(user.getId());
            s.setUserId(s.getUserId());
            s.setObjId(bookings.getId());
            s.setObjType(MeetConstants.ONE);
            userRelJoinMapper.insert(s);
        });

        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bookings.getSysList())){
            bookings.getSysList().stream().forEach(s -> {
                s.setId(null);
                s.setIsdeleted(MeetConstants.ZERO);
                s.setCreateDate(new Date());
                s.setCreator(user.getId());
                s.setUserId(s.getUserId());
                s.setObjId(bookings.getId());
                s.setObjType(MeetConstants.ONE);
                userRelJoinMapper.insert(s);
            });
        }
    }

    public void updateProjectRel(Bookings rooms, LoginUserInfo user) {
@@ -288,7 +297,7 @@
            projectRelJoinMapper.update(projectRel, updateWrapper);

            rooms.getProjectList().stream().forEach(s -> {

                s.setId(null);
                s.setIsdeleted(MeetConstants.ZERO);
                s.setCreateDate(new Date());
                s.setCreator(user.getId());
@@ -466,7 +475,7 @@
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName());
        queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemUser::getId, pageWrap.getModel().getDepartmentId());
        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, Company::getId, pageWrap.getModel().getDepartmentId());

        if (pageWrap.getModel().getStartTime() != null) {
            queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -483,6 +492,13 @@
        SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
        IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
        result.getRecords().stream().forEach(s -> {
            if(s.getStartTime().getTime()>System.currentTimeMillis()&&s.getStatus().equals(Constants.ZERO)){
                s.setMeetingStatus(Constants.ONE);
            }else if(s.getEndTime().getTime()<System.currentTimeMillis()||Constants.equalsInteger(s.getStatus(),Constants.ONE) || Constants.equalsInteger(s.getStatus(),Constants.TWO) ){
                s.setMeetingStatus(Constants.THREE);
            }else{
                s.setMeetingStatus(Constants.TWO);
            }
            MPJLambdaWrapper<Multifile> bookquery = new MPJLambdaWrapper<>();
            bookquery.eq(Multifile::getIsdeleted, MeetConstants.ZERO);
            bookquery.eq(Multifile::getObjId, s.getId());
@@ -758,38 +774,59 @@
     */
    @Override
    public IPage<MeetingListResponse> getMyMeetingPage(PageWrap<MeetingPageRequest> pageWrap) {
        IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), new QueryWrapper<MeetingListResponse>()

        QueryWrapper queryWrapper = new QueryWrapper<MeetingListResponse>()
                .and(StringUtils.isNotBlank(pageWrap.getModel().getRoomsName()),
                        j -> j.like("a.NAME",pageWrap.getModel().getRoomsName()).or()
                                .like(" b.NAME", pageWrap.getModel().getRoomsName()))
                        .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
                                " select 1 from meeting_user_rel u where a.id = u.OBJ_ID and  u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1  ")
                        .eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO) && !Objects.isNull(pageWrap.getModel().getUserId()), "a.CREATOR", pageWrap.getModel().getUserId())
                        .like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()), "a.START_TIME", pageWrap.getModel().getQueryDate())
                        .eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), "b.id", pageWrap.getModel().getRoomsId())
                        .apply(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.ONE), " now() < a.END_TIME and a.STATUS = 0   ")
                        .and(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
                                j -> j.apply("now() >= a.END_TIME ").or()
                                        .eq(" a.STATUS", MeetConstants.ONE))
                        .eq("b.ISDELETED",MeetConstants.ZERO)
                        .eq("b.STATUS",MeetConstants.ZERO)
                        .eq("a.ISDELETED",MeetConstants.ZERO)
                        .orderByDesc(!Objects.isNull(pageWrap.getModel().getStatus())&&pageWrap.getModel().getStatus().equals(MeetConstants.TWO),"a.START_TIME")
                        .orderByAsc(Objects.isNull(pageWrap.getModel().getStatus())||pageWrap.getModel().getStatus().equals(MeetConstants.ONE),"a.START_TIME")
        );
                .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
                        " select 1 from meeting_user_rel u where a.id = u.OBJ_ID and  u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1  ")
                .eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO) && !Objects.isNull(pageWrap.getModel().getUserId()), "a.CREATOR", pageWrap.getModel().getUserId())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()), "a.START_TIME", pageWrap.getModel().getQueryDate())
                .eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), "b.id", pageWrap.getModel().getRoomsId())
                .apply(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.ONE), " now() < a.END_TIME and a.STATUS = 0   ")
                .and(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
                        j -> j.apply("now() >= a.END_TIME ").or()
                                .eq(" a.STATUS", MeetConstants.ONE))
                .eq("b.ISDELETED",MeetConstants.ZERO)
                .eq("b.STATUS",MeetConstants.ZERO)
                .eq("a.ISDELETED",MeetConstants.ZERO)
                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                        &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
                        " now() > a.START_TIME and a.status = 0 "
                )
                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
                        " now() >= a.START_TIME and a.END_TIME >= now() "
                )
                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
                        " now() > a.END_TIME or a.status  = 2 "
                )
                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
                        " now() > a.START_TIME  and   SUBDATE(NOW(), INTERVAL 120 MINUTE) > a.START_TIME "
                )
                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
                        " a.STATUS = 1  "
                )
//                        .orderByDesc(!Objects.isNull(pageWrap.getModel().getStatus())&&pageWrap.getModel().getStatus().equals(MeetConstants.TWO),"a.START_TIME")
//                        .orderByAsc(Objects.isNull(pageWrap.getModel().getStatus())||pageWrap.getModel().getStatus().equals(MeetConstants.ONE),"a.START_TIME")
                .orderByDesc( Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.TWO),"a.CREATE_DATE")
                .orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE),"a.START_TIME");

        IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), queryWrapper);
        String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
        page.getRecords().forEach(i -> {
            i.setPrefixUrl(path);
            if(i.getMeetingStatus().equals(Constants.ZERO)){
                if(i.getStatus()==Constants.ONE){
                    i.setMeetingStatus(5);
                }else{
                    //开始前5分钟 å¤§äºŽå½“前时间 åˆ™æ˜¾ç¤ºå³å°†å¼€å§‹
                    if(DateUtil.afterMinutesDate(i.getStartTime(),-5).getTime()>System.currentTimeMillis()){
                if(i.getMeetingStatus()==Constants.ONE){
                    //开始前120分钟 å¤§äºŽå½“前时间 åˆ™æ˜¾ç¤ºå³å°†å¼€å§‹
                    if(DateUtil.afterMinutesDate(i.getStartTime(),-120).getTime()>System.currentTimeMillis()){
                        i.setMeetingStatus(4);
                    }
                }

            }

        });
@@ -928,18 +965,15 @@

    /**
     * ä¼šè®®é¢„约记录取消
     *
     * @param id
     * @param userId
     */
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void reservationCancel(Integer id, Integer userId) {
        Bookings bookings = bookingsMapper.selectById(id);
    public void reservationCancel(BusinessOverDTO businessOverDTO) {
        Bookings bookings = bookingsMapper.selectById(businessOverDTO.getId());
        if (Objects.isNull(bookings)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "未查询到预约记录");
        }
        if (!bookings.getCreator().equals(userId)) {
        if (!bookings.getCreator().equals(businessOverDTO.getUserId())) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行取消");
        }
        if (System.currentTimeMillis() > bookings.getStartTime().getTime()) {
@@ -949,10 +983,11 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "本次操作失败,预约状态已流转");
        }
        bookings.setCancelTime(new Date());
        bookings.setCancelUser(userId);
        bookings.setCancelUser(businessOverDTO.getUserId());
        bookings.setCancelInfo(businessOverDTO.getBusinessRemark());
        bookings.setStatus(MeetConstants.ONE);
        bookings.setEditDate(new Date());
        bookings.setEditor(userId);
        bookings.setEditor(businessOverDTO.getUserId());
        bookingsMapper.updateById(bookings);
        //取消会议 å‘送取消通知
        this.sendNotice(bookings, 3);
@@ -960,6 +995,63 @@
        sendWxMessage.bookingsCancel(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
    }


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void reservationOver(BusinessOverDTO businessOverDTO) {
        if(Objects.isNull(businessOverDTO)
            || Objects.isNull(businessOverDTO.getUserId())
            || Objects.isNull(businessOverDTO.getId())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Bookings bookings = bookingsMapper.selectById(businessOverDTO.getId());
        if (Objects.isNull(bookings)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "未查询到预约记录");
        }
        Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
                .eq(UserRel::getIsdeleted,Constants.ZERO)
                .eq(UserRel::getObjId,bookings.getRoomId())
                .eq(UserRel::getObjType,Constants.ONE)
                .eq(UserRel::getUserId,businessOverDTO.getUserId()));

        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行该操作");
        }
        if (System.currentTimeMillis() < bookings.getStartTime().getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议未开始,无法进行结束，如需该操作请使用取消功能");
        }
        if (System.currentTimeMillis() > bookings.getEndTime().getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议已结束，无法进行该操作");
        }
        if(!bookings.getStatus().equals(MeetConstants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "本次操作失败,会议状态已流转");
        }
        bookings.setDoneDate(new Date());
        bookings.setDoneUserId(businessOverDTO.getUserId());
        bookings.setStatus(MeetConstants.TWO);
        bookings.setEditDate(new Date());
        bookings.setEditor(businessOverDTO.getUserId());
        bookingsMapper.updateById(bookings);

        //查询所有的预约时间
        List<BookingTime> bookingTimeList = bookingTimeJoinMapper.selectJoinList(BookingTime.class,
                new MPJLambdaWrapper<BookingTime>()
                        .selectAll(BookingTime.class)
                        .selectAs(RoomTime::getEndTime,BookingTime::getEndTime)
                        .leftJoin(RoomTime.class,RoomTime::getId,BookingTime::getTimeId)
                        .eq(BookingTime::getBookingId,bookings.getId()));
        //获取当天  åªæœ‰å½“天日期内可以处理
        String today = DateUtil.dateToString(new Date(),"yyyy-mm-dd");
        //循环标记数据为已删除 ä¸å†å ç”¨
        for (BookingTime bookingTime:bookingTimeList) {
            if(DateUtil.getDateFromString(today + " " + bookingTime.getEndTime() +":00").getTime()>System.currentTimeMillis()){
                bookingTime.setIsdeleted(Constants.ZERO);
                bookingTimeJoinMapper.updateById(bookingTime);
            }
        }

    }

    /**
     * å®šæ—¶å‘送会议 å³å°†å¼€å§‹é€šçŸ¥
@@ -1020,7 +1112,7 @@
        Notices notices = new Notices(noticeObjectType,bookings.getId(),noticeObjectType.getInfo(),bookings.getCreator(), Constants.ZERO);
        noticeList.add(notices);
        if(noticeList.size()>0){
            noticesMapper.insertBatchSomeColumn(noticeList);
            noticesMapper.insert(noticeList);
        }
    }

@@ -1131,7 +1223,7 @@
    public IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap) {
        IPage<UserResponse> page = systemUserMapper.getUserPage(pageWrap.toPage(),new QueryWrapper<UserResponse>()
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()), i -> i.like("c.realName", pageWrap.getModel().getKeyword())
                        .or().like("e.name", pageWrap.getModel().getKeyword())
                        .or().like("d.COMPANY_NAME_PATH", pageWrap.getModel().getKeyword())
                )
                .eq("c.DELETED",0)
                .eq("c.status",0)

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java

@@ -3,6 +3,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.MeetConstants;
import com.doumee.dao.business.ProjectsMapper;
@@ -39,6 +40,7 @@
    public Integer create(Projects projects) {

        Projects insert = new Projects();
        insert.setIsdeleted(Constants.ZERO);
        insert.setCreator(projects.getCreator());
        insert.setEditor(projects.getEditor());
        insert.setName(projects.getName());

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java

@@ -127,6 +127,7 @@
        bookquery.selectAs(BookingTime::getTimeId, Bookings::getRoomTimeId);
        bookquery.selectAs(BookingTime::getId, Bookings::getBookingTimeId);
        bookquery.eq(Bookings::getIsdeleted, Constants.ZERO);
        bookquery.eq(BookingTime::getIsdeleted, Constants.ZERO);
        bookquery.eq(Bookings::getRoomId, roomTime.getRoomId());
        bookquery.eq(Bookings::getStatus,Constants.ZERO);
        bookquery.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT('" + DateUtil.dateToString(roomTime.getYudingDate(), "yyyy-MM-dd") + "','%Y-%m-%d') ");

 server/meeting/meeting_service/src/main/resources/application-test.yml

@@ -7,13 +7,23 @@
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource

  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss

#rocketmq:
#  namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
#  groupId: GID-wakatest
#  topic: waka-test
#  username: 4derRb4Sw5EkqUMI
#  password: v50N97wf4av8Q8I4
#
#knife4j:
#  enable: true
#  basic:
#    enable: true
#    username: admin
#    password: test@168.com
#    password: 111111

debug_model: true

@@ -26,4 +36,39 @@
  description: ${project.name}接口文档
  enabled: true
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
  redirect-uri: /

########################微信支付相关配置########################
wx:
  pay:
    appId: wxfab6da18632e28de
    appSecret: 4ee3b22afa90287834319fc3c1635271
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
    keyPath: /usr/local/apiclient_cert.p12

tencent:
  map:
    remoteHost: https://apis.map.qq.com
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ


########################定时开启配置########################
timing: true

des_pwd: 123456SDFKDJF

## MQTT##
mqtt:
  host: tcp://192.168.10.198:1883
  userName: root
  passWord: 123456
  qos: 1
  clientId: ClientId_local #ClientId_local必须唯一 æ¯”如你已经定了叫ABC  é‚£ä½ å°±ä¸€ç›´å«ABC  å…¶ä»–地方就不要使用ABC了
  timeout: 10
  keepalive: 20
  topic1: A/pick/warn/#  #符号是代表整个warn下面的全部子主题 æ²¡æœ‰ç†è§£çš„话 å¯ä»¥ç™¾åº¦ä»”细理解一下
  topic2: A/cmd/resp
  topic3: ABCF
  topic4: ABCH

 server/pom.xml

@@ -22,6 +22,7 @@
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-parent</artifactId>
    <version>2.3.12.RELEASE</version>
    <relativePath/>
  </parent>
  <properties>
    <java.version>1.8</java.version>

 server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java

@@ -14,7 +14,6 @@
import com.doumee.service.system.SystemLoginService;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.server.reactive.ServerHttpRequest;

 server/system_gateway/src/main/resources/bootstrap-dev.yml

@@ -6,8 +6,8 @@
      password: nacos
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit
#        namespace: dev_renkang
        username: nacos
        password: nacos
    gateway:

 server/system_service/pom.xml

@@ -18,7 +18,7 @@
        <swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
        <fastjson.version>1.2.70</fastjson.version>
        <druid.version>1.2.0</druid.version>
        <mybatis.plus.version>3.4.2</mybatis.plus.version>
        <mybatis.plus.version>3.5.7</mybatis.plus.version>
        <apache.shiro.version>1.7.0</apache.shiro.version>
        <oshi.version>5.7.0</oshi.version>
        <jna.version>5.7.0</jna.version>
@@ -68,27 +68,33 @@
        <dependency>
            <groupId>com.github.pagehelper</groupId>
            <artifactId>pagehelper-spring-boot-starter</artifactId>
            <version>1.3.0</version>
            <!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
                å› ä¸ºpagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
                æ‰€ä»¥ä¼šä¸Žmybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突
            -->
            <exclusions>
                <exclusion>
                    <groupId>org.mybatis</groupId>
                    <artifactId>mybatis</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>org.mybatis</groupId>
                    <artifactId>mybatis-spring</artifactId>
                </exclusion>
                <!-- è§£å†³jsqlparser ä¾èµ–版本冲突-->
                <exclusion>
                    <artifactId>jsqlparser</artifactId>
                    <groupId>com.github.jsqlparser</groupId>
                </exclusion>
            </exclusions>
            <version>2.1.0</version>
        </dependency>

        <!-- <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.3.0</version>
             &lt;!&ndash;使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
                 å› ä¸ºpagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
                 æ‰€ä»¥ä¼šä¸Žmybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突
             &ndash;&gt;
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>
                     <artifactId>mybatis</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.mybatis</groupId>
                     <artifactId>mybatis-spring</artifactId>
                 </exclusion>
                 &lt;!&ndash; è§£å†³jsqlparser ä¾èµ–版本冲突&ndash;&gt;
                 &lt;!&ndash;<exclusion>
                     <artifactId>jsqlparser</artifactId>
                     <groupId>com.github.jsqlparser</groupId>
                 </exclusion>&ndash;&gt;
             </exclusions>
         </dependency>-->
        <!-- è¿žæŽ¥æ±  -->
        <dependency>
            <groupId>com.alibaba</groupId>

 server/system_service/src/main/java/com/doumee/config/jwt/JwtProperties.java

 server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java

 server/system_service/src/main/java/com/doumee/config/mybatis/EasySqlInjector.java

ÎļþÒÑɾ³ý

 server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisPlusConfig.java

@@ -20,9 +20,5 @@
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
        return interceptor;
    }
    @Bean
    public EasySqlInjector sqlInjector() {
        return new EasySqlInjector();
    }

}

 server/system_service/src/main/java/com/doumee/core/constants/ResponseStatus.java

@@ -27,6 +27,7 @@
    NOT_ALLOWED(5110, "不允许的操作"),
    TOKEN_EXCEED_TIME(5111, "TOKEN过期"),
    NO_LOGIN(5112, "未登录"),
    NO_ALLOW_LOGIN(5113, "该类用户不允许登录"),
    ;

    private int code;

 server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java

@@ -4,6 +4,7 @@
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.BeanUtils;

@@ -38,6 +39,8 @@
    private String sessionId;

    private Date loginDate;
    @ApiModelProperty(value = "账户来源：0=后台添加 ï¼› 2=司机注册")
    private Integer source;

    private List<String> roles;


 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -94,6 +94,7 @@
    public static final String ERP ="ERP" ;
    public static final Integer THREE =3 ;
    public static final Integer FOUR =4 ;
    public static final Integer FIVE =5 ;
    public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
    public static final String VIRTUAL_CARD_INDEX = "02098469790";
    public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
@@ -404,7 +405,7 @@


public interface  memberType{
    int lw_visitor = 0;//劳务访客
    int driver = 0;//司机人员
    int visitor = 1;//普通访客
    int internal = 2;//内部人员
}

 server/system_service/src/main/java/com/doumee/dao/business/dao/CompanyMapper.java

@@ -11,5 +11,4 @@
 */
public interface CompanyMapper extends BaseMapper<Company> {

    void insertBatchSomeColumn(List<Company> addList);
}

 server/system_service/src/main/java/com/doumee/dao/system/MultifileMapper.java

@@ -11,5 +11,4 @@
 */
public interface MultifileMapper extends BaseMapper<Multifile> {

    void insertBatchSomeColumn(List<Multifile> fileList);
}

 server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java

@@ -26,7 +26,6 @@
    List<SystemUserListVO> selectManageList(@Param("dto") QuerySystemUserDTO dto, @Param("orderByClause") String orderByClause);


    void insertBatchSomeColumn(List<SystemUser> userList);




 server/system_service/src/main/java/com/doumee/dao/system/dto/LoginAuthDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.doumee.dao.system.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.io.Serializable;

/**
 * @author Eva.Caesar Liu
 * @date 2023/05/04 18:21
 */
@Data
@ApiModel("微信登录授权参数")
public class LoginAuthDTO implements Serializable {

    @ApiModelProperty(value = "编码")
    private String code;

    @ApiModelProperty(value = "类型")
    private Integer soucre;

}

 server/system_service/src/main/java/com/doumee/dao/system/dto/LoginByOpenidDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.doumee.dao.system.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.io.Serializable;

/**
 * @author Eva.Caesar Liu
 * @date 2023/05/04 18:21
 */
@Data
@ApiModel("公众号登录参数")
public class LoginByOpenidDTO implements Serializable {

    @ApiModelProperty(value = "userId" , hidden = true)
    private Integer userId;
}

 server/system_service/src/main/java/com/doumee/dao/system/dto/NoticesDTO.java

@@ -1,8 +1,10 @@
package com.doumee.dao.system.dto;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@@ -22,9 +24,13 @@
    private Integer queryType;

    @ApiModelProperty(value = "开始日期")
    @JsonFormat(pattern="yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date startDate;

    @ApiModelProperty(value = "结束日期")
    @JsonFormat(pattern="yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date endDate;

    @ApiModelProperty(value = "0访客审批 1访客报备 2用车审批 3隐患处理 4物流车审批 5系统系统")

 server/system_service/src/main/java/com/doumee/dao/system/join/NoticesJoinMapper.java

@@ -11,5 +11,4 @@
 */
public interface NoticesJoinMapper extends MPJJoinMapper<Notices> {

    void insertBatchSomeColumn(List<Notices> noticeList);
}

 server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java

@@ -100,7 +100,7 @@
    @ExcelColumn(name="关联参数3")
    private String param3;

    @ApiModelProperty(value = "关联参数4")
    @ApiModelProperty(value = "操作人")
    @ExcelColumn(name="关联参数4")
    private String param4;


 server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java

@@ -104,7 +104,9 @@
    private Integer status;
    @ApiModelProperty(value = "企业编码（关联company）")
    private Integer companyId;
    @ApiModelProperty(value = "0 å¯ç”¨ 1 ç¦ç”¨")
    @ApiModelProperty(value = "账户来源：0=后台添加 ï¼› 2=司机注册")
    private Integer source;
    @ApiModelProperty(value = "公司名称")
    @TableField(exist = false)
    private String companyName;
    @ApiModelProperty(value = "数据权限内部门编码集合")

 server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java

@@ -1,6 +1,7 @@
package com.doumee.service.system;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.system.dto.LoginByOpenidDTO;
import com.doumee.dao.system.dto.LoginDTO;
import org.springframework.http.server.reactive.ServerHttpRequest;

@@ -19,5 +20,14 @@
     * @date 2023/03/21 14:49
     */
    String loginByPassword (LoginDTO dto, HttpServletRequest request);

    LoginUserInfo loginByPasswordNew (LoginDTO dto, ServerHttpRequest request);

    /**
     * æ ¹æ® openId登录
     * @param userId
     * @param request
     * @return
     */
    String loginByUserId(Integer userId);
}

 server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java

@@ -158,10 +158,12 @@
        if(noticesDTO.getQueryType().equals(Constants.ZERO)){
            queryWrapper.eq(Notices::getStatus,Constants.ZERO);
            queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
            queryWrapper.eq(Notices::getParam2,Constants.ZERO);
            queryWrapper.eq(Notices::getUserId, noticesDTO.getMemberId());
        } else if(noticesDTO.getQueryType().equals(Constants.ONE)){
            queryWrapper.eq(Notices::getStatus,Constants.ONE);
            queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
            queryWrapper.eq(Notices::getParam4,noticesDTO.getMemberId());
        } else if(noticesDTO.getQueryType().equals(Constants.TWO)){
            queryWrapper.eq(Notices::getParam3, noticesDTO.getMemberId());
        } else if (noticesDTO.getQueryType().equals(Constants.THREE)) {

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -1,15 +1,19 @@
package com.doumee.service.system.impl;

import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.dto.LoginByOpenidDTO;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.model.*;
import com.doumee.service.common.CaptchaService;
import com.doumee.service.system.*;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -22,6 +26,7 @@
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
@@ -58,6 +63,11 @@

    @Autowired
    private CompanyMapper companyMapper;

    @Resource
    private JwtTokenUtil jwtTokenUtil;



    @Override
    public String loginByPassword(LoginDTO dto, HttpServletRequest request) {
@@ -127,7 +137,6 @@
                throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),"对不起，验证码不正确！");
            }
        }

        // æ ¹æ®ç”¨æˆ·åæŸ¥è¯¢ç”¨æˆ·å¯¹è±¡
        SystemUser queryDto = new SystemUser();
        queryDto.setUsername(dto.getUsername());
@@ -135,6 +144,9 @@
        SystemUser user = systemUserService.findOne(queryDto);
        if (user == null) {
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        }
        if(!Constants.equalsInteger(user.getSource(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
        }
        String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
        // æ¯”较密码
@@ -158,4 +170,41 @@
        return  userInfo;
    }


    /**
     * å†…部人员 ä¸Ž å¸æœº æ ¹æ®code查询openId后进行登录接口
     * @return
     */
    @Override
    public String loginByUserId(Integer userId) {
        SystemLoginLog loginLog = new SystemLoginLog();
        loginLog.setLoginTime(new Date());
        loginLog.setSystemVersion(systemVersion);
        loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
        loginLog.setServerIp(Utils.Server.getIP());

        // æ ¹æ®ç”¨æˆ·åæŸ¥è¯¢ç”¨æˆ·å¯¹è±¡
        SystemUser user = systemUserService.findById(userId);
        if (user == null) {
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
        }
        Company company = new Company();
        if(Objects.nonNull(user.getCompanyId())){
            company = companyMapper.selectById(user.getCompanyId());
        }
        // èŽ·å–登录用户信息
        List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
        List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());

        SystemRole rt = new SystemRole();
        rt.setDeleted(Boolean.FALSE);
        //数据部门权限集合
        user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));

        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
        String token = jwtTokenUtil.generateToken(userInfo);

        return  token;
    }

}

 server/system_timer/src/main/resources/application-test.yml

@@ -1,21 +1,21 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/dm_visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: doumee
    password: rtjgfEr@&0c0m
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource

  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss

#rocketmq:
#  namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
#  groupId: GID-wakatest
@@ -23,30 +23,31 @@
#  username: 4derRb4Sw5EkqUMI
#  password: v50N97wf4av8Q8I4

#knife4j:
#  enable: true
#  basic:
#    enable: true
knife4j:
  enable: true
  basic:
    enable: true
#    username: admin
#    password: 111111

debug_model: true

# Swagger配置
swagger:
  host: dmtest.ahapp.net
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  context-path: /erp_api
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /

########################同步数据模式  ########################
data-sync:
  org-user-data-origin: 1 #组织数据 0自建 2以海康为主 1华晟ERP系统
  visitor-data-origin: 1 #访客数据 0自建 2以海康为主 1华晟ERP系统
  need-deal-img: true #是否需要处理图片数据


# Swagger配置
swagger:
  host: 127.0.0.1
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  context-path:
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /

########################微信支付相关配置########################
wx:
@@ -64,6 +65,7 @@
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ



des_pwd: 123456SDFKDJF

## MQTT##

 server/system_timer/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: test
  application:
    name: systemTimer
    # å®‰å…¨é…ç½®

 server/visits/admin_timer/pom.xml

@@ -5,7 +5,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.doumee</groupId>
        <artifactId>dmvisit</artifactId>
        <artifactId>visits</artifactId>
        <version>1.0.0-SNAPSHOT</version>
    </parent>


 server/visits/admin_timer/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: test
  application:
    name: visitsTimer
    # å®‰å…¨é…ç½®

 server/visits/admin_timer/src/main/resources/logback-spring.xml

@@ -8,7 +8,6 @@
    <property name="log.path" value="logs/visitsTimer"></property>
    <property name="log.fileSize" value="100MB"></property>
    <property name="log.historyDays" value="7"></property>

    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>ERROR</level>

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java

@@ -94,7 +94,7 @@
        for (String id : idArray ){
            idList.add(Integer.valueOf(id));
        }
        memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
        memberService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -230,8 +230,6 @@
        memberService.batchRemoveBlock(idList,1,this.getLoginUser(token));
        return ApiResponse.success(null);
    }



    @ApiOperation("是否可拜访状态修改")
    @PostMapping("/updateCanVisitById")

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.doumee.cloud.admin;

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.core.utils.Constants;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.service.business.PlatformBooksService;
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/06/28 10:03
 */
@Api(tags = "月台入园预约信息表")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/platformBooks")
public class PlatformBooksCloudController extends BaseController {

    @Autowired
    private PlatformBooksService platformBooksService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:platformbooks:create")
    public ApiResponse create(@RequestBody PlatformBooks platformBooks) {
        return ApiResponse.success(platformBooksService.create(platformBooks));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:platformbooks:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        platformBooksService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:platformbooks: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));
        }
        platformBooksService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:platformbooks:update")
    public ApiResponse updateById(@RequestBody PlatformBooks platformBooks) {
        platformBooksService.updateById(platformBooks);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:platformbooks:query")
    public ApiResponse<PageData<PlatformBooks>> findPage (@RequestBody PageWrap<PlatformBooks> pageWrap) {
        return ApiResponse.success(platformBooksService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:platformbooks:exportExcel")
    public void exportExcel (@RequestBody PageWrap<PlatformBooks> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(PlatformBooks.class).export(platformBooksService.findPage(pageWrap).getRecords(), "月台入园预约信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:platformbooks:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(platformBooksService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.doumee.cloud.admin;

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.core.utils.Constants;
import com.doumee.dao.business.model.PlatformBroadcastLog;
import com.doumee.service.business.PlatformBroadcastLogService;
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/06/28 10:03
 */
@Api(tags = "月台_LED和广播提醒下发记录")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/platformBroadcastLog")
public class PlatformBroadcastLogCloudController extends BaseController {

    @Autowired
    private PlatformBroadcastLogService platformBroadcastLogService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:platformbroadcastlog:create")
    public ApiResponse create(@RequestBody PlatformBroadcastLog platformBroadcastLog) {
        return ApiResponse.success(platformBroadcastLogService.create(platformBroadcastLog));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:platformbroadcastlog:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        platformBroadcastLogService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:platformbroadcastlog: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));
        }
        platformBroadcastLogService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:platformbroadcastlog:update")
    public ApiResponse updateById(@RequestBody PlatformBroadcastLog platformBroadcastLog) {
        platformBroadcastLogService.updateById(platformBroadcastLog);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:platformbroadcastlog:query")
    public ApiResponse<PageData<PlatformBroadcastLog>> findPage (@RequestBody PageWrap<PlatformBroadcastLog> pageWrap) {
        return ApiResponse.success(platformBroadcastLogService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:platformbroadcastlog:exportExcel")
    public void exportExcel (@RequestBody PageWrap<PlatformBroadcastLog> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(PlatformBroadcastLog.class).export(platformBroadcastLogService.findPage(pageWrap).getRecords(), "月台_LED和广播提醒下发记录", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:platformbroadcastlog:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(platformBroadcastLogService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformDeviceCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.doumee.cloud.admin;

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.core.utils.Constants;
import com.doumee.dao.business.model.PlatformDevice;
import com.doumee.service.business.PlatformDeviceService;
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/06/28 10:03
 */
@Api(tags = "月台_关联监控点LED和广播信息表")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/platformDevice")
public class PlatformDeviceCloudController extends BaseController {

    @Autowired
    private PlatformDeviceService platformDeviceService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:platformdevice:create")
    public ApiResponse create(@RequestBody PlatformDevice platformDevice) {
        return ApiResponse.success(platformDeviceService.create(platformDevice));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:platformdevice:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        platformDeviceService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:platformdevice: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));
        }
        platformDeviceService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:platformdevice:update")
    public ApiResponse updateById(@RequestBody PlatformDevice platformDevice) {
        platformDeviceService.updateById(platformDevice);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:platformdevice:query")
    public ApiResponse<PageData<PlatformDevice>> findPage (@RequestBody PageWrap<PlatformDevice> pageWrap) {
        return ApiResponse.success(platformDeviceService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:platformdevice:exportExcel")
    public void exportExcel (@RequestBody PageWrap<PlatformDevice> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(PlatformDevice.class).export(platformDeviceService.findPage(pageWrap).getRecords(), "月台_关联监控点LED和广播信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:platformdevice:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(platformDeviceService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsDetailCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.doumee.cloud.admin;

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.core.utils.Constants;
import com.doumee.dao.business.model.PlatformWmsDetail;
import com.doumee.service.business.PlatformWmsDetailService;
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/06/28 10:03
 */
@Api(tags = "月台_WMS作业通知单明细")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/platformWmsDetail")
public class PlatformWmsDetailCloudController extends BaseController {

    @Autowired
    private PlatformWmsDetailService platformWmsDetailService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:platformwmsdetail:create")
    public ApiResponse create(@RequestBody PlatformWmsDetail platformWmsDetail) {
        return ApiResponse.success(platformWmsDetailService.create(platformWmsDetail));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:platformwmsdetail:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        platformWmsDetailService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:platformwmsdetail: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));
        }
        platformWmsDetailService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:platformwmsdetail:update")
    public ApiResponse updateById(@RequestBody PlatformWmsDetail platformWmsDetail) {
        platformWmsDetailService.updateById(platformWmsDetail);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:platformwmsdetail:query")
    public ApiResponse<PageData<PlatformWmsDetail>> findPage (@RequestBody PageWrap<PlatformWmsDetail> pageWrap) {
        return ApiResponse.success(platformWmsDetailService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:platformwmsdetail:exportExcel")
    public void exportExcel (@RequestBody PageWrap<PlatformWmsDetail> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(PlatformWmsDetail.class).export(platformWmsDetailService.findPage(pageWrap).getRecords(), "月台_WMS作业通知单明细", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:platformwmsdetail:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(platformWmsDetailService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsJobCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.doumee.cloud.admin;

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.core.utils.Constants;
import com.doumee.dao.business.model.PlatformWmsJob;
import com.doumee.service.business.PlatformWmsJobService;
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/06/28 10:03
 */
@Api(tags = "月台_WMS作业通知单行数据")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/platformWmsJob")
public class PlatformWmsJobCloudController extends BaseController {

    @Autowired
    private PlatformWmsJobService platformWmsJobService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:platformwmsjob:create")
    public ApiResponse create(@RequestBody PlatformWmsJob platformWmsJob) {
        return ApiResponse.success(platformWmsJobService.create(platformWmsJob));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:platformwmsjob:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        platformWmsJobService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:platformwmsjob: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));
        }
        platformWmsJobService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:platformwmsjob:update")
    public ApiResponse updateById(@RequestBody PlatformWmsJob platformWmsJob) {
        platformWmsJobService.updateById(platformWmsJob);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:platformwmsjob:query")
    public ApiResponse<PageData<PlatformWmsJob>> findPage (@RequestBody PageWrap<PlatformWmsJob> pageWrap) {
        return ApiResponse.success(platformWmsJobService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:platformwmsjob:exportExcel")
    public void exportExcel (@RequestBody PageWrap<PlatformWmsJob> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(PlatformWmsJob.class).export(platformWmsJobService.findPage(pageWrap).getRecords(), "月台_WMS作业通知单行数据", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:platformwmsjob:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(platformWmsJobService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java

@@ -97,7 +97,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:visits:query")
    public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setMemberId(getLoginUser(token).getMemberId());
        pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId());
        return ApiResponse.success(visitsService.findPage(pageWrap));
    }

@@ -124,6 +124,13 @@
        return ApiResponse.success(visitsService.retentionPage(pageWrap));
    }

    @ApiOperation(value = "PC端访客记录提交", notes = "访客提交")
    @PostMapping("/createFk")
    public ApiResponse createFk(@RequestBody Visits visits) {
        visits.setSourceType(Constants.ZERO);
        return ApiResponse.success("查询成功", visitsService.createFk(visits,false,Constants.ONE));
    }



    @ApiOperation(value = "访客报备", notes = "访客报备")

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java

@@ -100,7 +100,7 @@
                        String endType = originname.substring(originname.lastIndexOf("."), originname.length());
                        String date = DateUtil.getNowShortDate();
                        String fName = date + "/" + UUID.randomUUID() + endType;
                        String fileName = folder + "/" + fName;
                        String fileName = folder + fName;
                        boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
                        if (r) {
                            JSONObject fileJSON = new JSONObject();

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ApiController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java

@@ -1,7 +1,6 @@
package com.doumee.cloud.web;

import com.doumee.api.BaseController;
import com.doumee.cloud.web.ApiController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
@@ -95,7 +94,7 @@
    @PostMapping("/createVisit")
    public ApiResponse createVisit(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        visits.setCreateMemberId(getLoginUser(token).getMemberId());
        return ApiResponse.success("查询成功", visitsService.createFk(visits,false));
        return ApiResponse.success("查询成功", visitsService.createFk(visits,false,Constants.ZERO));
    }

    @ApiOperation(value = "审批流记录审批", notes = "内部人员")

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ProblemWebController.java

@@ -1,6 +1,5 @@
package com.doumee.cloud.web;

import com.doumee.cloud.web.ApiController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -33,7 +32,7 @@
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/problem")
@Slf4j
public class ProblemWebController extends ApiController {
public class ProblemWebController {

    @Autowired
    private ProblemsService problemsService;

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java

@@ -29,9 +29,11 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ServerWebExchange;

import javax.validation.Valid;
import java.util.List;
import java.util.Objects;

/**
 * Created by IntelliJ IDEA.
@@ -60,10 +62,11 @@
    @ApiOperation(value = "访客微信授权", notes = "访客微信授权获取openId")
    @GetMapping("/wxAuthorize")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "授权码", required = true)
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "授权码", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "source", value = "来源:0=司机；1=访客；2=内部员工", required = true)
    })
    public ApiResponse<WxAuthorizeVO> wxAuthorize(@RequestParam String code) {
        WxAuthorizeVO wxAuthorizeVO =  memberService.wxAuthorize(code);
    public ApiResponse<WxAuthorizeVO> wxAuthorize(@RequestParam String code,@RequestParam Integer source) {
        WxAuthorizeVO wxAuthorizeVO =  memberService.wxAuthorize(code,source);
        return ApiResponse.success("查询成功",wxAuthorizeVO);
    }

@@ -79,7 +82,7 @@
    @PostMapping("/createFk")
    public ApiResponse createFk(@RequestBody Visits visits) {
        visits.setSourceType(Constants.ZERO);
        return ApiResponse.success("查询成功", visitsService.createFk(visits,false));
        return ApiResponse.success("查询成功", visitsService.createFk(visits,false,Constants.ZERO));
    }


@@ -93,8 +96,9 @@

    @ApiOperation(value = "访客记录详情", notes = "访客记录详情")
    @GetMapping("/detail")
    public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id) {
        return ApiResponse.success("查询成功", visitsService.getVisitDetail(id,null));
    public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo loginUserInfo = getLoginUser(token);
        return ApiResponse.success("查询成功", visitsService.getVisitDetail(id, Objects.isNull(loginUserInfo)?null:loginUserInfo.getMemberId()));
    }



 server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml

@@ -23,6 +23,7 @@
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit
        username: nacos
        password: nacos

 server/visits/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java

@@ -27,16 +27,16 @@
    private Long lwCount;

    @ApiModelProperty(value = "在场车辆")
    private Integer presenceCarCount;
    private Long presenceCarCount;

    @ApiModelProperty(value = "预约车辆")
    private Integer visitorCarCount;
    private Long visitorCarCount;

    @ApiModelProperty(value = "长期车辆")
    private Integer longCarCount;
    private Long longCarCount;

    @ApiModelProperty(value = "供应商数量")
    private Integer supplierCount;
    private Long supplierCount;

    @ApiModelProperty(value = "劳务公司人员数")
    private List<Map<String,Object>> companyUsers;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java

@@ -12,7 +12,6 @@
 */
public interface ApproveMapper extends BaseMapper<Approve> {

    void insertBatchSomeColumn(List<Approve> list);


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveParamMapper.java

@@ -11,5 +11,4 @@
 */
public interface ApproveParamMapper extends BaseMapper<ApproveParam> {

    void insertBatchSomeColumn(List<ApproveParam> paramList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CarEventMapper.java

@@ -11,5 +11,4 @@
 */
public interface CarEventMapper extends BaseMapper<CarEvent> {

    void insertBatchSomeColumn(List<CarEvent> list);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CarsMapper.java

@@ -11,5 +11,4 @@
 */
public interface CarsMapper extends BaseMapper<Cars> {

    void insertBatchSomeColumn(List<Cars> allHkList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceEventMapper.java

@@ -11,5 +11,4 @@
 * @date 2023/11/30 15:33
 */
public interface DeviceEventMapper extends BaseMapper<DeviceEvent> {
    void insertBatchSomeColumn(List<DeviceEvent> addList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceMapper.java

@@ -11,6 +11,4 @@
 */
public interface DeviceMapper extends BaseMapper<Device> {

    Integer insertBatchSomeColumn(Collection<Device> entityList);

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceRoleMapper.java

@@ -11,5 +11,4 @@
 */
public interface DeviceRoleMapper extends BaseMapper<DeviceRole> {

    void insertBatchSomeColumn(List<DeviceRole> addList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java

@@ -11,5 +11,4 @@
 */
public interface EmpowerMapper extends BaseMapper<Empower> {

    void insertBatchSomeColumn(List<Empower> list);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java

@@ -11,6 +11,4 @@
 * @date 2023/11/30 15:33
 */
public interface MemberCardMapper extends BaseMapper<MemberCard> {

    void insertBatchSomeColumn(List<MemberCard> list);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java

@@ -17,5 +17,4 @@
 */
public interface MemberMapper extends MPJBaseMapper<Member> {

    void insertBatchSomeColumn(List<Member> list);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java

@@ -12,6 +12,5 @@
 */
public interface MemberRoleMapper extends BaseMapper<MemberRole> {

    void insertBatchSomeColumn(List<MemberRole> list);

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ParkBookMapper.java

@@ -12,5 +12,4 @@
 */
public interface ParkBookMapper extends BaseMapper<ParkBook> {

    void insertBatchSomeColumn(List<ParkBook> list);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/ParksMapper.java

@@ -11,5 +11,4 @@
 */
public interface ParksMapper extends BaseMapper<Parks> {

    void insertBatchSomeColumn(List<Parks> addList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformBooksMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.PlatformBooks;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformBooksMapper extends BaseMapper<PlatformBooks> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformBroadcastLogMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.PlatformBroadcastLog;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformBroadcastLogMapper extends BaseMapper<PlatformBroadcastLog> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformDeviceMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.PlatformDevice;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformDeviceMapper extends BaseMapper<PlatformDevice> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformGroupMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformGroupMapper extends BaseMapper<PlatformGroup> {


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformInterfaceLogMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformInterfaceLogMapper extends BaseMapper<PlatformInterfaceLog> {


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformJobMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformJobMapper extends BaseMapper<PlatformJob> {


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformLogMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformLogMapper extends BaseMapper<PlatformLog> {


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformMapper extends BaseMapper<Platform> {


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformQueueMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformQueueMapper extends BaseMapper<PlatformQueue> {


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformShowParamMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformShowParamMapper extends BaseMapper<PlatformShowParam> {


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformWmsDetailMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.PlatformWmsDetail;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformWmsDetailMapper extends BaseMapper<PlatformWmsDetail> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/PlatformWmsJobMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.PlatformWmsJob;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformWmsJobMapper extends BaseMapper<PlatformWmsJob> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/RetentionMapper.java

@@ -10,6 +10,4 @@
 * @date 2023/11/30 15:33
 */
public interface RetentionMapper extends BaseMapper<Retention> {

    void insertBatchSomeColumn(List<Retention> retentionList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/TrainTimeMapper.java

@@ -11,5 +11,4 @@
 */
public interface TrainTimeMapper extends BaseMapper<TrainTime> {

    void insertBatchSomeColumn(List<TrainTime> newList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/VisitEventMapper.java

@@ -11,5 +11,4 @@
 */
public interface VisitEventMapper extends BaseMapper<VisitEvent> {

    void insertBatchSomeColumn(List<VisitEvent> list);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/VisitsMapper.java

@@ -11,5 +11,4 @@
 */
public interface VisitsMapper extends BaseMapper<Visits> {

    void insertBatchSomeColumn(List<Visits> withUserList);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/ApproveJoinMapper.java

@@ -12,7 +12,5 @@
 */
public interface ApproveJoinMapper extends MPJJoinMapper<Approve> {

    void insertBatchSomeColumn(List<Approve> list);


}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/EmpowerJoinMapper.java

@@ -11,5 +11,4 @@
 * @date 2023/11/30 15:33
 */
public interface EmpowerJoinMapper extends MPJJoinMapper<Empower> {
    void insertBatchSomeColumn(List<Empower> list);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java

@@ -134,8 +134,8 @@
    @ExcelColumn(name="申请人编码(关联member)")
    private Integer memberId;

    @ApiModelProperty(value = "司机编码（关联car_driver）", example = "1")
    @ExcelColumn(name="司机编码（关联car_driver）")
    @ApiModelProperty(value = "司机编码（关联memberId）", example = "1")
    @ExcelColumn(name="司机编码（关联memberId）")
    private Integer driverId;

    @ApiModelProperty(value = "司机姓名", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java

@@ -75,8 +75,8 @@
    @ExcelColumn(name="健康码")
    private String imgurl;

    @ApiModelProperty(value = "类型 0劳务访客 1普通访客  2内部人员", example = "1")
    @ExcelColumn(name="类型 0劳务访客 1普通访客 2内部人员")
    @ApiModelProperty(value = "类型 0司机人员 1普通访客  2内部人员", example = "1")
    @ExcelColumn(name="类型 0司机人员 1普通访客 2内部人员")
    private Integer type;

    @ApiModelProperty(value = "访客名称/内部人员")
@@ -104,6 +104,9 @@
    @ApiModelProperty(value = "证件类型 0身份证 1港澳证件 2护照", example = "1")
    @ExcelColumn(name="证件类型 0身份证 1港澳证件 2护照")
    private Integer idcardType;
    @ApiModelProperty(value = "是否是物流司机 0不是 1是", example = "1")
    @ExcelColumn(name="是否是物流司机 0不是 1是")
    private Integer isDriver;

    @ApiModelProperty(value = "工号")
    @ExcelColumn(name="工号")
@@ -233,11 +236,9 @@
    @ApiModelProperty(value = "角色编码查询")
    @TableField(exist = false)
    private String roleIdParam;

    @ApiModelProperty(value = "前缀地址")
    @TableField(exist = false)
    private String prefixUrl;

    @ApiModelProperty(value = "授权门禁组编码集合,【访客端】唯一标识",hidden = true )
    @TableField(exist = false)
    private Integer[] roleIds;
@@ -247,37 +248,28 @@
    @ApiModelProperty(value = "有效期类型 0长期有效 1自定义",hidden = true )
    @TableField(exist = false)
    private  Integer  timeType;

    //暂无使用
    @ApiModelProperty(value = "姓名/手机号/工号")
    @TableField(exist = false)
    private String keyword;



    @ApiModelProperty(value = "是否有人脸：0=无；1=有；")
    @TableField(exist = false)
    private Integer isFace;

    @ApiModelProperty(value = "访问次数")
    @TableField(exist = false)
    private Integer visitTimes;

    @ApiModelProperty(value = "最后访问时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date lastVisitDate;

    @ApiModelProperty(value = "门禁有效期开始")
    @ExcelColumn(name="门禁有效期开始",index= 5,dateFormat = "yyyy-MM-dd")
    private Date startTime;
    @ApiModelProperty(value = "编码集合")
    @TableField(exist = false)
    private List<Integer> idList;

    @ApiModelProperty(value = "门禁有效期结束", example = "1")
    @ExcelColumn(name="门禁有效期结束",index= 6,dateFormat = "yyyy-MM-dd")
    private Date endTime;

    @ApiModelProperty(value = "人脸照片完整地址")
    @TableField(exist = false)
    private String faceImgFull;
@@ -291,13 +283,15 @@
    @ApiModelProperty(value = "门禁角色名称")
    @TableField(exist = false)
    private String roleName;
    @ApiModelProperty(value = "最后操作内容")
    @TableField(exist = false)
    private String optRemark;
    @ApiModelProperty(value = "培训开始时间")
    @TableField(exist = false)
    private Date trainStartTime;
    @ApiModelProperty(value = "培训结束时间")
    @TableField(exist = false)
    private Date trainEndTime;

    @ApiModelProperty(value = "门禁组名称集合")
    @TableField(exist = false)
    private List<String> roleNames;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java

@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,16 +9,17 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;

/**
 * æœˆå°ä¿¡æ¯è¡¨
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台信息表")
@TableName("`platform`")
public class Platform  extends LoginUserModel {
public class Platform {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -32,6 +32,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,7 +41,8 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
      private Date editDate;
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
@@ -74,14 +76,6 @@
    @ExcelColumn(name="工作结束时间")
    private String endTime;

    @ApiModelProperty(value = "关联月台监控点设备编码(关联devices)，多个用英文逗号隔开")
    @ExcelColumn(name="关联月台监控点设备编码(关联devices)，多个用英文逗号隔开")
    private String deviceIds;

    @ApiModelProperty(value = "关联月台屏幕编码集合（关联devices），多个用英文逗号隔开")
    @ExcelColumn(name="关联月台屏幕编码集合（关联devices），多个用英文逗号隔开")
    private String screenIds;

    @ApiModelProperty(value = "同时作业数量", example = "1")
    @ExcelColumn(name="同时作业数量")
    private Integer workingNum;
@@ -96,6 +90,7 @@

    @ApiModelProperty(value = "最后事件推送时间")
    @ExcelColumn(name="最后事件推送时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date lastEventTime;

    @ApiModelProperty(value = "监控点名称，多个用英文逗号隔开")
@@ -106,4 +101,32 @@
    @ExcelColumn(name="月台屏幕名称，多个用英文逗号隔开")
    private String screenName;

    @ApiModelProperty(value = "海康标识")
    @ExcelColumn(name="海康标识")
    private String hkId;

    @ApiModelProperty(value = "关联承租公司")
    @ExcelColumn(name="关联承租公司")
    private String companys;

    @ApiModelProperty(value = "X坐标", example = "1")
    @ExcelColumn(name="X坐标")
    private BigDecimal xpos;

    @ApiModelProperty(value = "Y坐标", example = "1")
    @ExcelColumn(name="Y坐标")
    private BigDecimal ypos;

    @ApiModelProperty(value = "宽度", example = "1")
    @ExcelColumn(name="宽度")
    private BigDecimal width;

    @ApiModelProperty(value = "高度", example = "1")
    @ExcelColumn(name="高度")
    private BigDecimal height;

    @ApiModelProperty(value = "角度", example = "1")
    @ExcelColumn(name="角度")
    private BigDecimal angle;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,104 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;

/**
 * æœˆå°å…¥å›­é¢„约信息表
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台入园预约信息表")
@TableName("`platform_books`")
public class PlatformBooks {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "名称")
    @ExcelColumn(name="名称")
    private String name;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "状态 0待审批 1审批中 2审批通过 3审批不通过", example = "1")
    @ExcelColumn(name="状态 0待审批 1审批中 2审批通过 3审批不通过")
    private Integer status;

    @ApiModelProperty(value = "合同号")
    @ExcelColumn(name="合同号")
    private String contractNum;

    @ApiModelProperty(value = "预计到场时间")
    @ExcelColumn(name="预计到场时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date arriveDate;

    @ApiModelProperty(value = "入库类型 0整托盘 1件烟", example = "1")
    @ExcelColumn(name="入库类型 0整托盘 1件烟")
    private Integer inType;

    @ApiModelProperty(value = "总运输量", example = "1")
    @ExcelColumn(name="总运输量")
    private BigDecimal totalNum;

    @ApiModelProperty(value = "前车牌号")
    @ExcelColumn(name="前车牌号")
    private String carCodeFront;

    @ApiModelProperty(value = "后车牌号")
    @ExcelColumn(name="后车牌号")
    private String carCodeBack;

    @ApiModelProperty(value = "司机编码", example = "1")
    @ExcelColumn(name="司机编码")
    private Integer driverId;

    @ApiModelProperty(value = "司机姓名")
    @ExcelColumn(name="司机姓名")
    private String driverName;

    @ApiModelProperty(value = "车牌号")
    @ExcelColumn(name="车牌号")
    private String plateNum;

    @ApiModelProperty(value = "司机手机号")
    @ExcelColumn(name="司机手机号")
    private String drivierPhone;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;

/**
 * æœˆå°_LED和广播提醒下发记录
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_LED和广播提醒下发记录")
@TableName("`platform_broadcast_log`")
public class PlatformBroadcastLog {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "名称")
    @ExcelColumn(name="名称")
    private String name;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "关联对象编码")
    @ExcelColumn(name="关联对象编码")
    private String objId;

    @ApiModelProperty(value = "关联对象类型 0月台作业", example = "1")
    @ExcelColumn(name="关联对象类型 0月台作业")
    private Integer objType;

    @ApiModelProperty(value = "提醒次数", example = "1")
    @ExcelColumn(name="提醒次数")
    private Integer num;

    @ApiModelProperty(value = "设备编码")
    @ExcelColumn(name="设备编码")
    private String ids;

    @ApiModelProperty(value = "提醒内容")
    @ExcelColumn(name="提醒内容")
    private String info;

    @ApiModelProperty(value = "海康编码")
    @ExcelColumn(name="海康编码")
    private String hkId;

    @ApiModelProperty(value = "提醒下发状态 0待下发 1下发中 2下发成功 3下发失败", example = "1")
    @ExcelColumn(name="提醒下发状态 0待下发 1下发中 2下发成功 3下发失败")
    private Integer hkStatus;

    @ApiModelProperty(value = "提醒下发时间")
    @ExcelColumn(name="提醒下发时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date hkDate;

    @ApiModelProperty(value = "提醒下发备注")
    @ExcelColumn(name="提醒下发备注")
    private String hkInfo;

    @ApiModelProperty(value = "业务类型 0月台排队叫号", example = "1")
    @ExcelColumn(name="业务类型 0月台排队叫号")
    private Integer bizType;

    @ApiModelProperty(value = "类型 0广播 1LED", example = "1")
    @ExcelColumn(name="类型 0广播 1LED")
    private Integer deviceType;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;

/**
 * æœˆå°_关联监控点LED和广播信息表
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_关联监控点LED和广播信息表")
@TableName("`platform_device`")
public class PlatformDevice {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "月台编码（关联platforms)", example = "1")
    @ExcelColumn(name="月台编码（关联platforms)")
    private Integer platformId;

    @ApiModelProperty(value = "设备海康标识")
    @ExcelColumn(name="设备海康标识")
    private String hkId;

    @ApiModelProperty(value = "设备编码（关联device)")
    @ExcelColumn(name="设备编码（关联device)")
    private String deviceId;

    @ApiModelProperty(value = "排序码", example = "1")
    @ExcelColumn(name="排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "设备类型 0LED 1监控点 2广播", example = "1")
    @ExcelColumn(name="设备类型 0LED 1监控点 2广播")
    private Integer type;

    @ApiModelProperty(value = "设备名称")
    @ExcelColumn(name="设备名称")
    private String name;

    @ApiModelProperty(value = "设备状态 0在线 1离线", example = "1")
    @ExcelColumn(name="设备状态 0在线 1离线")
    private Integer status;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java

@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -14,12 +13,12 @@
/**
 * æœˆå°_分组信息表
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_分组信息表")
@TableName("`platform_group`")
public class PlatformGroup  extends LoginUserModel {
public class PlatformGroup {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -32,6 +31,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,6 +40,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java

@@ -1,8 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -15,12 +13,12 @@
/**
 * ä½œä¸šè°ƒåº¦å¹³å°æŽ¥å£äº¤äº’记录
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("作业调度平台接口交互记录")
@TableName("`platform_interface_log`")
public class PlatformInterfaceLog  extends LoginUserModel {
public class PlatformInterfaceLog {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -33,6 +31,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -41,6 +40,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -61,7 +61,8 @@

    @ApiModelProperty(value = "地址信息")
    @ExcelColumn(name="地址信息")
    private String url;
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date url;

    @ApiModelProperty(value = "请求参数")
    @ExcelColumn(name="请求参数")
@@ -87,11 +88,4 @@
    @ExcelColumn(name="关联对象编码（多个用英文逗号隔开）")
    private String objId;

    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)
    private Date startDate;

    @ApiModelProperty(value = "结束时间")
    @TableField(exist = false)
    private Date endDate;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java

@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -15,12 +14,12 @@
/**
 * æœˆå°è°ƒåº¦ä½œä¸šä¿¡æ¯è¡¨
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台调度作业信息表")
@TableName("`platform_job`")
public class PlatformJob  extends LoginUserModel {
public class PlatformJob {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -33,6 +32,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -41,6 +41,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -55,8 +56,8 @@
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "状态 0待确认 1待签到 2等待叫号 3叫号中 4作业中 5作业完成 6异常挂起 7月台等待 8已作废", example = "1")
    @ExcelColumn(name="状态 0待确认 1待签到 2等待叫号 3叫号中 4作业中 5作业完成 6异常挂起 7月台等待 8已作废")
    @ApiModelProperty(value = "状态 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 å·²è¿‡å·", example = "1")
    @ExcelColumn(name="状态 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 å·²è¿‡å·")
    private Integer status;

    @ApiModelProperty(value = "排序码", example = "1")
@@ -65,50 +66,31 @@

    @ApiModelProperty(value = "作业单号")
    @ExcelColumn(name="作业单号")
    private String startTime;
    private String code;

    @ApiModelProperty(value = "作业唯一标识")
    @ExcelColumn(name="作业唯一标识")
    private String endTime;
    @ApiModelProperty(value = "作业唯一标识(承运单号）")
    @ExcelColumn(name="作业唯一标识(承运单号）")
    private String billCode;

    @ApiModelProperty(value = "司机编码", example = "1")
    @ExcelColumn(name="司机编码")
    private Integer deviceIds;
    private Integer driverId;

    @ApiModelProperty(value = "司机姓名")
    @ExcelColumn(name="司机姓名")
    private String screenIds;
    private String driverName;

    @ApiModelProperty(value = "车牌号")
    @ExcelColumn(name="车牌号")
    private String plateNum;

    @ApiModelProperty(value = "司机手机号")
    @ExcelColumn(name="司机手机号")
    private String workingNum;

    @ApiModelProperty(value = "广播提醒次数", example = "1")
    @ExcelColumn(name="广播提醒次数")
    private Integer broadcastNum;

    @ApiModelProperty(value = "广播设备编码")
    @ExcelColumn(name="广播设备编码")
    private String broadcastIds;

    @ApiModelProperty(value = "广播提醒内容")
    @ExcelColumn(name="广播提醒内容")
    private String broadcastInfo;

    @ApiModelProperty(value = "广播提醒下发状态 0待下发 1下发中 2下发成功 3下发失败", example = "1")
    @ExcelColumn(name="广播提醒下发状态 0待下发 1下发中 2下发成功 3下发失败")
    private Integer broadcastHkstatus;

    @ApiModelProperty(value = "广播提醒下发时间")
    @ExcelColumn(name="广播提醒下发时间")
    private Date broadcastHkdate;

    @ApiModelProperty(value = "广播提醒下发备注")
    @ExcelColumn(name="广播提醒下发备注")
    private String broadcastHkinfo;
    private String drivierPhone;

    @ApiModelProperty(value = "签到时间")
    @ExcelColumn(name="签到时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date signDate;

    @ApiModelProperty(value = "签到方式 0app签到 1扫码签到", example = "1")
@@ -119,12 +101,30 @@
    @ExcelColumn(name="签到距离(米）")
    private BigDecimal signDistance;

    @ApiModelProperty(value = "分配月台编码（关联platform)", example = "1")
    @ExcelColumn(name="分配月台编码（关联platform)")
    @ApiModelProperty(value = "作业月台名称集合，多个使用英文逗号隔开")
    @ExcelColumn(name="作业月台名称集合，多个使用英文逗号隔开")
    private String platformNames;

    @ApiModelProperty(value = "作业月台编码集合，多个使用英文逗号隔开")
    @ExcelColumn(name="作业月台编码集合，多个使用英文逗号隔开")
    private String platforms;

    @ApiModelProperty(value = "最近分配月台编码（关联platform)", example = "1")
    @ExcelColumn(name="最近分配月台编码（关联platform)")
    private Integer platformId;

    @ApiModelProperty(value = "通知入园等待时间")
    @ExcelColumn(name="通知入园等待时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date inwaitDate;

    @ApiModelProperty(value = "通知入园等待操作人编码", example = "1")
    @ExcelColumn(name="通知入园等待操作人编码")
    private Integer inwaitUserId;

    @ApiModelProperty(value = "叫号时间")
    @ExcelColumn(name="叫号时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date callDate;

    @ApiModelProperty(value = "叫号人编码", example = "1")
@@ -137,14 +137,17 @@

    @ApiModelProperty(value = "开始作业时间")
    @ExcelColumn(name="开始作业时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date startDate;

    @ApiModelProperty(value = "作业完成时间（最终时间）")
    @ExcelColumn(name="作业完成时间（最终时间）")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date doneDate;

    @ApiModelProperty(value = "异常挂起时间")
    @ExcelColumn(name="异常挂起时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date errorDate;

    @ApiModelProperty(value = "异常挂起人编码", example = "1")
@@ -157,6 +160,7 @@

    @ApiModelProperty(value = "月台转交时间")
    @ExcelColumn(name="月台转交时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date transPlatformDate;

    @ApiModelProperty(value = "月台转交处理人", example = "1")
@@ -169,10 +173,12 @@

    @ApiModelProperty(value = "车辆进厂时间")
    @ExcelColumn(name="车辆进厂时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date inDate;

    @ApiModelProperty(value = "车辆离厂时间")
    @ExcelColumn(name="车辆离厂时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date outDate;

    @ApiModelProperty(value = "离厂方式 0自动离厂 1手动离场", example = "1")
@@ -185,6 +191,7 @@

    @ApiModelProperty(value = "车辆离厂下发时间")
    @ExcelColumn(name="车辆离厂下发时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date outHkdate;

    @ApiModelProperty(value = "车辆离厂下发备注")
@@ -201,6 +208,7 @@

    @ApiModelProperty(value = "车辆进厂下发时间")
    @ExcelColumn(name="车辆进厂下发时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date inHkdate;

    @ApiModelProperty(value = "作业类型 0自有车卸货 1自有车装货 2外协车卸货 3外协车装货 4市公司外协车卸货", example = "1")
@@ -225,6 +233,7 @@

    @ApiModelProperty(value = "作废时间")
    @ExcelColumn(name="作废时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date cancelDate;

    @ApiModelProperty(value = "作废处理人编码", example = "1")
@@ -239,4 +248,21 @@
    @ExcelColumn(name="入园事由")
    private String reason;

    @ApiModelProperty(value = "合同号")
    @ExcelColumn(name="合同号")
    private String contractNum;

    @ApiModelProperty(value = "预计到场时间")
    @ExcelColumn(name="预计到场时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date arriveDate;

    @ApiModelProperty(value = "入库类型 0整托盘 1件烟", example = "1")
    @ExcelColumn(name="入库类型 0整托盘 1件烟")
    private Integer inType;

    @ApiModelProperty(value = "总运输量", example = "1")
    @ExcelColumn(name="总运输量")
    private BigDecimal totalNum;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java

@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -14,12 +13,12 @@
/**
 * æœˆå°_作业操作历史表
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_作业操作历史表")
@TableName("`platform_log`")
public class PlatformLog  extends LoginUserModel {
public class PlatformLog {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -32,6 +31,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,6 +40,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -62,8 +63,8 @@
    @ExcelColumn(name="简介")
    private String content;

    @ApiModelProperty(value = "操作类型 0下发任务 1司机签到 2审核通过 3审批不通过 4叫号 5转交月台 6挂起 7司机进厂 8司机离厂 9作业作废取消 10作业完成", example = "1")
    @ExcelColumn(name="操作类型 0下发任务 1司机签到 2审核通过 3审批不通过 4叫号 5转交月台 6挂起 7司机进厂 8司机离厂 9作业作废取消 10作业完成")
    @ApiModelProperty(value = "操作类型 0任务创建 1司机确认任务 2司机签到 3入园等待 4月台叫号 5开始作业 6作业完成 7月台转移 8任务挂起 9下发授权离园 10离园", example = "1")
    @ExcelColumn(name="操作类型 0任务创建 1司机确认任务 2司机签到 3入园等待 4月台叫号 5开始作业 6作业完成 7月台转移 8任务挂起 9下发授权离园 10离园")
    private Integer objType;

    @ApiModelProperty(value = "关联对象编码")
@@ -78,4 +79,20 @@
    @ExcelColumn(name="操作后内容")
    private String afterContent;

    @ApiModelProperty(value = "参数1")
    @ExcelColumn(name="参数1")
    private String param1;

    @ApiModelProperty(value = "参数2")
    @ExcelColumn(name="参数2")
    private String param2;

    @ApiModelProperty(value = "参数3")
    @ExcelColumn(name="参数3")
    private String param3;

    @ApiModelProperty(value = "参数4")
    @ExcelColumn(name="参数4")
    private String param4;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java

@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -14,12 +13,12 @@
/**
 * æœˆå°_叫号排队信息表
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_叫号排队信息表")
@TableName("`platform_queue`")
public class PlatformQueue  extends LoginUserModel {
public class PlatformQueue {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -32,6 +31,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,6 +40,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -54,10 +55,6 @@
    @ExcelColumn(name="月台作业编码（关联platform_job)")
    private Integer jobId;

    @ApiModelProperty(value = "标题")
    @ExcelColumn(name="标题")
    private String title;

    @ApiModelProperty(value = "简介")
    @ExcelColumn(name="简介")
    private String content;
@@ -66,8 +63,8 @@
    @ExcelColumn(name="状态 0等待中 1叫号中 2作业中")
    private Integer status;

    @ApiModelProperty(value = "关联对象编码 0作业", example = "1")
    @ExcelColumn(name="关联对象编码 0作业")
    @ApiModelProperty(value = "关联对象编码 0月台作业", example = "1")
    @ExcelColumn(name="关联对象编码 0月台作业")
    private Integer objType;

    @ApiModelProperty(value = "关联对象编码", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java

@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -14,12 +13,12 @@
/**
 * æœˆå°_显示配置信息表
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_显示配置信息表")
@TableName("`platform_show_param`")
public class PlatformShowParam  extends LoginUserModel {
public class PlatformShowParam {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -32,6 +31,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,6 +40,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,79 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;

/**
 * æœˆå°_WMS作业通知单明细
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_WMS作业通知单明细")
@TableName("`platform_wms_detail`")
public class PlatformWmsDetail {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "行数据编码（关联platform_wms_job)", example = "1")
    @ExcelColumn(name="行数据编码（关联platform_wms_job)")
    private Integer jobId;

    @ApiModelProperty(value = "通知单号")
    @ExcelColumn(name="通知单号")
    private String iocode;

    @ApiModelProperty(value = "物料名称")
    @ExcelColumn(name="物料名称")
    private String materialName;

    @ApiModelProperty(value = "供应商")
    @ExcelColumn(name="供应商")
    private String inRepertotyCode;

    @ApiModelProperty(value = "计划收货数量", example = "1")
    @ExcelColumn(name="计划收货数量")
    private BigDecimal ioQty;

    @ApiModelProperty(value = "物料转换率")
    @ExcelColumn(name="物料转换率")
    private String rate;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,112 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;

/**
 * æœˆå°_WMS作业通知单行数据
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Data
@ApiModel("月台_WMS作业通知单行数据")
@TableName("`platform_wms_job`")
public class PlatformWmsJob {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "月台作业编码（关联platform_job)", example = "1")
    @ExcelColumn(name="月台作业编码（关联platform_job)")
    private Integer jobId;

    @ApiModelProperty(value = "通知单号")
    @ExcelColumn(name="通知单号")
    private String iocode;

    @ApiModelProperty(value = "作业类型  0入库 1出库", example = "1")
    @ExcelColumn(name="作业类型  0入库 1出库")
    private Integer type;

    @ApiModelProperty(value = "司机电话")
    @ExcelColumn(name="司机电话")
    private String driverPhone;

    @ApiModelProperty(value = "司机姓名")
    @ExcelColumn(name="司机姓名")
    private String driverName;

    @ApiModelProperty(value = "承运商")
    @ExcelColumn(name="承运商")
    private String carrierName;

    @ApiModelProperty(value = "承运单号")
    @ExcelColumn(name="承运单号")
    private String carryBillCode;

    @ApiModelProperty(value = "通知创建日期")
    @ExcelColumn(name="通知创建日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date ioCreatedate;

    @ApiModelProperty(value = "状态 0未处理 1已处理 2已取消", example = "1")
    @ExcelColumn(name="状态 0未处理 1已处理 2已取消")
    private Integer status;

    @ApiModelProperty(value = "取消时间")
    @ExcelColumn(name="取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date cancelDate;

    @ApiModelProperty(value = "取消备注")
    @ExcelColumn(name="取消备注")
    private String cancelInfo;

    @ApiModelProperty(value = "车牌号")
    @ExcelColumn(name="车牌号")
    private String plateNumber;

    @ApiModelProperty(value = "收货地")
    @ExcelColumn(name="收货地")
    private String repertotyAddress;

    @ApiModelProperty(value = "合同号`")
    @ExcelColumn(name="合同号`")
    private String contractNum;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/DateIntervalVO.java

@@ -28,4 +28,7 @@
    @ApiModelProperty(value = "是否占用")
    private Integer isUse;

    @ApiModelProperty(value = "用车记录主键")
    private Integer carUseBookId;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/InternalHomeVO.java

@@ -20,7 +20,7 @@
    private Long noticeDealNum;

    @ApiModelProperty(value = "我发起的待办数量")
    private Integer noticeCreateNum;
    private Long noticeCreateNum;

    @ApiModelProperty(value = "抄送的待办数量")
    private Long noticeCopyNum;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java

@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
@@ -17,6 +18,8 @@
 */
@Data
public class VisitDetailVO {
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    @ApiModelProperty(value = "审批状态")
    private Integer status;
@@ -76,6 +79,8 @@
    @ApiModelProperty(value = "审批信息数据")
    private ApproveDataVO approveDateVO;

    @ApiModelProperty(value = "证件类型 0身份证 1港澳证件 2护照", example = "1")
    private Integer idcardType;


}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -16,6 +16,7 @@
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
@@ -173,20 +174,13 @@
     * @param code
     * @return
     */
    WxAuthorizeVO wxAuthorize(String code);
    WxAuthorizeVO wxAuthorize(String code,Integer source);



    List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);


    /**
     * è´¦å·å¯†ç 
     * å†…部人员/劳务访客登录
     * @param accountLoginDTO
     * @return
     */
    WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO);

    /**
     * å†…部可拜访人员分页

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBooksService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformBooks;
import java.util.List;

/**
 * æœˆå°å…¥å›­é¢„约信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformBooksService {

    /**
     * åˆ›å»º
     * 
     * @param platformBooks å®žä½“对象
     * @return Integer
     */
    Integer create(PlatformBooks platformBooks);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param platformBooks å®žä½“对象
     */
    void delete(PlatformBooks platformBooks);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param platformBooks å®žä½“对象
     */
    void updateById(PlatformBooks platformBooks);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param platformBookss å®žä½“集
     */
    void updateByIdInBatch(List<PlatformBooks> platformBookss);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return PlatformBooks
     */
    PlatformBooks findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param platformBooks å®žä½“对象
     * @return PlatformBooks
     */
    PlatformBooks findOne(PlatformBooks platformBooks);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param platformBooks å®žä½“对象
     * @return List<PlatformBooks>
     */
    List<PlatformBooks> findList(PlatformBooks platformBooks);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<PlatformBooks>
     */
    PageData<PlatformBooks> findPage(PageWrap<PlatformBooks> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param platformBooks å®žä½“对象
     * @return long
     */
    long count(PlatformBooks platformBooks);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBroadcastLogService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformBroadcastLog;
import java.util.List;

/**
 * æœˆå°_LED和广播提醒下发记录Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformBroadcastLogService {

    /**
     * åˆ›å»º
     * 
     * @param platformBroadcastLog å®žä½“对象
     * @return Integer
     */
    Integer create(PlatformBroadcastLog platformBroadcastLog);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param platformBroadcastLog å®žä½“对象
     */
    void delete(PlatformBroadcastLog platformBroadcastLog);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param platformBroadcastLog å®žä½“对象
     */
    void updateById(PlatformBroadcastLog platformBroadcastLog);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param platformBroadcastLogs å®žä½“集
     */
    void updateByIdInBatch(List<PlatformBroadcastLog> platformBroadcastLogs);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return PlatformBroadcastLog
     */
    PlatformBroadcastLog findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param platformBroadcastLog å®žä½“对象
     * @return PlatformBroadcastLog
     */
    PlatformBroadcastLog findOne(PlatformBroadcastLog platformBroadcastLog);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param platformBroadcastLog å®žä½“对象
     * @return List<PlatformBroadcastLog>
     */
    List<PlatformBroadcastLog> findList(PlatformBroadcastLog platformBroadcastLog);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<PlatformBroadcastLog>
     */
    PageData<PlatformBroadcastLog> findPage(PageWrap<PlatformBroadcastLog> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param platformBroadcastLog å®žä½“对象
     * @return long
     */
    long count(PlatformBroadcastLog platformBroadcastLog);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformDeviceService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformDevice;
import java.util.List;

/**
 * æœˆå°_关联监控点LED和广播信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformDeviceService {

    /**
     * åˆ›å»º
     * 
     * @param platformDevice å®žä½“对象
     * @return Integer
     */
    Integer create(PlatformDevice platformDevice);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param platformDevice å®žä½“对象
     */
    void delete(PlatformDevice platformDevice);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param platformDevice å®žä½“对象
     */
    void updateById(PlatformDevice platformDevice);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param platformDevices å®žä½“集
     */
    void updateByIdInBatch(List<PlatformDevice> platformDevices);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return PlatformDevice
     */
    PlatformDevice findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param platformDevice å®žä½“对象
     * @return PlatformDevice
     */
    PlatformDevice findOne(PlatformDevice platformDevice);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param platformDevice å®žä½“对象
     * @return List<PlatformDevice>
     */
    List<PlatformDevice> findList(PlatformDevice platformDevice);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<PlatformDevice>
     */
    PageData<PlatformDevice> findPage(PageWrap<PlatformDevice> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param platformDevice å®žä½“对象
     * @return long
     */
    long count(PlatformDevice platformDevice);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java

@@ -8,7 +8,7 @@
/**
 * æœˆå°_分组信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformGroupService {


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformInterfaceLogService.java

@@ -8,7 +8,7 @@
/**
 * ä½œä¸šè°ƒåº¦å¹³å°æŽ¥å£äº¤äº’记录Service定义
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformInterfaceLogService {

@@ -94,6 +94,4 @@
     * @return long
     */
    long count(PlatformInterfaceLog platformInterfaceLog);

    void clearThreeMonthLog();
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java

@@ -8,7 +8,7 @@
/**
 * æœˆå°è°ƒåº¦ä½œä¸šä¿¡æ¯è¡¨Service定义
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformJobService {


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformLogService.java

@@ -8,7 +8,7 @@
/**
 * æœˆå°_作业操作历史表Service定义
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformLogService {


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformQueueService.java

@@ -8,7 +8,7 @@
/**
 * æœˆå°_叫号排队信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformQueueService {


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java

@@ -8,7 +8,7 @@
/**
 * æœˆå°ä¿¡æ¯è¡¨Service定义
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformService {


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java

@@ -8,7 +8,7 @@
/**
 * æœˆå°_显示配置信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
public interface PlatformShowParamService {


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsDetailService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformWmsDetail;
import java.util.List;

/**
 * æœˆå°_WMS作业通知单明细Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformWmsDetailService {

    /**
     * åˆ›å»º
     * 
     * @param platformWmsDetail å®žä½“对象
     * @return Integer
     */
    Integer create(PlatformWmsDetail platformWmsDetail);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param platformWmsDetail å®žä½“对象
     */
    void delete(PlatformWmsDetail platformWmsDetail);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param platformWmsDetail å®žä½“对象
     */
    void updateById(PlatformWmsDetail platformWmsDetail);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param platformWmsDetails å®žä½“集
     */
    void updateByIdInBatch(List<PlatformWmsDetail> platformWmsDetails);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return PlatformWmsDetail
     */
    PlatformWmsDetail findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param platformWmsDetail å®žä½“对象
     * @return PlatformWmsDetail
     */
    PlatformWmsDetail findOne(PlatformWmsDetail platformWmsDetail);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param platformWmsDetail å®žä½“对象
     * @return List<PlatformWmsDetail>
     */
    List<PlatformWmsDetail> findList(PlatformWmsDetail platformWmsDetail);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<PlatformWmsDetail>
     */
    PageData<PlatformWmsDetail> findPage(PageWrap<PlatformWmsDetail> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param platformWmsDetail å®žä½“对象
     * @return long
     */
    long count(PlatformWmsDetail platformWmsDetail);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsJobService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.PlatformWmsJob;
import java.util.List;

/**
 * æœˆå°_WMS作业通知单行数据Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
public interface PlatformWmsJobService {

    /**
     * åˆ›å»º
     * 
     * @param platformWmsJob å®žä½“对象
     * @return Integer
     */
    Integer create(PlatformWmsJob platformWmsJob);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param platformWmsJob å®žä½“对象
     */
    void delete(PlatformWmsJob platformWmsJob);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param platformWmsJob å®žä½“对象
     */
    void updateById(PlatformWmsJob platformWmsJob);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param platformWmsJobs å®žä½“集
     */
    void updateByIdInBatch(List<PlatformWmsJob> platformWmsJobs);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return PlatformWmsJob
     */
    PlatformWmsJob findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param platformWmsJob å®žä½“对象
     * @return PlatformWmsJob
     */
    PlatformWmsJob findOne(PlatformWmsJob platformWmsJob);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param platformWmsJob å®žä½“对象
     * @return List<PlatformWmsJob>
     */
    List<PlatformWmsJob> findList(PlatformWmsJob platformWmsJob);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<PlatformWmsJob>
     */
    PageData<PlatformWmsJob> findPage(PageWrap<PlatformWmsJob> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param platformWmsJob å®žä½“对象
     * @return long
     */
    long count(PlatformWmsJob platformWmsJob);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java

@@ -9,6 +9,7 @@
import com.doumee.dao.web.reqeust.VisitRecordDTO;
import com.doumee.dao.web.response.VisitDetailVO;
import com.doumee.dao.web.response.VisitRecordVO;
import io.swagger.models.auth.In;

import java.util.List;

@@ -27,7 +28,7 @@
     */
    Integer create(Visits visits);

    Integer createFk(Visits visits,Boolean isERP);
    Integer createFk(Visits visits, Boolean isERP, Integer source);

    /**
     * è®¿å®¢æŠ¥å¤‡

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java

@@ -53,7 +53,7 @@
     * @param accessSecret
     * @return
     */
    AccessTokenResponse createERPToken(String accessKey, String accessSecret);
//    AccessTokenResponse createERPToken(String accessKey, String accessSecret);


    /**

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -1,7 +1,6 @@
package com.doumee.service.business.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -37,6 +36,7 @@
import org.apache.xpath.operations.Bool;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -258,17 +258,19 @@
                                &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
                        ).count()
                );
                //已处理数据
                internalHomeVO.setNoticeDealNum(
                        noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
                                &&StringUtils.equals(i.getParam4(),i.getUserId().toString())
                                &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
                                &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
                        ).count()
                );

                //我发起的数据
                internalHomeVO.setNoticeCreateNum(
                        noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
                );

                //抄送我的数据
                internalHomeVO.setNoticeCopyNum(
                        noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
                                &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
@@ -291,7 +293,8 @@
                        .ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ))
                        .le(noticesDTO.getEndDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ))
                        .eq(noticesDTO.getType() != null,  Notices::getType, noticesDTO.getType())
                        .eq(Notices::getUserId,noticesDTO.getMemberId()).orderByDesc(Notices::getCreateDate)
                        .eq(Notices::getUserId,noticesDTO.getMemberId())
                        .orderByDesc(Notices::getCreateDate)
                );
        internalHomeVO.setTaskNum(noticesList.size());
        if(CollectionUtils.isNotEmpty(noticesList)){
@@ -374,7 +377,8 @@
        if(CollectionUtils.isNotEmpty(approveCopyList)){
            this.organizeApproveCopyData(approveTempl,approveParamList,businessId,approveList);
        }
        approveMapper.insertBatchSomeColumn(approveList);
        approveJoinMapper.insert(approveList);
//        approveJoinMapper.insert(approveList);

    }

@@ -396,6 +400,7 @@
        createUserApprove.setIsdeleted(Constants.ZERO);
        createUserApprove.setTemplatId(approveTempl.getId());
        createUserApprove.setChekorId(createMember.getId());
        createUserApprove.setCheckDate(createUserApprove.getCreateDate());
        createUserApprove.setStatus(Constants.approveStatus.pass);
        createUserApprove.setTitle("发起申请");
        createUserApprove.setStatusInfo("");
@@ -467,6 +472,7 @@
                approve.setChekorId(memberId);
                approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
                approve.setStatusInfo(i==0?"审批中":"待审批");
                approve.setTitle("审批人");
                approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
                approve.setObjId(businessId);
                approve.setLevel(i+1);
@@ -549,18 +555,18 @@
            if(CollectionUtils.isNotEmpty(memberList)){
                userIds.addAll(memberList.stream().map(m->m.getId()).collect(Collectors.toList()));
            }
            //公务用车 é»˜è®¤åŠ å…¥ å¸æœºæŠ„送
            if(approveTempl.getType()==Constants.THREE||approveTempl.getType()==Constants.FOUR){
                CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
                if(Objects.isNull(carUseBook)){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"为查询到用车申请信息");
                }
                CarDriver carDriver = carDriverMapper.selectById(carUseBook.getDriverId());
                if(Objects.isNull(carDriver)){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"为查询到司机信息");
                }
                userIds.add(carDriver.getMemberId());
            }
            //公务用车 é»˜è®¤åŠ å…¥ å¸æœºæŠ„送  2024å¹´6月28日16:49:08 å¸æœºæŠ„送修改到 å®¡æ‰¹ä¸šåŠ¡æ—¶è¿›è¡Œå‘送
//            if(approveTempl.getType()==Constants.THREE||approveTempl.getType()==Constants.FOUR){
//                CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
//                if(Objects.isNull(carUseBook)){
//                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"为查询到用车申请信息");
//                }
//                CarDriver carDriver = carDriverMapper.selectById(carUseBook.getDriverId());
//                if(Objects.isNull(carDriver)){
//                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"为查询到司机信息");
//                }
//                userIds.add(carDriver.getMemberId());
//            }

            if(CollectionUtils.isNotEmpty(userIds)){
                for (Integer memberId:userIds) {
@@ -684,11 +690,6 @@
            for(Approve level:levelList){
                List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
                approveDateVO.getApproveList().addAll(tlist);
                if(tlist.size() ==0
                        ||Constants.equalsInteger(Constants.approveStatus.unPass,  tlist.get(0).getStatus())
                        ||Constants.equalsInteger(Constants.approveStatus.cancel,  tlist.get(0).getStatus())){
                    break;
                }
            }
        }

@@ -702,6 +703,7 @@
            waitModel.setApproveList(copyList);
            approveDateVO.getApproveList().add(waitModel);
        }
        System.out.println(JSONObject.toJSONString(approveDateVO));
        return approveDateVO;
    }

@@ -748,6 +750,9 @@
                        ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
                    waitModel.setMemberName(waitList.size() +"人会签");
                }
                if(CollectionUtils.isNotEmpty(waitList)){
                    waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate());
                }
                waitModel.setApproveList(waitList);
                list.add(waitModel);
            }else if(waitList.size()>0){
@@ -775,19 +780,17 @@
                if(passList.size()>0){
                    approveList.addAll(otherPassList);
                }
                waitModel.setMemberName("已抄送"+ approveList.size() +"人");
                if(CollectionUtils.isNotEmpty(approveList)){
                    waitModel.setCreateDate(approveList.get(Constants.ZERO).getCreateDate());
                }
                if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.pass)){
                    waitModel.setMemberName("已抄送"+ approveList.size() +"人");
                }else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
                    waitModel.setMemberName("处理中");
                }
                waitModel.setApproveList(approveList);
                list.add(waitModel);
            }
            //如果是或签
//            if(otherPassList.size()>0){
//                Approve waitModel = new Approve();
//                waitModel.setApproveType(Constants.ONE);
//                waitModel.setStatusInfo(StringUtils.defaultString(level.getTitle(),"审批人")+"（抄送或签审批人）");
//                waitModel.setStatus(Constants.ONE);
//                waitModel.setApproveList(otherPassList);
//                list.add(waitModel);
//            }
        }


@@ -810,7 +813,7 @@
            }else if(Constants.equalsInteger(Constants.approveStatus.auditIng,approve.getStatus())||Constants.equalsInteger(Constants.approveStatus.wait,approve.getStatus())){
                waitList.add(approve);
            }else if(Constants.equalsInteger(Constants.approveStatus.unPass,approve.getStatus())){
                refuseModel = approve;
                BeanUtils.copyProperties(approve,refuseModel);
            }
        }
    }
@@ -1003,6 +1006,7 @@
                .eq(Notices::getUserId,approve.getChekorId())
                .eq(Notices::getSendacopy,Constants.ZERO)
                .eq(Notices::getIsdeleted,Constants.ZERO)
                .last(" limit 1 ")
        );
        if(Objects.isNull(notices)){
            log.info("未查询到通知记录");
@@ -1014,7 +1018,7 @@
        approve.setCheorId(approveDTO.getLoginUserInfo().getMemberId().toString());
        approve.setCheckorName(approveDTO.getLoginUserInfo().getRealname());
        approve.setCheckDate(new Date());
        approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"已同意":approveDTO.getCheckInfo());
        approve.setStatusInfo(approveDTO.getStatus()==Constants.TWO?"已同意":"已驳回");
        //本级所有 å¾…审批记录
        List<Approve> approveList = approveJoinMapper.selectJoinList(Approve.class,
                new MPJLambdaWrapper<Approve>()
@@ -1042,10 +1046,12 @@
        Boolean dealBusinessBean = false;
        //审批驳回情况
        if(approveDTO.getStatus().equals(Constants.THREE)){
            dealBusinessBean = true;
            //修改其他所有待审批和审批中记录数据
            approveJoinMapper.update(null,new UpdateWrapper<Approve>()
                    .lambda()
                    .set(Approve::getStatus,Constants.approveStatus.otherUnPass)
                    .set(Approve::getCheckDate,new Date())
                    .in(Approve::getStatus,Constants.approveStatus.auditIng,Constants.approveStatus.wait)
                    .eq(Approve::getObjId,approve.getObjId())
                    .eq(Approve::getObjType,approve.getObjType())
@@ -1055,8 +1061,10 @@
                //修改自己的通知记录
                noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
                        .set(Notices::getEditDate,new Date())
                        .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
                        .set(Notices::getReaded,Constants.ONE)
                        .set(Notices::getParam2,approve.getStatus())
                        .set(Notices::getParam2,Constants.TWO)
                        .set(Notices::getStatus,Constants.ONE)
                        .eq(Notices::getId,notices.getId())
                );
                //修改 æœªå¤„理的 é€šçŸ¥æ•°æ® ä¸ºæŠ„送
@@ -1064,7 +1072,8 @@
                    noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
                            .set(Notices::getEditDate,new Date())
                            .set(Notices::getSendacopy,Constants.ONE)
                            .set(Notices::getParam2,approve.getStatus())
                            .set(Notices::getStatus,Constants.ONE)
                            .set(Notices::getParam2,Constants.TWO)
                            .eq(Notices::getObjId,notices.getObjId())
                            .eq(Notices::getObjType,notices.getObjType())
                            .eq(Notices::getReaded,Constants.ZERO)
@@ -1072,34 +1081,45 @@
                    );
                }
            }
            return;
        }else{
            //处理其他业务数据
            if((Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)
                    || Constants.equalsInteger( approve.getApproveType(),Constants.TWO)) && Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)){
                //或签 / å•äººå®¡ ä¸” ç»ˆå®¡
                approveJoinMapper.update(null,new UpdateWrapper<Approve>()
                        .lambda()
                        .set(Approve::getStatus,Constants.approveStatus.otherDeal)
                        .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
                if(CollectionUtils.isNotEmpty(approveList)){
                    approveJoinMapper.update(null,new UpdateWrapper<Approve>()
                            .lambda()
                            .set(Approve::getStatus,Constants.approveStatus.otherDeal)
                            .set(Approve::getCheckDate,new Date())
                            .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
                }
                dealBusinessBean = true;
            }else if((approve.getApproveType().equals(Constants.ZERO)
                    || approve.getApproveType().equals(Constants.TWO)) &&approve.getIsEndCheck()!=Constants.ONE){
                //或签 / å•äººå®¡ éžç»ˆå®¡ åˆ™å¼€å¯ä¸‹ä¸€æ­¥ä¸šåŠ¡æµç¨‹
                /**处理本级数据**/
                approveJoinMapper.update(null,new UpdateWrapper<Approve>()
                        .lambda()
                        .set(Approve::getStatus,Constants.approveStatus.otherDeal)
                        .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
                if(CollectionUtils.isNotEmpty(approveList)){
                    approveJoinMapper.update(null,new UpdateWrapper<Approve>()
                            .lambda()
                            .set(Approve::getStatus,Constants.approveStatus.otherDeal)
                            .set(Approve::getCheckDate,new Date())
                            .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
                }
                /**开启下一级别的数据为待审核**/
                approveJoinMapper.update(null,new UpdateWrapper<Approve>()
                        .lambda()
                        .set(Approve::getStatus,Constants.approveStatus.auditIng)
                        .set(Approve::getTitle,"审批人")
                        .set(Approve::getCheckDate,new Date())
                        .eq(Approve::getStatus,Constants.approveStatus.wait)
                        .eq(Approve::getObjId,approve.getObjId())
                        .eq(Approve::getObjType,approve.getObjType())
                        .eq(Approve::getLevel,(approve.getLevel()+1))
                );
                if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
                        Constants.approveObjectType.unCityUseCar)){
                    this.updDriver(approveDTO,approve,false);
                }
            }else if(approve.getApproveType().equals(Constants.ONE)){
                //会签 ä¸”终审
                //无他人审批的情况 åˆ™ä¿®æ”¹æ•°æ®çŠ¶æ€
@@ -1107,7 +1127,7 @@
                    dealBusinessBean = true;
                }
            }
            this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList);
            this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
        }
        //处理业务数据
        if(dealBusinessBean){
@@ -1121,12 +1141,14 @@
     * @param approve  å®¡æ‰¹è®°å½•
     * @param approveList  åŒçº§å¾…审批数据
     */
    public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList){
    public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO){
        //1、修改自己的数据记录
        noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
                .set(Notices::getEditDate,new Date())
                .set(Notices::getReaded,Constants.ONE)
                .set(dealBusinessBean,Notices::getParam2,approve.getStatus())
                .set(Notices::getStatus,Constants.ONE)
                .set(dealBusinessBean,Notices::getParam2,Constants.ONE)
                .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
                .eq(Notices::getId,notices.getId())
        );
        if(Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)){
@@ -1136,7 +1158,9 @@
                    .set(Notices::getEditDate,new Date())
                    .set(Notices::getReaded,Constants.ONE)
                    .set(Notices::getSendacopy,Constants.ONE)
                    .set(dealBusinessBean,Notices::getParam2,approve.getStatus())
                    .set(Notices::getStatus,Constants.ONE)
                    .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
                    .set(dealBusinessBean,Notices::getParam2,Constants.ONE)
                    .eq(Notices::getObjId,notices.getObjId())
                    .eq(Notices::getObjType,notices.getObjType())
                    .ne(Notices::getId,notices.getId())
@@ -1198,7 +1222,7 @@
                .eq(Approve::getType,Constants.ZERO)
                .eq(Approve::getLevel,(approve.getLevel() + Constants.ONE))
        );
        if(CollectionUtils.isNotEmpty(nextApproveList)){
        if(CollectionUtils.isEmpty(nextApproveList)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"审批流数据异常");
        }
        Notices newNotices = new Notices();
@@ -1238,23 +1262,7 @@
            visitsMapper.updateById(visits);
        }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
                Constants.approveObjectType.unCityUseCar)){
            // å¸‚内外用车申请
            CarUseBook carUseBook = carUseBookMapper.selectById(approveDTO.getObjId());
            if(Objects.isNull(carUseBook)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到用车记录");
            }
            carUseBook.setStatus(approveDTO.getStatus());
            carUseBook.setEditDate(new Date());
            carUseBook.setEditor(approveDTO.getLoginUserInfo().getMemberId());
            //如果配置修改司机 ä¸” å…¥å‚了更换后司机信息
            if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
                CarDriver carDriver = carDriverMapper.selectById(approveDTO.getDriverId());
                if(Objects.isNull(carDriver)){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到司机信息");
                }
                carUseBook.setDriverId(carDriver.getId());
            }
            carUseBookMapper.updateById(carUseBook);
            this.updDriver(approveDTO,approve,true);
        }else if(approveDTO.getObjType().equals(Constants.approveObjectType.logisticsCarUse)){
            //TODO  ç‰©æµè½¦é¢„约

@@ -1264,4 +1272,34 @@
    }


    public void updDriver(ApproveDTO approveDTO,Approve approve,Boolean dealBusinessBean){
        // å¸‚内外用车申请
        CarUseBook carUseBook = carUseBookMapper.selectById(approveDTO.getObjId());
        if(Objects.isNull(carUseBook)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到用车记录");
        }
        if(dealBusinessBean){
            carUseBook.setStatus(approveDTO.getStatus());
        }else{
            if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
                carUseBook.setStatus(Constants.ONE);
            }
        }
        carUseBook.setEditDate(new Date());
        carUseBook.setEditor(approveDTO.getLoginUserInfo().getMemberId());
        //如果配置修改司机 ä¸” å…¥å‚了更换后司机信息
        if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
            CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
                    .eq(CarDriver::getIsdeleted,Constants.ZERO)
                    .eq(CarDriver::getStatus,Constants.ZERO)
                    .eq(CarDriver::getMemberId,approveDTO.getDriverId()));
            if(Objects.isNull(carDriver)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到司机信息");
            }
             carUseBook.setDriverId(carDriver.getMemberId());
        }
        carUseBookMapper.updateById(carUseBook);
    }


}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java

@@ -9,10 +9,8 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveParamDataVO;
import com.doumee.service.business.ApproveTemplService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -28,8 +26,6 @@

import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * å®¡æ‰¹æ¨¡ç‰ˆä¿¡æ¯è¡¨Service实现
@@ -94,7 +90,7 @@
            approveParamMapper.delete(new UpdateWrapper<ApproveParam>().lambda()
                    .eq(ApproveParam::getTemplId,template.getId()));
            //批量插入新的配置
            approveParamMapper.insertBatchSomeColumn(model.getParamList());
            approveParamMapper.insert(model.getParamList());
        }
        return 1;
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java

@@ -29,6 +29,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.time.LocalDateTime;
@@ -75,13 +76,13 @@


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public Integer create(CarUseBook carUseBook)  throws Exception {
        if(Objects.isNull(carUseBook)
            || Objects.isNull(carUseBook.getCarId())
                || Objects.isNull(carUseBook.getStartTime())
                || Objects.isNull(carUseBook.getEndTime())
                || Objects.isNull(carUseBook.getCreator())
                || Objects.isNull(carUseBook.getMemberId())
                || Objects.isNull(carUseBook.getPlanUseDate())
                || Objects.isNull(carUseBook.getType())
                || StringUtils.isEmpty(carUseBook.getMemberIds())
@@ -90,6 +91,9 @@
                || StringUtils.isEmpty(carUseBook.getAddr())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(Objects.nonNull(carUseBook.getCreator())&&Objects.isNull(carUseBook.getMemberId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前登录用户无法进行该操作!");
        }
        if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"选择日期异常[结束时间小于当前时间],请刷新重试");
@@ -106,6 +110,7 @@
        if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"车辆信息异常");
        }
        carUseBook.setCarCode(cars.getCode());
        //根据车辆查询司机信息
        CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
                .eq(CarDriver::getCarId,cars.getId())
@@ -204,6 +209,7 @@
                }
            }
            approve.setCheckInfo(model.getCancelInfo());
            approve.setCheckDate(model.getCancelTime());
            approveList.add(approve);
        }
        model.setApproveDateVO(approveDataVO);
@@ -368,28 +374,29 @@
                        .or().like(CarUseBook::getEndTime,dateDay)
                        .or().apply("  START_TIME < '"+dateDay+" 00:00:00' and END_TIME  > '"+dateDay+" 23:59:59'  "))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
            for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
                //判断时间是否大于当前
                if(DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
                    dateIntervalVO.setIsUse(Constants.ONE);
                    continue;
                }
        for (DateIntervalVO dateIntervalVO:dateIntervalVOList) {
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carUseBookList)){
                for (CarUseBook i:carUseBookList  ) {
                    if(
                        (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() <= i.getStartTime().getTime() &&
                                i.getStartTime().getTime() < DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
                        ||
                        (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() < i.getEndTime().getTime() &&
                                i.getEndTime().getTime() <= DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
                        ||
                        (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() &&
                                        DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime())
                            (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() <= i.getStartTime().getTime() &&
                                    i.getStartTime().getTime() < DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
                                    ||
                                    (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() < i.getEndTime().getTime() &&
                                            i.getEndTime().getTime() <= DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime())
                                    ||
                                    (DateUtil.getDateFromString(dateIntervalVO.getStartTime()).getTime() >= i.getStartTime().getTime() &&
                                            DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime() <= i.getEndTime().getTime())
                    ){
                        dateIntervalVO.setCarUseBookId(i.getId());
                        dateIntervalVO.setIsUse(Constants.ONE);
                        break;
                    }
                }
            }
            //判断时间是否大于当前
            if(Constants.equalsInteger(dateIntervalVO.getIsUse(),Constants.ZERO)  && DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
                dateIntervalVO.setIsUse(Constants.ONE);
                continue;
            }
        }
        return dateIntervalVOList;
@@ -433,7 +440,7 @@
       carUseBook.setCancelTime(new Date());
       carUseBook.setCancelStatus(Constants.ONE);
       carUseBook.setStatus(Constants.FOUR);
       carUseBook.setCancelUser(loginUserInfo.getId());
       carUseBook.setCancelUser(loginUserInfo.getMemberId());
       carUseBook.setCancelType(Constants.ONE);
       if(loginUserInfo.getId().equals(carUseBook.getCreator())){
           carUseBook.setCancelType(Constants.ZERO);

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -292,7 +292,8 @@
             if(companyJoinMapper.selectCount(new QueryWrapper<Company>().lambda()
                     .eq(Company::getIsdeleted,Constants.ZERO )
                     .eq(Company::getType,Constants.ONE )
                     .likeRight(Company::getCompanyPath,company.getCompanyPath())) >0){
                     .ne(Company::getId,model.getId())
                     .likeRight(Company::getCompanyPath,model.getCompanyPath())) >0){
                 throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "对不起，下级部门存在内部组织，该部门不支持切换为相关方组织！~");
             }
        }
@@ -576,7 +577,7 @@
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
        queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(type!=null,Company::getType,type);
        queryWrapper.orderByAsc(Company::getSortnum );
        queryWrapper.orderByAsc(true,"t.sortnum");
        List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
        //配置组员人员类型来源方式 0自建 1ERP
        CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());
@@ -618,7 +619,8 @@
            if (currentMenuIndex - 1 < 0) {
                return;
            }
            Company preMenu = companyPool.remove(currentMenuIndex - 1);
            Company preMenu = companyPool.get(currentMenuIndex - 1);
            companyPool.remove(currentMenuIndex - 1);
            companyPool.add(currentMenuIndex, preMenu);
        }
        // ä¸‹ç§»

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java

@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * éšæ‚£åŒºåŸŸé…ç½®ç±»åž‹ä¿¡æ¯è¡¨Service实现
@@ -45,6 +46,13 @@
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = model.getLoginUserInfo();
        }
        if(hiddenDangerParamMapper.selectCount(new QueryWrapper<HiddenDangerParam>().lambda()
                .eq(HiddenDangerParam::getType,model.getType())
                .eq(HiddenDangerParam::getName,model.getName())
                .eq(HiddenDangerParam::getIsdeleted,Constants.ZERO)
        )>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该名称已存在!");
        }
        if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
            //如果是区域配置
@@ -120,6 +128,14 @@
        HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(model.getId());
        if(hiddenDangerParam == null || Constants.equalsInteger(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该配置信息不存在，请返回刷新页面重试！");
        }
        if(hiddenDangerParamMapper.selectCount(new QueryWrapper<HiddenDangerParam>().lambda()
                .eq(HiddenDangerParam::getType,model.getType())
                .eq(HiddenDangerParam::getName,model.getName())
                .eq(HiddenDangerParam::getIsdeleted,Constants.ZERO)
                .ne(HiddenDangerParam::getId,model.getId())
        )>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该名称已存在!");
        }
        if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
            //如果是区域配置,校验安全员信息是否正确
@@ -228,8 +244,12 @@
    }
    @Override
    public   List<Member> findHiddenAreaMemberList(HiddenDangerParam pageWrap) {
        QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(pageWrap);
        pageWrap.setIsdeleted(Constants.ZERO);
        HiddenDangerParam hiddenDangerParam = new HiddenDangerParam();
        hiddenDangerParam.setIsdeleted(Constants.ZERO);
        if(Objects.nonNull(pageWrap.getId())){
            hiddenDangerParam.setId(pageWrap.getId());
        }
        QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
        List<HiddenDangerParam> list = hiddenDangerParamMapper.selectList(wrapper);
        List<Member> memberList = new ArrayList<>();
        if(list!=null){
@@ -252,6 +272,7 @@
                        .leftJoin(Company.class, Company::getId,Member::getCompanyId)
                        .eq(Member::getType,Constants.TWO)
                        .eq(Member::getIsdeleted,Constants.ZERO)
                        .like(StringUtils.isNotBlank(pageWrap.getName()),Member::getName,pageWrap.getName())
                        .in(Member::getId,idList)
                );
            }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -84,6 +84,7 @@
        if(Objects.isNull(hiddenDangerParam)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患区域");
        }

        HiddenDangerParam hiddenDangerCate = hiddenDangerParamMapper.selectById(hiddenDanger.getCateId());
        if(Objects.isNull(hiddenDangerCate)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患类型");
@@ -317,6 +318,7 @@
                .eq(pageWrap.getModel().getCheckInfo() != null, HiddenDanger::getCheckInfo, pageWrap.getModel().getCheckInfo())
                .eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId())
                .eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName())
                .like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName())

                .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                        .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
@@ -448,7 +450,7 @@
            }
        }
        if(fileList.size()>0){
            multifileMapper.insertBatchSomeColumn(fileList);
            multifileMapper.insert(fileList);
        }
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -2,6 +2,7 @@

import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -9,8 +10,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -64,10 +63,12 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -128,6 +129,9 @@
    @Lazy
    private SmsEmailService smsEmailService;

    @Autowired
    private SystemLoginService systemLoginService; 
    
    @Value("${debug_model}")
    private Boolean isDebug;
    @Override
@@ -458,11 +462,12 @@
            systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
                            .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
                            .set(SystemUser::getUpdateTime,new Date())
                            .set(StringUtils.isNotBlank(model.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
                            .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
                            .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
                            .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
                            .set(StringUtils.isNotBlank(model.getCode()),SystemUser::getEmpNo,member.getCode())
                            .set(StringUtils.isNotBlank(member.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
                            .set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getMobile,member.getPhone())
                            .set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getUsername,member.getPhone())
                            .set(StringUtils.isNotBlank(member.getName()),SystemUser::getRealname,member.getName())
                            .set(member.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
                            .set(StringUtils.isNotBlank(member.getCode()),SystemUser::getEmpNo,member.getCode())
                    .eq(SystemUser::getMemberId,model.getId()));
        }
        if(Constants.equalsInteger(model.getCompanyType(),Constants.ZERO)
@@ -739,7 +744,7 @@
                    memberRole.setRoleId(deviceRole.getId());
                    memberRoleList.add(memberRole);
                }
                memberRoleMapper.insertBatchSomeColumn(memberRoleList);
                memberRoleMapper.insert(memberRoleList);
            }
            member.setRoleId(ids);
            return  1;
@@ -803,8 +808,8 @@
        }
        for (Integer id:ids) {
            Member member = memberMapper.selectById(id);
            if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
                member.setStatus(Constants.TWO);
            if(!Objects.isNull(member)&&member.getStatus()!=Constants.TWO){
                member.setStatus(Constants.TWO);//恢复正常状态
                member.setEditor(loginUserInfo.getId());
                member.setEditDate(new Date());
                member.setAuthStatus(Constants.ZERO);//未授权
@@ -814,7 +819,6 @@
                member.setEditor(loginUserInfo.getId());
                //删除员工门禁权限
                cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);

                if(Constants.equalsInteger(type,Constants.ONE)){
                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper,JSONObject.toJSONString(member));
                }
@@ -838,8 +842,8 @@
        }
        for (Integer id:ids) {
            Member member = memberMapper.selectById(id);
            if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
                member.setStatus(Constants.ONE);//恢复正常状态
            if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
                member.setStatus(Constants.ZERO);//恢复正常状态
                member.setEditor(loginUserInfo.getId());
                member.setEditDate(new Date());
                member.setAuthStatus(Constants.ZERO);//未授权
@@ -935,7 +939,7 @@
        userAction.setType(type.getKey());
        userAction.setContent(content);
        String info = type.getInfo();
        userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"系统").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
        userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"系统").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate()!=null?updateMember.getEditDate():new Date())));
        userAction.setMemberId(updateMember.getId()+"");
        userActionMapper.insert(userAction);
    }
@@ -1112,6 +1116,7 @@
            queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
        List<Member> list =  memberJoinMapper.selectJoinList(Member.class,queryWrapper);
//        if(list!=null){
//            for(Member m : list){
@@ -1159,7 +1164,6 @@
        if(pageWrap.getModel().getType() != null){
            if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
                queryWrapper.select(" * , (select v.COMPANY_NAME  from visits v where v.MEMBER_ID =  member.id and v.STATUS = 2   order by v.CREATE_DATE desc limit 1 ) as companyName  , " +
                        " (select v.STARTTIME  from visits v where v.MEMBER_ID =  member.id and v.STATUS = 2   order by v.CREATE_DATE desc limit 1 )  as lastVisitDate , " +
                        " (select count(1) from visits v where v.MEMBER_ID =  member.id and v.STATUS = 2 ) as visitTimes  ");
            }
        }
@@ -1470,12 +1474,11 @@
    public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        int actiontype =Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE)?Constants.UserActionType.BLACKLIST.getKey():Constants.UserActionType.FREEZE.getKey();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
                .select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0  order by ua.CREATE_DATE desc  limit 1) as optTime")
                .select(" (select s.REALNAME from user_action uac left join system_user s on uac.CREATOR = s.ID    where uac.MEMBER_ID=t.id and uac.ISDELETED=0 order by uac.CREATE_DATE desc  limit 1) as creatorName")
                .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE desc  limit 1) as visitsLastDate")
                .selectAs(Company::getCompanyNamePath,Member::getCompanyName)
                .select(" (select ua.remark from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0 and ua.type="+actiontype+"  order by ua.CREATE_DATE desc  limit 1) as optRemark")
                .eq(Member::getIsdeleted,Constants.ZERO);
                queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCreaterId()),Member::getEditor,pageWrap.getModel().getCreaterId());
                queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Member::getType,pageWrap.getModel().getType());
@@ -1553,7 +1556,7 @@
                        list.add(model);
                    }
                    //导入新增的授权信息
                    empowerMapper.insertBatchSomeColumn(list);
                    empowerMapper.insert(list);
                }
            }
        }
@@ -1623,16 +1626,19 @@
     * @return
     */
    @Override
    public WxAuthorizeVO wxAuthorize(String code){
    public WxAuthorizeVO wxAuthorize(String code, Integer source){
        if(StringUtils.isBlank(code)||Objects.isNull(source)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
        String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
        String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
                .replace("APPID", appId).replace("SECRET", appSecret);
        JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
        String openId = null;
        if(!Objects.isNull(tokenJson.get("access_token"))){
            openId = tokenJson.getString("openid");
        }
//        JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
        String openId = code;
//        if(!Objects.isNull(tokenJson.get("access_token"))){
//            openId = tokenJson.getString("openid");
//        }
//        String openId = "12345";
        WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
        wxAuthorizeVO.setOpenid(openId);
@@ -1642,6 +1648,7 @@
                .selectAs(Company::getName,Member::getCompanyName)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Member::getOpenid,openId)
                .eq(Member::getType,source)
                .eq(Member::getIsdeleted,Constants.ZERO)
                .orderByDesc(Member::getCreateDate)
                .last(" limit 1 ")
@@ -1660,12 +1667,16 @@
            String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            member.setPrefixUrl(prefixUrl);
//            JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
//            String token = JwtTokenUtil.generateToken(payLoad);
//            //存储token至redis
//            RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
//            wxAuthorizeVO.setToken(token);
            wxAuthorizeVO.setMember(member);
            //司机 ä¸Ž å†…部人员 æä¾›token
            if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
                SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
                        .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
                if(Objects.nonNull(systemUser)){
                    String token = systemLoginService.loginByUserId(systemUser.getId());
                    wxAuthorizeVO.setToken(token);
                }
            }
        }
        return wxAuthorizeVO;
    }
@@ -1736,51 +1747,6 @@



    @Override
    public WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO){
        System.out.println(DESUtil.decrypt(Constants.EDS_PWD,"eIaPD5AR5DBuTBE9MW14QRG07IDKXCdh"));
        if(accountLoginDTO.getAccount().length()!=18
            //&&!IdcardUtil.isValidCard(accountLoginDTO.getAccount())
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证号码有误，请核实后重试！");
        }
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                .eq(Member::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, accountLoginDTO.getAccount()))
                .ne(Member::getType,Constants.memberType.visitor)
        );
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到用户,请联系管理员");
        }
        if(member.getIsdeleted() == Constants.ONE){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
        }
        if(member.getStatus() != Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
        }
        String md5Password = DESUtil.encrypt(Constants.EDS_PWD, accountLoginDTO.getPassword());
        if(!md5Password.equals(member.getPassward())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"账户密码错误!");
        }
        if(StringUtils.isNotBlank(accountLoginDTO.getOpenId())){
            //先清空原有访客的openid绑定关系
            memberMapper.update(null, new UpdateWrapper<Member>().lambda()
                    .ne(Member::getType,Constants.memberType.visitor)
                    .eq(Member::getOpenid,accountLoginDTO.getOpenId())
                    .set(Member::getOpenid,null)
            );
            //更新当前登录用户 openId
            member.setOpenid(accountLoginDTO.getOpenId());
            memberMapper.updateById(member);
        }
        WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
        JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
        String token = JwtTokenUtil.generateToken(payLoad);
        //存储token至redis
        RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
        wxAuthorizeVO.setToken(token);
        return wxAuthorizeVO;
    }



    @Override
@@ -1789,7 +1755,7 @@
        List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO));
        if(CollectionUtils.isNotEmpty(memberList)){
            stagingHeadVO.setWorkerCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.internal)).count());
            stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.lw_visitor)).count());
            stagingHeadVO.setLwCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.driver)).count());
            stagingHeadVO.setVisitorCount(memberList.stream().filter(m->m.getType().equals(Constants.memberType.visitor)).count());
        }
        //在场车辆
@@ -1813,7 +1779,7 @@
                new MPJLambdaWrapper<Member>()
                        .select("count(1) as memberCount, t1.name as companyName")
                        .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                        .eq(Member::getType,Constants.memberType.lw_visitor)
                        .eq(Member::getType,Constants.memberType.driver)
                        .groupBy(Company::getId,Company::getName)
        );
        List<Map<String,Object>> retentionMaps = retentionJoinMapper.selectMaps(new MPJLambdaWrapper<Retention>()
@@ -1888,7 +1854,7 @@
                    throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息【"+insert.getName()+"】同步安防平台失败，请稍后重试！");
                }
            }
            memberMapper.insertBatchSomeColumn(newList);
            memberMapper.insert(newList);
            List<SystemUser> userList = new ArrayList<>();
            for(Member insert: newList){
                //创建系统登陆账号（默认无任何角色）
@@ -1898,7 +1864,7 @@
                }
            }
            if(userList.size()>0){
                systemUserMapper.insertBatchSomeColumn(userList);
                systemUserMapper.insert(userList);
            }
        }catch (Exception e){
            //如果发生异常，删除已经创建的人员信息
@@ -2019,7 +1985,7 @@
        Member member = new Member();
        member.setCreateDate(new Date());
        member.setIsdeleted(Constants.ZERO);
        member.setType(Constants.TWO);
        member.setType(Constants.THREE);
        member.setName(registerDriverDTO.getName());
        member.setPhone(registerDriverDTO.getPhone());
        member.setStatus(Constants.ZERO);

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java

@@ -222,7 +222,7 @@
                parkBook.setRemark("待同步安防平台");
                parkBookList.add(parkBook);
            }
            parkBookMapper.insertBatchSomeColumn(parkBookList);
            parkBookMapper.insert(parkBookList);
        }
        return 0;
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,131 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformBooksMapper;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.service.business.PlatformBooksService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * æœˆå°å…¥å›­é¢„约信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformBooksServiceImpl implements PlatformBooksService {

    @Autowired
    private PlatformBooksMapper platformBooksMapper;

    @Override
    public Integer create(PlatformBooks platformBooks) {
        platformBooksMapper.insert(platformBooks);
        return platformBooks.getId();
    }

    @Override
    public void deleteById(Integer id) {
        platformBooksMapper.deleteById(id);
    }

    @Override
    public void delete(PlatformBooks platformBooks) {
        UpdateWrapper<PlatformBooks> deleteWrapper = new UpdateWrapper<>(platformBooks);
        platformBooksMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        platformBooksMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(PlatformBooks platformBooks) {
        platformBooksMapper.updateById(platformBooks);
    }

    @Override
    public void updateByIdInBatch(List<PlatformBooks> platformBookss) {
        if (CollectionUtils.isEmpty(platformBookss)) {
            return;
        }
        for (PlatformBooks platformBooks: platformBookss) {
            this.updateById(platformBooks);
        }
    }

    @Override
    public PlatformBooks findById(Integer id) {
        return platformBooksMapper.selectById(id);
    }

    @Override
    public PlatformBooks findOne(PlatformBooks platformBooks) {
        QueryWrapper<PlatformBooks> wrapper = new QueryWrapper<>(platformBooks);
        return platformBooksMapper.selectOne(wrapper);
    }

    @Override
    public List<PlatformBooks> findList(PlatformBooks platformBooks) {
        QueryWrapper<PlatformBooks> wrapper = new QueryWrapper<>(platformBooks);
        return platformBooksMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<PlatformBooks> findPage(PageWrap<PlatformBooks> pageWrap) {
        IPage<PlatformBooks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<PlatformBooks> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda()
                .eq(pageWrap.getModel().getId() != null, PlatformBooks::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, PlatformBooks::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, PlatformBooks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
                .le(pageWrap.getModel().getCreateDate() != null, PlatformBooks::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
                .eq(pageWrap.getModel().getEditor() != null, PlatformBooks::getEditor, pageWrap.getModel().getEditor())
                .ge(pageWrap.getModel().getEditDate() != null, PlatformBooks::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
                .le(pageWrap.getModel().getEditDate() != null, PlatformBooks::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformBooks::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getName() != null, PlatformBooks::getName, pageWrap.getModel().getName())
                .eq(pageWrap.getModel().getRemark() != null, PlatformBooks::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getStatus() != null, PlatformBooks::getStatus, pageWrap.getModel().getStatus())
                .eq(pageWrap.getModel().getContractNum() != null, PlatformBooks::getContractNum, pageWrap.getModel().getContractNum())
                .ge(pageWrap.getModel().getArriveDate() != null, PlatformBooks::getArriveDate, Utils.Date.getStart(pageWrap.getModel().getArriveDate()))
                .le(pageWrap.getModel().getArriveDate() != null, PlatformBooks::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDate()))
                .eq(pageWrap.getModel().getInType() != null, PlatformBooks::getInType, pageWrap.getModel().getInType())
                .eq(pageWrap.getModel().getTotalNum() != null, PlatformBooks::getTotalNum, pageWrap.getModel().getTotalNum())
                .eq(pageWrap.getModel().getCarCodeFront() != null, PlatformBooks::getCarCodeFront, pageWrap.getModel().getCarCodeFront())
                .eq(pageWrap.getModel().getCarCodeBack() != null, PlatformBooks::getCarCodeBack, pageWrap.getModel().getCarCodeBack())
                .eq(pageWrap.getModel().getDriverId() != null, PlatformBooks::getDriverId, pageWrap.getModel().getDriverId())
                .eq(pageWrap.getModel().getDriverName() != null, PlatformBooks::getDriverName, pageWrap.getModel().getDriverName())
                .eq(pageWrap.getModel().getPlateNum() != null, PlatformBooks::getPlateNum, pageWrap.getModel().getPlateNum())
                .eq(pageWrap.getModel().getDrivierPhone() != null, PlatformBooks::getDrivierPhone, pageWrap.getModel().getDrivierPhone())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(platformBooksMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(PlatformBooks platformBooks) {
        QueryWrapper<PlatformBooks> wrapper = new QueryWrapper<>(platformBooks);
        return platformBooksMapper.selectCount(wrapper);
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,131 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformBroadcastLogMapper;
import com.doumee.dao.business.model.PlatformBroadcastLog;
import com.doumee.service.business.PlatformBroadcastLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * æœˆå°_LED和广播提醒下发记录Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformBroadcastLogServiceImpl implements PlatformBroadcastLogService {

    @Autowired
    private PlatformBroadcastLogMapper platformBroadcastLogMapper;

    @Override
    public Integer create(PlatformBroadcastLog platformBroadcastLog) {
        platformBroadcastLogMapper.insert(platformBroadcastLog);
        return platformBroadcastLog.getId();
    }

    @Override
    public void deleteById(Integer id) {
        platformBroadcastLogMapper.deleteById(id);
    }

    @Override
    public void delete(PlatformBroadcastLog platformBroadcastLog) {
        UpdateWrapper<PlatformBroadcastLog> deleteWrapper = new UpdateWrapper<>(platformBroadcastLog);
        platformBroadcastLogMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        platformBroadcastLogMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(PlatformBroadcastLog platformBroadcastLog) {
        platformBroadcastLogMapper.updateById(platformBroadcastLog);
    }

    @Override
    public void updateByIdInBatch(List<PlatformBroadcastLog> platformBroadcastLogs) {
        if (CollectionUtils.isEmpty(platformBroadcastLogs)) {
            return;
        }
        for (PlatformBroadcastLog platformBroadcastLog: platformBroadcastLogs) {
            this.updateById(platformBroadcastLog);
        }
    }

    @Override
    public PlatformBroadcastLog findById(Integer id) {
        return platformBroadcastLogMapper.selectById(id);
    }

    @Override
    public PlatformBroadcastLog findOne(PlatformBroadcastLog platformBroadcastLog) {
        QueryWrapper<PlatformBroadcastLog> wrapper = new QueryWrapper<>(platformBroadcastLog);
        return platformBroadcastLogMapper.selectOne(wrapper);
    }

    @Override
    public List<PlatformBroadcastLog> findList(PlatformBroadcastLog platformBroadcastLog) {
        QueryWrapper<PlatformBroadcastLog> wrapper = new QueryWrapper<>(platformBroadcastLog);
        return platformBroadcastLogMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<PlatformBroadcastLog> findPage(PageWrap<PlatformBroadcastLog> pageWrap) {
        IPage<PlatformBroadcastLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<PlatformBroadcastLog> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda()
                .eq(pageWrap.getModel().getId() != null, PlatformBroadcastLog::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, PlatformBroadcastLog::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, PlatformBroadcastLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
                .le(pageWrap.getModel().getCreateDate() != null, PlatformBroadcastLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
                .eq(pageWrap.getModel().getEditor() != null, PlatformBroadcastLog::getEditor, pageWrap.getModel().getEditor())
                .ge(pageWrap.getModel().getEditDate() != null, PlatformBroadcastLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
                .le(pageWrap.getModel().getEditDate() != null, PlatformBroadcastLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformBroadcastLog::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getName() != null, PlatformBroadcastLog::getName, pageWrap.getModel().getName())
                .eq(pageWrap.getModel().getRemark() != null, PlatformBroadcastLog::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getObjId() != null, PlatformBroadcastLog::getObjId, pageWrap.getModel().getObjId())
                .eq(pageWrap.getModel().getObjType() != null, PlatformBroadcastLog::getObjType, pageWrap.getModel().getObjType())
                .eq(pageWrap.getModel().getNum() != null, PlatformBroadcastLog::getNum, pageWrap.getModel().getNum())
                .eq(pageWrap.getModel().getIds() != null, PlatformBroadcastLog::getIds, pageWrap.getModel().getIds())
                .eq(pageWrap.getModel().getInfo() != null, PlatformBroadcastLog::getInfo, pageWrap.getModel().getInfo())
                .eq(pageWrap.getModel().getHkId() != null, PlatformBroadcastLog::getHkId, pageWrap.getModel().getHkId())
                .eq(pageWrap.getModel().getHkStatus() != null, PlatformBroadcastLog::getHkStatus, pageWrap.getModel().getHkStatus())
                .ge(pageWrap.getModel().getHkDate() != null, PlatformBroadcastLog::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()))
                .le(pageWrap.getModel().getHkDate() != null, PlatformBroadcastLog::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()))
                .eq(pageWrap.getModel().getHkInfo() != null, PlatformBroadcastLog::getHkInfo, pageWrap.getModel().getHkInfo())
                .eq(pageWrap.getModel().getBizType() != null, PlatformBroadcastLog::getBizType, pageWrap.getModel().getBizType())
                .eq(pageWrap.getModel().getDeviceType() != null, PlatformBroadcastLog::getDeviceType, pageWrap.getModel().getDeviceType())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(platformBroadcastLogMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(PlatformBroadcastLog platformBroadcastLog) {
        QueryWrapper<PlatformBroadcastLog> wrapper = new QueryWrapper<>(platformBroadcastLog);
        return platformBroadcastLogMapper.selectCount(wrapper);
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformDeviceServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,125 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformDeviceMapper;
import com.doumee.dao.business.model.PlatformDevice;
import com.doumee.service.business.PlatformDeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * æœˆå°_关联监控点LED和广播信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformDeviceServiceImpl implements PlatformDeviceService {

    @Autowired
    private PlatformDeviceMapper platformDeviceMapper;

    @Override
    public Integer create(PlatformDevice platformDevice) {
        platformDeviceMapper.insert(platformDevice);
        return platformDevice.getId();
    }

    @Override
    public void deleteById(Integer id) {
        platformDeviceMapper.deleteById(id);
    }

    @Override
    public void delete(PlatformDevice platformDevice) {
        UpdateWrapper<PlatformDevice> deleteWrapper = new UpdateWrapper<>(platformDevice);
        platformDeviceMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        platformDeviceMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(PlatformDevice platformDevice) {
        platformDeviceMapper.updateById(platformDevice);
    }

    @Override
    public void updateByIdInBatch(List<PlatformDevice> platformDevices) {
        if (CollectionUtils.isEmpty(platformDevices)) {
            return;
        }
        for (PlatformDevice platformDevice: platformDevices) {
            this.updateById(platformDevice);
        }
    }

    @Override
    public PlatformDevice findById(Integer id) {
        return platformDeviceMapper.selectById(id);
    }

    @Override
    public PlatformDevice findOne(PlatformDevice platformDevice) {
        QueryWrapper<PlatformDevice> wrapper = new QueryWrapper<>(platformDevice);
        return platformDeviceMapper.selectOne(wrapper);
    }

    @Override
    public List<PlatformDevice> findList(PlatformDevice platformDevice) {
        QueryWrapper<PlatformDevice> wrapper = new QueryWrapper<>(platformDevice);
        return platformDeviceMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<PlatformDevice> findPage(PageWrap<PlatformDevice> pageWrap) {
        IPage<PlatformDevice> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<PlatformDevice> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda()
                .eq(pageWrap.getModel().getId() != null, PlatformDevice::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, PlatformDevice::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, PlatformDevice::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
                .le(pageWrap.getModel().getCreateDate() != null, PlatformDevice::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
                .eq(pageWrap.getModel().getEditor() != null, PlatformDevice::getEditor, pageWrap.getModel().getEditor())
                .ge(pageWrap.getModel().getEditDate() != null, PlatformDevice::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
                .le(pageWrap.getModel().getEditDate() != null, PlatformDevice::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformDevice::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getRemark() != null, PlatformDevice::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getPlatformId() != null, PlatformDevice::getPlatformId, pageWrap.getModel().getPlatformId())
                .eq(pageWrap.getModel().getHkId() != null, PlatformDevice::getHkId, pageWrap.getModel().getHkId())
                .eq(pageWrap.getModel().getDeviceId() != null, PlatformDevice::getDeviceId, pageWrap.getModel().getDeviceId())
                .eq(pageWrap.getModel().getSortnum() != null, PlatformDevice::getSortnum, pageWrap.getModel().getSortnum())
                .eq(pageWrap.getModel().getType() != null, PlatformDevice::getType, pageWrap.getModel().getType())
                .eq(pageWrap.getModel().getName() != null, PlatformDevice::getName, pageWrap.getModel().getName())
                .eq(pageWrap.getModel().getStatus() != null, PlatformDevice::getStatus, pageWrap.getModel().getStatus())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(platformDeviceMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(PlatformDevice platformDevice) {
        QueryWrapper<PlatformDevice> wrapper = new QueryWrapper<>(platformDevice);
        return platformDeviceMapper.selectCount(wrapper);
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * æœˆå°_分组信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformGroupServiceImpl implements PlatformGroupService {

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java

@@ -1,12 +1,9 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformInterfaceLogMapper;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.PlatformInterfaceLog;
import com.doumee.service.business.PlatformInterfaceLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,13 +19,10 @@
/**
 * ä½œä¸šè°ƒåº¦å¹³å°æŽ¥å£äº¤äº’记录Service实现
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformInterfaceLogServiceImpl implements PlatformInterfaceLogService {

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private PlatformInterfaceLogMapper platformInterfaceLogMapper;
@@ -106,18 +100,23 @@
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformInterfaceLog::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getRemark() != null, PlatformInterfaceLog::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getType() != null, PlatformInterfaceLog::getType, pageWrap.getModel().getType())
                .like(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
                .like(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, pageWrap.getModel().getUrl())
                .eq(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
                .ge(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()))
                .le(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()))
                .eq(pageWrap.getModel().getRequest() != null, PlatformInterfaceLog::getRequest, pageWrap.getModel().getRequest())
                .eq(pageWrap.getModel().getRepose() != null, PlatformInterfaceLog::getRepose, pageWrap.getModel().getRepose())
                .eq(pageWrap.getModel().getSuccess() != null, PlatformInterfaceLog::getSuccess, pageWrap.getModel().getSuccess())
                .eq(pageWrap.getModel().getPlat() != null, PlatformInterfaceLog::getPlat, pageWrap.getModel().getPlat())
                .eq(pageWrap.getModel().getObjType() != null, PlatformInterfaceLog::getObjType, pageWrap.getModel().getObjType())
                .eq(pageWrap.getModel().getObjId() != null, PlatformInterfaceLog::getObjId, pageWrap.getModel().getObjId())
                .ge(pageWrap.getModel().getStartDate() != null,PlatformInterfaceLog::getCreateDate, pageWrap.getModel().getStartDate())
                .le(pageWrap.getModel().getEndDate() != null,PlatformInterfaceLog::getCreateDate, pageWrap.getModel().getEndDate())
                .orderByDesc(PlatformInterfaceLog::getCreateDate);
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(platformInterfaceLogMapper.selectPage(page, queryWrapper));
    }

@@ -125,14 +124,5 @@
    public long count(PlatformInterfaceLog platformInterfaceLog) {
        QueryWrapper<PlatformInterfaceLog> wrapper = new QueryWrapper<>(platformInterfaceLog);
        return platformInterfaceLogMapper.selectCount(wrapper);
    }
    @Override
    public void clearThreeMonthLog() {
        int days =15;
        try {
            days = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LOG_DEL_DAYS_LIMIT).getCode());
        }catch (Exception e){}
        platformInterfaceLogMapper.delete(new UpdateWrapper<PlatformInterfaceLog>().lambda()
                .apply("to_days(create_date)+"+days+" < to_days(now())"));
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * æœˆå°è°ƒåº¦ä½œä¸šä¿¡æ¯è¡¨Service实现
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformJobServiceImpl implements PlatformJobService {
@@ -102,23 +102,22 @@
                .eq(pageWrap.getModel().getRemark() != null, PlatformJob::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getStatus() != null, PlatformJob::getStatus, pageWrap.getModel().getStatus())
                .eq(pageWrap.getModel().getSortnum() != null, PlatformJob::getSortnum, pageWrap.getModel().getSortnum())
                .eq(pageWrap.getModel().getStartTime() != null, PlatformJob::getStartTime, pageWrap.getModel().getStartTime())
                .eq(pageWrap.getModel().getEndTime() != null, PlatformJob::getEndTime, pageWrap.getModel().getEndTime())
                .eq(pageWrap.getModel().getDeviceIds() != null, PlatformJob::getDeviceIds, pageWrap.getModel().getDeviceIds())
                .eq(pageWrap.getModel().getScreenIds() != null, PlatformJob::getScreenIds, pageWrap.getModel().getScreenIds())
                .eq(pageWrap.getModel().getWorkingNum() != null, PlatformJob::getWorkingNum, pageWrap.getModel().getWorkingNum())
                .eq(pageWrap.getModel().getBroadcastNum() != null, PlatformJob::getBroadcastNum, pageWrap.getModel().getBroadcastNum())
                .eq(pageWrap.getModel().getBroadcastIds() != null, PlatformJob::getBroadcastIds, pageWrap.getModel().getBroadcastIds())
                .eq(pageWrap.getModel().getBroadcastInfo() != null, PlatformJob::getBroadcastInfo, pageWrap.getModel().getBroadcastInfo())
                .eq(pageWrap.getModel().getBroadcastHkstatus() != null, PlatformJob::getBroadcastHkstatus, pageWrap.getModel().getBroadcastHkstatus())
                .ge(pageWrap.getModel().getBroadcastHkdate() != null, PlatformJob::getBroadcastHkdate, Utils.Date.getStart(pageWrap.getModel().getBroadcastHkdate()))
                .le(pageWrap.getModel().getBroadcastHkdate() != null, PlatformJob::getBroadcastHkdate, Utils.Date.getEnd(pageWrap.getModel().getBroadcastHkdate()))
                .eq(pageWrap.getModel().getBroadcastHkinfo() != null, PlatformJob::getBroadcastHkinfo, pageWrap.getModel().getBroadcastHkinfo())
                .eq(pageWrap.getModel().getCode() != null, PlatformJob::getCode, pageWrap.getModel().getCode())
                .eq(pageWrap.getModel().getBillCode() != null, PlatformJob::getBillCode, pageWrap.getModel().getBillCode())
                .eq(pageWrap.getModel().getDriverId() != null, PlatformJob::getDriverId, pageWrap.getModel().getDriverId())
                .eq(pageWrap.getModel().getDriverName() != null, PlatformJob::getDriverName, pageWrap.getModel().getDriverName())
                .eq(pageWrap.getModel().getPlateNum() != null, PlatformJob::getPlateNum, pageWrap.getModel().getPlateNum())
                .eq(pageWrap.getModel().getDrivierPhone() != null, PlatformJob::getDrivierPhone, pageWrap.getModel().getDrivierPhone())
                .ge(pageWrap.getModel().getSignDate() != null, PlatformJob::getSignDate, Utils.Date.getStart(pageWrap.getModel().getSignDate()))
                .le(pageWrap.getModel().getSignDate() != null, PlatformJob::getSignDate, Utils.Date.getEnd(pageWrap.getModel().getSignDate()))
                .eq(pageWrap.getModel().getSingType() != null, PlatformJob::getSingType, pageWrap.getModel().getSingType())
                .eq(pageWrap.getModel().getSignDistance() != null, PlatformJob::getSignDistance, pageWrap.getModel().getSignDistance())
                .eq(pageWrap.getModel().getPlatformNames() != null, PlatformJob::getPlatformNames, pageWrap.getModel().getPlatformNames())
                .eq(pageWrap.getModel().getPlatforms() != null, PlatformJob::getPlatforms, pageWrap.getModel().getPlatforms())
                .eq(pageWrap.getModel().getPlatformId() != null, PlatformJob::getPlatformId, pageWrap.getModel().getPlatformId())
                .ge(pageWrap.getModel().getInwaitDate() != null, PlatformJob::getInwaitDate, Utils.Date.getStart(pageWrap.getModel().getInwaitDate()))
                .le(pageWrap.getModel().getInwaitDate() != null, PlatformJob::getInwaitDate, Utils.Date.getEnd(pageWrap.getModel().getInwaitDate()))
                .eq(pageWrap.getModel().getInwaitUserId() != null, PlatformJob::getInwaitUserId, pageWrap.getModel().getInwaitUserId())
                .ge(pageWrap.getModel().getCallDate() != null, PlatformJob::getCallDate, Utils.Date.getStart(pageWrap.getModel().getCallDate()))
                .le(pageWrap.getModel().getCallDate() != null, PlatformJob::getCallDate, Utils.Date.getEnd(pageWrap.getModel().getCallDate()))
                .eq(pageWrap.getModel().getCallUserId() != null, PlatformJob::getCallUserId, pageWrap.getModel().getCallUserId())
@@ -158,6 +157,11 @@
                .eq(pageWrap.getModel().getCancelUserId() != null, PlatformJob::getCancelUserId, pageWrap.getModel().getCancelUserId())
                .eq(pageWrap.getModel().getCancelInfo() != null, PlatformJob::getCancelInfo, pageWrap.getModel().getCancelInfo())
                .eq(pageWrap.getModel().getReason() != null, PlatformJob::getReason, pageWrap.getModel().getReason())
                .eq(pageWrap.getModel().getContractNum() != null, PlatformJob::getContractNum, pageWrap.getModel().getContractNum())
                .ge(pageWrap.getModel().getArriveDate() != null, PlatformJob::getArriveDate, Utils.Date.getStart(pageWrap.getModel().getArriveDate()))
                .le(pageWrap.getModel().getArriveDate() != null, PlatformJob::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDate()))
                .eq(pageWrap.getModel().getInType() != null, PlatformJob::getInType, pageWrap.getModel().getInType())
                .eq(pageWrap.getModel().getTotalNum() != null, PlatformJob::getTotalNum, pageWrap.getModel().getTotalNum())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * æœˆå°_作业操作历史表Service实现
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformLogServiceImpl implements PlatformLogService {
@@ -106,6 +106,10 @@
                .eq(pageWrap.getModel().getObjId() != null, PlatformLog::getObjId, pageWrap.getModel().getObjId())
                .eq(pageWrap.getModel().getBeforeContent() != null, PlatformLog::getBeforeContent, pageWrap.getModel().getBeforeContent())
                .eq(pageWrap.getModel().getAfterContent() != null, PlatformLog::getAfterContent, pageWrap.getModel().getAfterContent())
                .eq(pageWrap.getModel().getParam1() != null, PlatformLog::getParam1, pageWrap.getModel().getParam1())
                .eq(pageWrap.getModel().getParam2() != null, PlatformLog::getParam2, pageWrap.getModel().getParam2())
                .eq(pageWrap.getModel().getParam3() != null, PlatformLog::getParam3, pageWrap.getModel().getParam3())
                .eq(pageWrap.getModel().getParam4() != null, PlatformLog::getParam4, pageWrap.getModel().getParam4())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformQueueServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * æœˆå°_叫号排队信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformQueueServiceImpl implements PlatformQueueService {
@@ -100,7 +100,6 @@
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformQueue::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getRemark() != null, PlatformQueue::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getJobId() != null, PlatformQueue::getJobId, pageWrap.getModel().getJobId())
                .eq(pageWrap.getModel().getTitle() != null, PlatformQueue::getTitle, pageWrap.getModel().getTitle())
                .eq(pageWrap.getModel().getContent() != null, PlatformQueue::getContent, pageWrap.getModel().getContent())
                .eq(pageWrap.getModel().getStatus() != null, PlatformQueue::getStatus, pageWrap.getModel().getStatus())
                .eq(pageWrap.getModel().getObjType() != null, PlatformQueue::getObjType, pageWrap.getModel().getObjType())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * æœˆå°ä¿¡æ¯è¡¨Service实现
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformServiceImpl implements PlatformService {
@@ -105,8 +105,6 @@
                .eq(pageWrap.getModel().getGroupId() != null, Platform::getGroupId, pageWrap.getModel().getGroupId())
                .eq(pageWrap.getModel().getStartTime() != null, Platform::getStartTime, pageWrap.getModel().getStartTime())
                .eq(pageWrap.getModel().getEndTime() != null, Platform::getEndTime, pageWrap.getModel().getEndTime())
                .eq(pageWrap.getModel().getDeviceIds() != null, Platform::getDeviceIds, pageWrap.getModel().getDeviceIds())
                .eq(pageWrap.getModel().getScreenIds() != null, Platform::getScreenIds, pageWrap.getModel().getScreenIds())
                .eq(pageWrap.getModel().getWorkingNum() != null, Platform::getWorkingNum, pageWrap.getModel().getWorkingNum())
                .eq(pageWrap.getModel().getWariCallTime() != null, Platform::getWariCallTime, pageWrap.getModel().getWariCallTime())
                .eq(pageWrap.getModel().getAlermTime() != null, Platform::getAlermTime, pageWrap.getModel().getAlermTime())
@@ -114,6 +112,13 @@
                .le(pageWrap.getModel().getLastEventTime() != null, Platform::getLastEventTime, Utils.Date.getEnd(pageWrap.getModel().getLastEventTime()))
                .eq(pageWrap.getModel().getDeviceNames() != null, Platform::getDeviceNames, pageWrap.getModel().getDeviceNames())
                .eq(pageWrap.getModel().getScreenName() != null, Platform::getScreenName, pageWrap.getModel().getScreenName())
                .eq(pageWrap.getModel().getHkId() != null, Platform::getHkId, pageWrap.getModel().getHkId())
                .eq(pageWrap.getModel().getCompanys() != null, Platform::getCompanys, pageWrap.getModel().getCompanys())
                .eq(pageWrap.getModel().getXpos() != null, Platform::getXpos, pageWrap.getModel().getXpos())
                .eq(pageWrap.getModel().getYpos() != null, Platform::getYpos, pageWrap.getModel().getYpos())
                .eq(pageWrap.getModel().getWidth() != null, Platform::getWidth, pageWrap.getModel().getWidth())
                .eq(pageWrap.getModel().getHeight() != null, Platform::getHeight, pageWrap.getModel().getHeight())
                .eq(pageWrap.getModel().getAngle() != null, Platform::getAngle, pageWrap.getModel().getAngle())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * æœˆå°_显示配置信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @since 2024/04/28 16:06
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformShowParamServiceImpl implements PlatformShowParamService {

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsDetailServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,124 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformWmsDetailMapper;
import com.doumee.dao.business.model.PlatformWmsDetail;
import com.doumee.service.business.PlatformWmsDetailService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * æœˆå°_WMS作业通知单明细Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformWmsDetailServiceImpl implements PlatformWmsDetailService {

    @Autowired
    private PlatformWmsDetailMapper platformWmsDetailMapper;

    @Override
    public Integer create(PlatformWmsDetail platformWmsDetail) {
        platformWmsDetailMapper.insert(platformWmsDetail);
        return platformWmsDetail.getId();
    }

    @Override
    public void deleteById(Integer id) {
        platformWmsDetailMapper.deleteById(id);
    }

    @Override
    public void delete(PlatformWmsDetail platformWmsDetail) {
        UpdateWrapper<PlatformWmsDetail> deleteWrapper = new UpdateWrapper<>(platformWmsDetail);
        platformWmsDetailMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        platformWmsDetailMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(PlatformWmsDetail platformWmsDetail) {
        platformWmsDetailMapper.updateById(platformWmsDetail);
    }

    @Override
    public void updateByIdInBatch(List<PlatformWmsDetail> platformWmsDetails) {
        if (CollectionUtils.isEmpty(platformWmsDetails)) {
            return;
        }
        for (PlatformWmsDetail platformWmsDetail: platformWmsDetails) {
            this.updateById(platformWmsDetail);
        }
    }

    @Override
    public PlatformWmsDetail findById(Integer id) {
        return platformWmsDetailMapper.selectById(id);
    }

    @Override
    public PlatformWmsDetail findOne(PlatformWmsDetail platformWmsDetail) {
        QueryWrapper<PlatformWmsDetail> wrapper = new QueryWrapper<>(platformWmsDetail);
        return platformWmsDetailMapper.selectOne(wrapper);
    }

    @Override
    public List<PlatformWmsDetail> findList(PlatformWmsDetail platformWmsDetail) {
        QueryWrapper<PlatformWmsDetail> wrapper = new QueryWrapper<>(platformWmsDetail);
        return platformWmsDetailMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<PlatformWmsDetail> findPage(PageWrap<PlatformWmsDetail> pageWrap) {
        IPage<PlatformWmsDetail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<PlatformWmsDetail> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda()
                .eq(pageWrap.getModel().getId() != null, PlatformWmsDetail::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, PlatformWmsDetail::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, PlatformWmsDetail::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
                .le(pageWrap.getModel().getCreateDate() != null, PlatformWmsDetail::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
                .eq(pageWrap.getModel().getEditor() != null, PlatformWmsDetail::getEditor, pageWrap.getModel().getEditor())
                .ge(pageWrap.getModel().getEditDate() != null, PlatformWmsDetail::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
                .le(pageWrap.getModel().getEditDate() != null, PlatformWmsDetail::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformWmsDetail::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getRemark() != null, PlatformWmsDetail::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getJobId() != null, PlatformWmsDetail::getJobId, pageWrap.getModel().getJobId())
                .eq(pageWrap.getModel().getIocode() != null, PlatformWmsDetail::getIocode, pageWrap.getModel().getIocode())
                .eq(pageWrap.getModel().getMaterialName() != null, PlatformWmsDetail::getMaterialName, pageWrap.getModel().getMaterialName())
                .eq(pageWrap.getModel().getInRepertotyCode() != null, PlatformWmsDetail::getInRepertotyCode, pageWrap.getModel().getInRepertotyCode())
                .eq(pageWrap.getModel().getIoQty() != null, PlatformWmsDetail::getIoQty, pageWrap.getModel().getIoQty())
                .eq(pageWrap.getModel().getRate() != null, PlatformWmsDetail::getRate, pageWrap.getModel().getRate())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(platformWmsDetailMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(PlatformWmsDetail platformWmsDetail) {
        QueryWrapper<PlatformWmsDetail> wrapper = new QueryWrapper<>(platformWmsDetail);
        return platformWmsDetailMapper.selectCount(wrapper);
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,134 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformWmsJobMapper;
import com.doumee.dao.business.model.PlatformWmsJob;
import com.doumee.service.business.PlatformWmsJobService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * æœˆå°_WMS作业通知单行数据Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/06/28 10:03
 */
@Service
public class PlatformWmsJobServiceImpl implements PlatformWmsJobService {

    @Autowired
    private PlatformWmsJobMapper platformWmsJobMapper;

    @Override
    public Integer create(PlatformWmsJob platformWmsJob) {
        platformWmsJobMapper.insert(platformWmsJob);
        return platformWmsJob.getId();
    }

    @Override
    public void deleteById(Integer id) {
        platformWmsJobMapper.deleteById(id);
    }

    @Override
    public void delete(PlatformWmsJob platformWmsJob) {
        UpdateWrapper<PlatformWmsJob> deleteWrapper = new UpdateWrapper<>(platformWmsJob);
        platformWmsJobMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        platformWmsJobMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(PlatformWmsJob platformWmsJob) {
        platformWmsJobMapper.updateById(platformWmsJob);
    }

    @Override
    public void updateByIdInBatch(List<PlatformWmsJob> platformWmsJobs) {
        if (CollectionUtils.isEmpty(platformWmsJobs)) {
            return;
        }
        for (PlatformWmsJob platformWmsJob: platformWmsJobs) {
            this.updateById(platformWmsJob);
        }
    }

    @Override
    public PlatformWmsJob findById(Integer id) {
        return platformWmsJobMapper.selectById(id);
    }

    @Override
    public PlatformWmsJob findOne(PlatformWmsJob platformWmsJob) {
        QueryWrapper<PlatformWmsJob> wrapper = new QueryWrapper<>(platformWmsJob);
        return platformWmsJobMapper.selectOne(wrapper);
    }

    @Override
    public List<PlatformWmsJob> findList(PlatformWmsJob platformWmsJob) {
        QueryWrapper<PlatformWmsJob> wrapper = new QueryWrapper<>(platformWmsJob);
        return platformWmsJobMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<PlatformWmsJob> findPage(PageWrap<PlatformWmsJob> pageWrap) {
        IPage<PlatformWmsJob> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<PlatformWmsJob> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda()
                .eq(pageWrap.getModel().getId() != null, PlatformWmsJob::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, PlatformWmsJob::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, PlatformWmsJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
                .le(pageWrap.getModel().getCreateDate() != null, PlatformWmsJob::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
                .eq(pageWrap.getModel().getEditor() != null, PlatformWmsJob::getEditor, pageWrap.getModel().getEditor())
                .ge(pageWrap.getModel().getEditDate() != null, PlatformWmsJob::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
                .le(pageWrap.getModel().getEditDate() != null, PlatformWmsJob::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformWmsJob::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getRemark() != null, PlatformWmsJob::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getJobId() != null, PlatformWmsJob::getJobId, pageWrap.getModel().getJobId())
                .eq(pageWrap.getModel().getIocode() != null, PlatformWmsJob::getIocode, pageWrap.getModel().getIocode())
                .eq(pageWrap.getModel().getType() != null, PlatformWmsJob::getType, pageWrap.getModel().getType())
                .eq(pageWrap.getModel().getDriverPhone() != null, PlatformWmsJob::getDriverPhone, pageWrap.getModel().getDriverPhone())
                .eq(pageWrap.getModel().getDriverName() != null, PlatformWmsJob::getDriverName, pageWrap.getModel().getDriverName())
                .eq(pageWrap.getModel().getCarrierName() != null, PlatformWmsJob::getCarrierName, pageWrap.getModel().getCarrierName())
                .eq(pageWrap.getModel().getCarryBillCode() != null, PlatformWmsJob::getCarryBillCode, pageWrap.getModel().getCarryBillCode())
                .ge(pageWrap.getModel().getIoCreatedate() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getStart(pageWrap.getModel().getIoCreatedate()))
                .le(pageWrap.getModel().getIoCreatedate() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getEnd(pageWrap.getModel().getIoCreatedate()))
                .eq(pageWrap.getModel().getStatus() != null, PlatformWmsJob::getStatus, pageWrap.getModel().getStatus())
                .ge(pageWrap.getModel().getCancelDate() != null, PlatformWmsJob::getCancelDate, Utils.Date.getStart(pageWrap.getModel().getCancelDate()))
                .le(pageWrap.getModel().getCancelDate() != null, PlatformWmsJob::getCancelDate, Utils.Date.getEnd(pageWrap.getModel().getCancelDate()))
                .eq(pageWrap.getModel().getCancelInfo() != null, PlatformWmsJob::getCancelInfo, pageWrap.getModel().getCancelInfo())
                .eq(pageWrap.getModel().getPlateNumber() != null, PlatformWmsJob::getPlateNumber, pageWrap.getModel().getPlateNumber())
                .eq(pageWrap.getModel().getRepertotyAddress() != null, PlatformWmsJob::getRepertotyAddress, pageWrap.getModel().getRepertotyAddress())
                .eq(pageWrap.getModel().getContractNum() != null, PlatformWmsJob::getContractNum, pageWrap.getModel().getContractNum())
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(platformWmsJobMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(PlatformWmsJob platformWmsJob) {
        QueryWrapper<PlatformWmsJob> wrapper = new QueryWrapper<>(platformWmsJob);
        return platformWmsJobMapper.selectCount(wrapper);
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java

@@ -183,7 +183,7 @@
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到劳务人员");
            }
            if(!member.getType().equals(Constants.memberType.lw_visitor)){
            if(!member.getType().equals(Constants.memberType.driver)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非劳务人员类型，答题失败");
            }
            if(!member.getStatus().equals(Constants.ZERO)){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java

@@ -231,7 +231,7 @@
            if(newList == null || newList.size() ==0){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，录入有效数据为空！");
            }
            trainTimeMapper.insertBatchSomeColumn(newList);
            trainTimeMapper.insert(newList);
            return "导入成功";
        }catch (BusinessException e){
            throw e;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java

@@ -47,6 +47,7 @@
        update.setEditor(userInfo.getId());
        update.setEditDate(new Date());
        update.setIsdeleted(Constants.ONE);
        update.setId(id);
        visitReasonMapper.updateById(update);

    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -170,7 +170,7 @@
                }
                visits.setWithUserList(visitsList);
            }
            this.createFk(visits,true);
            this.createFk(visits,true,Constants.ONE);
    }

    @Transactional(propagation = Propagation.NOT_SUPPORTED)
@@ -197,16 +197,15 @@
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public Integer createFk(Visits visits,Boolean isERP) {
    public Integer createFk(Visits visits,Boolean isERP,Integer source) {
        isValidBaseParam(visits);
        //检查是否必须答题，并且符合答题要求
        ProblemLog problemLog = isValidProblemLog(visits);
        ProblemLog problemLog = isValidProblemLog(visits,source);
        //获取申请的海康访问门禁组信息
        getHkDeviceRoles(visits,isERP);
        //检验拜访人是否合法
        Member visitMember = isValideVisitedUser(visits.getReceptMemberId());
        if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&visits.getIdcardNo().length()!=18
//            &&!IdcardUtil.isValidCard(visits.getIdcardNo())
        ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证号码有误，请核实后重试！");
        }
@@ -215,7 +214,7 @@
        visits.setCreateDate(date);
        //随行人员数量
        visits.setMemberNum(Constants.ZERO);
        //访客信息(使用身份证号查询是否已存在改普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理
        //访客信息(使用身份证号查询是否已存在该普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理
        Member member = dealMemberAndVisits(visits);
        visits.setMemberId(member.getId());
        visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
@@ -454,7 +453,7 @@
                approve.setObjId(visitId);
                approveList.add(approve);
            }
            approveMapper.insertBatchSomeColumn(approveList);
            approveMapper.insert(approveList);
        }
    }

@@ -481,7 +480,7 @@
                approve.setObjId(visitId);
                approveList.add(approve);
            }
            approveMapper.insertBatchSomeColumn(approveList);
            approveMapper.insert(approveList);
        }
    }

@@ -634,12 +633,16 @@
        }else if(visits.getType().equals(Constants.ONE) && StringUtils.isBlank(visits.getConstructionReason())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，未填写施工事由！");
        }
        if(visits.getEndtime().getTime() < System.currentTimeMillis()){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，入厂时间必须大于当前时间！");//
        }
        if(visits.getEndtime().getTime() <= visits.getStarttime().getTime()){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，离厂时间必须大于入厂时间！");//
        }
        if(visits.getEndtime().getTime() <= System.currentTimeMillis()){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，入厂时间必须大于当前时间！");//
        }
        if(!DateUtil.getDateLong(visits.getEndtime()).equals(DateUtil.getDateLong(visits.getStarttime()))){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，预约日期不可以跨天！");
        };

        if(visits.getSourceType().equals(Constants.ZERO)){
            String code = systemDictDataBiz.queryByCode(Constants.VISIT_CONFIG,Constants.VALIDATE_VISIT).getCode();
            int codenum =0;
@@ -718,7 +721,7 @@
                v.setSourceType(visits.getSourceType());
            }
            //批量插入数据
            visitsMapper.insertBatchSomeColumn(visits.getWithUserList());
            visitsMapper.insert(visits.getWithUserList());
        }
    }

@@ -883,11 +886,10 @@
        }else{
            if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){
                //如果用户状态异常，则提示
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，身份证号【"+cardno+"】被禁止访问申请，如有疑问，请联系您的拜访人进行核实");
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，【"+member.getName()+"】身份证号【"+cardno+"】在黑名单内，无法申请进入园区");
            }
            //核查预约用户是否存在未签离的预约记录
//            isExsitNoOutVisisRecord(member);

            member.setFaceImg(visits.getFaceImg());
            member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null);
            member.setEditDate(visits.getCreateDate());
@@ -993,7 +995,16 @@
        return  member;
    }

    private ProblemLog isValidProblemLog(Visits visits) {
    /**
     * æ˜¯å¦éœ€è¦ç­”题
     * @param visits
     * @param source
     * @return
     */
    private ProblemLog isValidProblemLog(Visits visits,Integer source) {
        if(!Constants.equalsInteger(source,Constants.ZERO)){
            return null;
        }
        String required = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROBLEM_VISIT_REQUIRED).getCode();
        if(StringUtils.equals(required,Constants.ONE+"")&&visits.getSourceType()==Constants.ZERO&&!visits.getType().equals(Constants.TWO)){
            //如果必须答题，查找答题记录
@@ -1158,8 +1169,10 @@
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);

        queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType())&&Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,pageWrap.getModel().getType());
        queryWrapper.ne(Objects.nonNull(pageWrap.getModel().getType())&&!Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,Constants.TWO);
        queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Visits::getOpenid,pageWrap.getModel().getOpenid());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNos()),Visits::getCarNos,pageWrap.getModel().getCarNos());
//        queryWrapper.eq(StringUtils.isBlank(pageWrap.getModel().getOpenid()),"1","2");
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()),ms->ms.like(Visits::getName,pageWrap.getModel().getName())
                .or().like(Visits::getPhone,pageWrap.getModel().getName()))
@@ -1168,6 +1181,7 @@
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Visits::getStatus,pageWrap.getModel().getStatus());
        queryWrapper.isNull(Visits::getParentId);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Visits::getMemberId,pageWrap.getModel().getMemberId());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getReceptMemberId()),Visits::getReceptMemberId,pageWrap.getModel().getReceptMemberId());
        queryWrapper.orderByDesc(Visits::getCreateDate);
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);

@@ -1243,12 +1257,14 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到被访员工信息");
        }
        VisitDetailVO visitDetailVO = new VisitDetailVO();
        visitDetailVO.setCreateTime(visits.getCreateDate());
        visitDetailVO.setStatus(visits.getStatus());
        visitDetailVO.setCarNos(visits.getCarNos());
        visitDetailVO.setPhone(visits.getPhone());
        visitDetailVO.setVisitUserName(member.getName());
        visitDetailVO.setVisitReason(visits.getReason());
        visitDetailVO.setQrcode(visits.getQrcode());
        visitDetailVO.setIdcardType(visits.getIdcardType());
        visitDetailVO.setVisitTime(DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm") + " è‡³ " + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm") );
        //被访人员部门
        Company company = companyMapper.selectById(member.getCompanyId());
@@ -1262,6 +1278,7 @@
        visitDetailVO.setConstructionReason(visits.getConstructionReason());
        visitDetailVO.setImgUrl(visits.getImgurl());
        visitDetailVO.setIdCardDecode(visits.getIdcardDecode());
        visitDetailVO.setFaceImg(visits.getFaceImg());
        visitDetailVO.setPrefix(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
                systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode());
        if(StringUtils.isNotBlank(visits.getDoors())){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -4,12 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.erp.ErpConstants;
import com.doumee.core.erp.ErpTool;
@@ -154,7 +151,7 @@
            List<Company>  allList = companyMapper.selectList(new QueryWrapper<Company>().lambda().eq(Company::getType,Constants.ONE));
            dealCompanyChangeList(list,addList,updateList,delIds,allList);
            if(addList.size()>0){
                companyMapper.insertBatchSomeColumn(addList);
                companyMapper.insert(addList);
            }
            if(updateList.size()>0){
                for(Company c : updateList){
@@ -307,7 +304,7 @@
                    .eq(Member::getType, Constants.memberType.internal));
            dealUserChangeList(list,addList,updateList,delList,allList,param);
            if(addList.size()>0){
                memberMapper.insertBatchSomeColumn(addList);
                memberMapper.insert(addList);
               /* for (Member member:addList) {
                    dealRoleEmpower(member );
                }*/
@@ -475,31 +472,30 @@
        return  false;
    }

    @Override
    public AccessTokenResponse createERPToken(String accessKey, String accessSecret){
        AccessTokenResponse result = new AccessTokenResponse();
        try{
            String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
            String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
            if(!(accessKey.equals(erpAccessKey)&&erpAccessSecret.equals(accessSecret))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"秘钥匹配失败");
            }
            JwtPayLoad payLoad = new JwtPayLoad(erpAccessKey+"-"+erpAccessSecret);
            String token = JwtTokenUtil.generateToken(payLoad);
            RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
            result.setToken(token);
            result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
            return result;
        }catch (BusinessException e){
            throw e;
        }finally {
            Map<String,String> param = new HashMap<>();
            param.put("accessKey",accessKey);
            param.put("accessSecret",accessSecret);
            saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
        }

    }
//    @Override
//    public AccessTokenResponse createERPToken(String accessKey, String accessSecret){
//        AccessTokenResponse result = new AccessTokenResponse();
//        try{
//            String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
//            String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
//            if(!(accessKey.equals(erpAccessKey)&&erpAccessSecret.equals(accessSecret))){
//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"秘钥匹配失败");
//
//            String token = JwtTokenUtil.generateToken(payLoad);
//            RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
//            result.setToken(token);
//            result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
//            return result;
//        }catch (BusinessException e){
//            throw e;
//        }finally {
//            Map<String,String> param = new HashMap<>();
//            param.put("accessKey",accessKey);
//            param.put("accessSecret",accessSecret);
//            saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
//        }
//
//    }

    /**
     * é—¨ç¦ç»„全量接口
@@ -927,7 +923,7 @@
                }
            }
            if(memberCardList.size()>0){
                memberCardMapper.insertBatchSomeColumn(memberCardList);
                memberCardMapper.insert(memberCardList);
            }
        }
    }
@@ -1011,7 +1007,7 @@
                        parkBook.setRemark("待同步安防平台");
                        parkBookList.add(parkBook);
                    }
                    parkBookMapper.insertBatchSomeColumn(parkBookList);
                    parkBookMapper.insert(parkBookList);
                }else{
                    throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，停车库信息不存在，授权失败");
                }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java

@@ -71,7 +71,7 @@
                }
            }
            if(addList.size()>0){
                deviceMapper.insertBatchSomeColumn(addList);
                deviceMapper.insert(addList);
            }
            if(editList.size()>0){
                for(Device d : editList){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDoorsServiceImpl.java

@@ -88,7 +88,7 @@
                }
            }
            if(addList.size()>0){
                deviceMapper.insertBatchSomeColumn(addList);
                deviceMapper.insert(addList);
            }
            if(editList.size()>0){
                for(Device d : editList){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java

@@ -228,7 +228,7 @@
                }
            }
            if(addList.size()>0){
                parksMapper.insertBatchSomeColumn(addList);
                parksMapper.insert(addList);
            }
            if(editList.size()>0){
                for(Parks d : editList){
@@ -367,7 +367,7 @@

                    List<CarEvent> sublist = allHkList.subList(startIndex, endIndex);
                    if(sublist.size()>0){
                        carEventMapper.insertBatchSomeColumn(sublist);//插入新数据
                        carEventMapper.insert(sublist);//插入新数据
                    }
                    startIndex = endIndex;
                    endIndex += sublistSize;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java

@@ -96,7 +96,7 @@
                }
            }
            if(addList.size()>0){
                DeviceRoleMapper.insertBatchSomeColumn(addList);
                DeviceRoleMapper.insert(addList);
            }
            if(editList.size()>0){
                for(DeviceRole d : editList){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -99,7 +99,7 @@
            }
            if(list.size()>0){
                //插入门禁记录
                deviceEventMapper.insertBatchSomeColumn(list);
                deviceEventMapper.insert(list);
            }
            if(delRetentionLis.size()>0){
                //先删除原有的在场人员(内部人员）
@@ -109,7 +109,7 @@
            }
            if(retentionList.size()>0){
                //再插入最新的在厂人员
                retentionMapper.insertBatchSomeColumn(retentionList);
                retentionMapper.insert(retentionList);
            }
            log.error("【海康门禁事件推送】========成功=======");
        }catch (Exception e) {
@@ -289,7 +289,7 @@
            }
            if(list.size()>0){
                //插入门禁记录
                visitEventMapper.insertBatchSomeColumn(list);
                visitEventMapper.insert(list);
            }
            if(delRetentionLis.size()>0){
                //先删除原有的在场人员(普通访客）
@@ -299,7 +299,7 @@
            }
            if(retentionList.size()>0){
                //再插入最新的在厂人员
                retentionMapper.insertBatchSomeColumn(retentionList);
                retentionMapper.insert(retentionList);
            }
            log.error("【海康访客事件推送】========成功=======");
        }catch (Exception e){
@@ -461,7 +461,7 @@
            }
            if(list.size()>0){
                //插入门禁记录
                carEventMapper.insertBatchSomeColumn(list);
                carEventMapper.insert(list);
            }
            if(delRetentionList.size()>0){
                //先删除原有的在场人员(内部人员）
@@ -471,7 +471,7 @@
            }
            if(retentionList.size()>0){
                //再插入最新的在厂人员
                retentionMapper.insertBatchSomeColumn(retentionList);
                retentionMapper.insert(retentionList);
            }
            log.error("【海康停车场事件推送】========成功=======");
        }catch (Exception e){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -518,7 +518,7 @@
                        .eq(Empower::getMemberId,member.getId())
                        .eq(Empower::getIsdeleted,Constants.ZERO)
                        .in(Empower::getDeviceId,deviceIds) );
                empowerMapper.insertBatchSomeColumn(list);
                empowerMapper.insert(list);
            }
        }
    }
@@ -577,7 +577,7 @@
                    .eq(Empower::getMemberId,member.getId())
                    .eq(Empower::getIsdeleted,Constants.ZERO)
                    .in(Empower::getDeviceId,deviceIds) );
            empowerMapper.insertBatchSomeColumn(list);
            empowerMapper.insert(list);
        }
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java

@@ -101,7 +101,7 @@
                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未同步到任何组织信息！");
            }
            companyMapper.delete(new UpdateWrapper<>());//清空原有数据
            companyMapper.insertBatchSomeColumn(allHkList);//插入新数据
            companyMapper.insert(allHkList);//插入新数据
        }catch (BusinessException e){
            throw  e;
        }catch (Exception e){
@@ -190,7 +190,7 @@
                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未同步到任何组织信息！");
            }
            memberMapper.delete(new UpdateWrapper<>());//清空原有数据
            memberMapper.insertBatchSomeColumn(allHkList);//插入新数据
            memberMapper.insert(allHkList);//插入新数据
        }catch (BusinessException e){
            throw  e;
        }catch (Exception e){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java

@@ -99,7 +99,7 @@
            }
            //清空原有的数据
            carsMapper.delete(new UpdateWrapper<>());
            carsMapper.insertBatchSomeColumn(allHkList);//插入新数据
            carsMapper.insert(allHkList);//插入新数据
        }catch (BusinessException e){
            throw  e;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java

@@ -108,7 +108,7 @@
                    .ge(Visits::getStarttime,start)
                    .eq(Visits::getType,Constants.ONE)
                    .le(Visits::getStarttime,end));
            visitsMapper.insertBatchSomeColumn(allHkList);//插入新数据
            visitsMapper.insert(allHkList);//插入新数据
        }catch (BusinessException e){
            throw  e;
        }

 server/visits/openapi/src/main/java/com/doumee/api/web/ApiController.java

@@ -1,6 +1,5 @@
package com.doumee.api.web;

import com.doumee.config.Jwt.JwtTokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -26,10 +25,10 @@
        return request;
    }

    protected String getToken() {
        Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
        return obj != null ? obj.toString() : null;
    }
//    protected String getToken() {
//        Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
//        return obj != null ? obj.toString() : null;
//    }


}

 server/visits/openapi/src/main/java/com/doumee/api/web/BizResourceController.java

@@ -39,7 +39,7 @@
@RestController
@RequestMapping("/visitbiz")
@Slf4j
public class BizResourceController extends ApiController {
public class BizResourceController{

    @Autowired
    private ERPSyncService erpSyncService;
@@ -51,7 +51,7 @@
    private VisitsService visitsService;


    @ApiOperation(value = "调用凭据获取接口", notes = "访客端提供，供ERP端调用，向ERP提供统接口调用凭证")
   /* @ApiOperation(value = "调用凭据获取接口", notes = "访客端提供，供ERP端调用，向ERP提供统接口调用凭证")
    @GetMapping("/accesstoken")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "accessKey", value = "访问key，由访客端提供", required = true),
@@ -60,7 +60,7 @@
    public ApiResponse<AccessTokenResponse> accesstoken(@RequestParam  String accessKey, @RequestParam  String accessSecret) {
        ApiResponse response = ApiResponse.success(null);
        try {
            response.setData(erpSyncService.createERPToken(accessKey,accessSecret));
//            response.setData(erpSyncService.createERPToken(accessKey,accessSecret));
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
@@ -317,7 +317,7 @@
        map.put("FTP资源访问映射地址",
        systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode());
        return  ApiResponse.success(map);
    }
    }*/




 server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java

@@ -36,7 +36,7 @@
@RestController
@RequestMapping("/erp/resource")
@Slf4j
public class ErpResourceController extends ApiController {
public class ErpResourceController{
    @ApiOperation(value = "全量组织信息接口", notes = "ERP端提供，供访客端拉取全部组织信息，用于初始化及周期性数据核查")
    @PostMapping("/org/list")
    public ERPApiResponse<PageData<ErpOrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {