Merge remote-tracking branch 'origin/master'

jiangping

2024-10-10 d7c484c2f5ff13b000b38cc2d078bfe752d3dad8

Merge remote-tracking branch 'origin/master'

 admin/public/favicon.ico

 admin/src/api/system/sms.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
import request from '@/utils/request'

// çŸ­ä¿¡é€šçŸ¥ åˆ†é¡µåˆ—表
export function getSmsList (data) {
  return request.post('/visitsAdmin/cloudService/business/smsConfig/page', data)
}
// çŸ­ä¿¡é€šçŸ¥ çŠ¶æ€æ›´æ–°
export function SmsStatusUpdate (data) {
  return request.post('/visitsAdmin/cloudService/business/smsConfig/updateById', data)
}

 admin/src/components/business/OperaCarsWindow.vue

@@ -16,6 +16,7 @@
          label: 'name',
          value: 'id',
          children: 'childCategoryList',
          checkStrictly: true
        }"></el-cascader>
      </el-form-item>
      <el-form-item label="选择组织：" prop="groupId">

 admin/src/components/business/OperaDeviceLedWindow.vue

@@ -10,7 +10,7 @@
                <el-input v-model="form.title" placeholder="请输入LED屏显示内容" v-trim/>
            </el-form-item>
            <el-form-item label="播放速度" prop="speed">
                <el-input type="number" v-model="form.speed" placeholder="请输入播放速度(大于0数字）" v-trim/>
                <el-input type="number" v-model="form.speed" placeholder="请输入播放速度，数字越小播放越快，建议速度8" v-trim/>
            </el-form-item>
        </el-form>
    </GlobalWindow>

 admin/src/components/business/OperaPlatformApproveTemplWindow.vue

@@ -1,11 +1,5 @@
<template>
  <GlobalWindow
      :title="title"
      width="100%"
      :visible.sync="visible"
      :confirm-working="isWorking"
      @confirm="confirm"
  >
  <GlobalWindow :title="title" width="100%" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
    <TableLayout>
      <template v-slot:table-wrap>
        <div class="config">
@@ -23,14 +17,10 @@
                <img src="@/assets/images/peizhi_ar@2x.png" alt="" />
              </div>
              <div v-for="(item, index) in apprList" :key="index">
                <div
                    class="item yellow"
                    :class="{
                <div class="item yellow" :class="{
                  active: activeIndex == index,
                  blue: item.type == '1',
                }"
                    @click="flowClick(index)"
                >
                }" @click="flowClick(index)">
                  <div class="head">{{ item.remark }}</div>
                  <div class="content">
                    <!-- å®¡æ‰¹ -->
@@ -40,25 +30,19 @@
                      </template>
                      <template v-if="item.memberType == '1'">
                        <div v-if="item.objIds && item.objIds.length === 1">
                        <span
                        >{{ item.objIds[0].name }}
                          {{ item.objIds[0].companyName }}</span
                        >
                          <span>{{ item.objIds[0].name }}
                            {{ item.objIds[0].companyName }}</span>
                          <span v-if="item.approveType == 0 && item.type == '0'">
                          æˆ–ç­¾</span
                          >
                            æˆ–ç­¾</span>
                          <span v-if="item.approveType == 1 && item.type == '0'">
                          ä¼šç­¾</span
                          >
                            ä¼šç­¾</span>
                        </div>
                        <div v-else-if="item.objIds && item.objIds.length > 1">
                          <span>{{ item.objIds[0].name }} ç­‰</span>
                          <span v-if="item.approveType == 0 && item.type == '0'">
                          æˆ–ç­¾</span
                          >
                            æˆ–ç­¾</span>
                          <span v-if="item.approveType == 1 && item.type == '0'">
                          ä¼šç­¾</span
                          >
                            ä¼šç­¾</span>
                        </div>
                        <div v-else>请选择</div>
                        <i class="el-icon-arrow-right"></i>
@@ -67,19 +51,14 @@
                    <!-- æŠ„送 -->
                    <template v-if="item.type == 1">
                      <div v-if="item.objIds && item.objIds.length === 1">
                        <span
                        >{{ item.objIds[0].name }}
                          {{ item.objIds[0].companyName }}</span
                        >
                        <span>{{ item.objIds[0].name }}
                          {{ item.objIds[0].companyName }}</span>
                      </div>
                      <div v-else-if="item.objIds && item.objIds.length > 1">
                        <span>{{ item.objIds[0].name }} ç­‰</span>
                      </div>
                      <div v-else>请选择</div>
                      <i
                          v-if="item.memberType == '1'"
                          class="el-icon-arrow-right"
                      ></i>
                      <i v-if="item.memberType == '1'" class="el-icon-arrow-right"></i>
                    </template>
                  </div>
                </div>
@@ -88,11 +67,7 @@
                    <div class="line"></div>
                    <img src="@/assets/images/peizhi_ar@2x.png" alt="" />
                  </template>
                  <i
                      v-if="apprList.length - 2 === index"
                      @click="handleAddAppr()"
                      class="el-icon-circle-plus add"
                  ></i>
                  <i v-if="apprList.length - 2 === index" @click="handleAddAppr()" class="el-icon-circle-plus add"></i>
                </div>
              </div>
            </div>
@@ -102,160 +77,103 @@
              <div class="config_data_item_label">选择该节点的审批人</div>
              <div class="df_ac mb10">
                <div>审批节点名称</div>
                <el-input
                    class="w200 ml10"
                    v-model="apprList[activeIndex].remark"
                ></el-input>
                <el-input class="w200 ml10" v-model="apprList[activeIndex].remark"></el-input>
              </div>
              <!-- æŠ„送人 -->
              <template v-if="apprList[activeIndex].type == '1'">
                <div class="config_data_item_reviewed_content">
                  <div
                      v-for="mem in apprList[activeIndex].objIds"
                      :key="mem.id"
                      class="config_data_item_reviewed_content_item"
                  >
                  <div v-for="mem in apprList[activeIndex].objIds" :key="mem.id"
                    class="config_data_item_reviewed_content_item">
                    <span>{{ mem.name }}</span>
                    <i class="el-icon-close"></i>
                  </div>
                  <span class="add" @click="selStaff">+添加</span>
                </div>
              </template>
              <el-radio-group
                  v-if="apprList[activeIndex].type == '0'"
                  v-model="apprList[activeIndex].memberType"
              >
              <el-radio-group v-if="apprList[activeIndex].type == '0'" v-model="apprList[activeIndex].memberType">
<!--                <el-radio :label="0">申请人</el-radio>-->
                <el-radio :label="1">指定人员</el-radio>
                <el-radio :label="2">部门主管</el-radio>
              </el-radio-group>
              <div
                  class="config_data_item_reviewed"
                  v-if="apprList[activeIndex].memberType == 1"
              >
              <div class="config_data_item_reviewed" v-if="apprList[activeIndex].memberType == 1">
                <div class="config_data_item_reviewed_label">
                  <span>指定审核人</span>
                  <span>不超过20人</span>
                </div>
                <div class="config_data_item_reviewed_content">
                  <div
                      v-for="(mem, memIndex) in apprList[activeIndex].objIds"
                      :key="mem.id"
                      class="config_data_item_reviewed_content_item"
                  >
                  <div v-for="(mem, memIndex) in apprList[activeIndex].objIds" :key="mem.id"
                    class="config_data_item_reviewed_content_item">
                    <span>{{ mem.name }}</span>
                    <i class="el-icon-close" @click="memDel(memIndex)"></i>
                  </div>
                  <span class="add" @click="selStaff">+添加</span>
                </div>
              </div>
              <div
                  class="config_data_item_reviewed"
                  v-if="apprList[activeIndex].memberType == 2"
              >
              <div class="config_data_item_reviewed" v-if="apprList[activeIndex].memberType == 2">
                <div class="config_data_item_reviewed_label">
                  <span>部门主管</span>
                </div>
                <div class="config_data_item_reviewed_r">
                  <span>申请人的</span>
                  <el-select
                      v-model="apprList[activeIndex].objLevel"
                      placeholder="请选择"
                      style="margin: 0 20px 0 10px"
                  >
                  <el-select v-model="apprList[activeIndex].objLevel" placeholder="请选择" style="margin: 0 20px 0 10px">
                    <el-option label="直接主管" :value="0" />
                    <el-option label="二级主管" :value="1" />
                    <el-option label="三级主管" :value="2" />
                    <el-option label="四级主管" :value="4" />
                  </el-select>
                  <el-checkbox
                      v-model="apprList[activeIndex].noleaderOpt"
                      :true-label="1"
                      :false-label="0"
                  >找不到主管时，由上级主管代审核</el-checkbox>
                  <el-checkbox v-model="apprList[activeIndex].noleaderOpt" :true-label="1"
                    :false-label="0">找不到主管时，由上级主管代审核</el-checkbox>
                </div>
              </div>
            </div>
            <div
                class="config_data_item"
                v-if="
            <div class="config_data_item" v-if="
              (apprList[activeIndex].memberType == 1 ||
                apprList[activeIndex].memberType == 2) &&
              apprList[activeIndex].type == '0'
            "
            >
            ">
              <div class="config_data_item_label">
                å®¡æ‰¹æ–¹å¼
                <span>审批人为多个时，采用的审批方式</span>
              </div>
              <el-radio-group
                  v-model="apprList[activeIndex].approveType"
                  style="display: flex; flex-direction: column"
              >
                <el-radio :label="0" style="margin-bottom: 20px"
                >或签（其中一名审批人同意或拒绝即可）</el-radio
                >
              <el-radio-group v-model="apprList[activeIndex].approveType" style="display: flex; flex-direction: column">
                <el-radio :label="0" style="margin-bottom: 20px">或签（其中一名审批人同意或拒绝即可）</el-radio>
                <el-radio :label="1">会签（所有审批人都同意才可通过）</el-radio>
              </el-radio-group>
            </div>
            <div class="config_data_submit">
              <el-button
                  @click="onSubmit"
                  :loading="subLoading"
                  style="background: #435ebe"
                  type="primary"
              >保存配置项</el-button
              >
              <el-button
                  v-if="activeIndex !== 0 && activeIndex !== apprList.length - 1"
                  type="danger"
                  plain
                  @click="handleDel"
              >删除节点</el-button
              >
              <el-button @click="onSubmit" :loading="subLoading" style="background: #435ebe"
                type="primary">保存配置项</el-button>
              <el-button v-if="activeIndex !== 0 && activeIndex !== apprList.length - 1" type="danger" plain
                @click="handleDel">删除节点</el-button>
            </div>
          </div>
        </div>
      </template>
      <!--  -->
      <el-dialog title="选择员工" :visible.sync="isShowTransfer" width="1000px" style="z-index: 99999" append-to-body>
      <el-dialog title="选择员工" :visible.sync="isShowTransfer" width="900px" style="z-index: 99999" append-to-body>
        <div class="staff_modal">
          <div class="left">
            <div
                style="
            <div style="
              width: 100%;
              height: 50px;
              background: rgba(242, 242, 242, 1);
              line-height: 50px;
              text-align: center;
              font-size: 14px;
            "
            >
            ">
              ä¼ä¸šç»„织架构
            </div>
            <div style="width: 100%; height: 100%; overflow-y: scroll">
              <Tree
                  :list="companyTree"
                  :defaultProps="{
              <Tree :list="companyTree" :defaultProps="{
                name: 'name',
                status: 'fsStatus',
                children: 'childList',
                id: 'id',
              }"
                  @callback="callback"
              />
              }" @callback="callback" />
            </div>
          </div>
          <el-transfer
              filterable
              :title="['未选', '已选']"
              openAll
              :props="{ label: 'name', key: 'keyTemp' }"
              filter-placeholder="搜索员工"
              v-model="searchForm.objIds"
              :data="memberList"
              class="transfer"
          >
          <el-transfer filterable  :titles="['未选', '已选']" openAll :props="{ label: 'name', key: 'keyTemp' }"
            filter-placeholder="搜索员工" v-model="searchForm.objIds" :data="memberList" class="transfer">
          </el-transfer>
        </div>
        <span slot="footer" class="dialog-footer">
@@ -489,6 +407,7 @@
  font-size: 12px;
  color: #666666;
}

.config {
 width: 100%;
 padding-bottom: 20px;
@@ -497,6 +416,7 @@
 display: flex;
 align-items: center;
 justify-content: space-between;

.config_list {
  width: 543px;
  height: 100%;
@@ -506,18 +426,21 @@
  box-sizing: border-box;
  border: 1px solid #eeeeee;
  background: #f7f7f7;

.config_list_head {
  width: 100%;
  height: 40px;
  display: flex;
  align-items: center;
  justify-content: space-between;

span {
  font-size: 18px;
  font-weight: 500;
  color: #222222;
}
}

.config_content {
  width: 100%;
  height: calc(100% - 40px);
@@ -527,28 +450,35 @@
  display: flex;
  align-items: center;
  flex-direction: column;

&::-webkit-scrollbar {
   width: 0;
 }

.active {
  border: 2px solid #4456ac !important;
}

.yellow {
  background: #e89e42 !important;
}

.blue {
  background: #5094f3 !important;
}

.arrows {
  display: flex;
  flex-direction: column;
  align-items: center;
  position: relative;

.line {
  width: 1px;
  height: 60px;
  background-color: #ccc;
}

.add {
  font-size: 40px;
  color: #2080f7;
@@ -557,10 +487,12 @@
  z-index: 999;
  top: 10px;
}

img {
  width: 12px;
}
}

.item {
  width: 200px;
  cursor: pointer;
@@ -571,12 +503,14 @@
  position: relative;
  display: flex;
  flex-direction: column;

.head {
  height: 32px;
  line-height: 32px;
  padding: 2px 12px;
  color: #fff;
}

.content {
  flex: 1;
  background-color: #fff;
@@ -585,32 +519,39 @@
  padding: 0 12px;
  justify-content: space-between;
}

&:last-child {
   margin: 0 !important;
 }
}
}
}

.config_data {
  flex: 1;
  height: 100%;
  margin-left: 20px;

.config_data_submit {
  margin-top: 50px;
}

.config_data_item {
  width: 100%;
  display: flex;
  flex-direction: column;
  margin-bottom: 30px;

&:last-child {
   margin: 0 !important;
 }

.config_data_item_label {
  font-size: 16px;
  font-weight: 500;
  color: #222222;
  margin-bottom: 20px;

span {
  font-size: 12px;
  font-weight: 400;
@@ -618,14 +559,17 @@
  margin-left: 10px;
}
}

.config_data_item_reviewed {
  width: 100%;
  margin-top: 20px;

.config_data_item_reviewed_r {
  margin-top: 10px;
  width: 100%;
  display: flex;
  align-items: center;

span {
  flex-shrink: 0;
  font-size: 14px;
@@ -633,15 +577,18 @@
  color: #666666;
}
}

.config_data_item_reviewed_label {
  display: flex;
  align-items: center;

span {
&:nth-child(1) {
   font-size: 14px;
   font-weight: 400;
   color: #222222;
 }

&:nth-child(2) {
   font-size: 12px;
   font-weight: 400;
@@ -654,6 +601,7 @@
}
}
}

.config_data_item_reviewed_content {
  width: 400px;
  margin-top: 10px;
@@ -665,6 +613,7 @@
  display: flex;
  align-items: flex-start;
  flex-wrap: wrap;

.add {
  font-size: 12px;
  font-weight: 400;
@@ -672,6 +621,7 @@
  cursor: pointer;
  margin-top: 3px;
}

.config_data_item_reviewed_content_item {
  padding: 3px 5px;
  background: #f4f7fc;
@@ -679,11 +629,13 @@
  box-sizing: border-box;
  margin-right: 10px;
  margin-bottom: 10px;

span {
  font-size: 12px;
  font-weight: 400;
  color: #333333;
}

i {
  color: #949ba2;
  margin-left: 10px;
@@ -691,17 +643,29 @@
}
}
}

.staff_modal {
  display: flex;

.left {
  width: 300px;
    width: 240px;
  margin-right: 20px;
}

.transfer {
  height: 600px;
    width: 100%;
    display: flex;
    justify-content: center;
    align-items: center;
    ::v-deep .el-transfer-panel{
      flex: 1;
      height: 100%;
    }
::v-deep .el-transfer-panel__body {
  height: 500px;
}

::v-deep .el-transfer-panel__list.is-filterable {
  height: 480px;
}

 admin/src/layouts/TableLayout1.vue

@@ -8,10 +8,10 @@
        </div>-->
        <Profile :roles="roles" :permissions="permissions">
            <div style="width: 100%; height: 100%; padding: 0 16px; box-sizing: border-box; display: flex; align-items: center; justify-content: space-between;">
                <div style="width: 300px; height: 100%; flex-shrink: 0; background: #ffffff;">
                <div style="width: 240px; height: 100%; flex-shrink: 0; background: #ffffff;">
                    <slot name="menu"></slot>
                </div>
                <div style="width: calc(100% - 310px); height: 100%">
                <div style="width: calc(100% - 250px); height: 100%">
                    <!-- æœç´¢è¡¨å•éƒ¨åˆ† -->
                    <div class="table-search-form" style="padding: 0 !important;">
                        <div class="form-wrap">

 admin/src/views/platform/LogisticsRecord/leaveAuth.vue

@@ -122,7 +122,7 @@
          {
            filed: 'selDate',
            type: 'datetimerange',
            label: '操作时间',
            label: '作业完成时间搜索',
            pickerOptions: {}
          },
          {

 admin/src/views/platform/LogisticsRecord/waybillQuery.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,181 @@
<template>
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)"
      @clear="clear">
    </QueryForm>
    <div class="pt16">
      <el-button :loading="exLoading" @click="handleEx"
        v-permissions="['business:platformjob:exportExcel']">导出</el-button>
    </div>
    <el-table class="mb20" v-loading="loading" :data="list" stripe>
      <el-table-column prop="billCode" label="姓名" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeFront" label="手机号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="taskOrigin" label="营销区域" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carrierName" label="备注" min-width="100" show-overflow-tooltip />
      <el-table-column prop="driverName" label="最后更新时间" min-width="100" show-overflow-tooltip />
      <el-table-column prop="name" label="操作" min-width="120" align="center" fixed="right" show-overflow-tooltip>
        <template v-slot="scope">
          <el-button v-if="scope.row.status == '12'" type="text" class="red" v-permissions="['business:platformjob:delete']"
            @click="handleDel(scope.row)">删除</el-button>
          <el-button v-if="scope.row != 12" type="text" v-permissions="['business:platformjob:query']"
            @click="handleDetail(scope.row)">编辑</el-button>
        </template>
      </el-table-column>
    </el-table>
    <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
    <!--  -->
    <!--  -->
    <WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
  </div>
</template>

<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { statusMap } from '../config'
import WaybillDetailRef from "../components/WaybillDetail.vue"
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
export default {
  components: {
    Pagination,
    QueryForm,
    WaybillDetailRef,
    GlobalWindow,
    UploadFaceImg
  },
  data() {
    return {
      statusMap,
      isShowDetail: false,
      exLoading: false,
      loading: false,
      pagination: {
        pageSize: 10,
        page: 1,
        total: 0
      },
      filters: {
        selDate: [],
        fastdate: 0
      },
      list: [],
      queryFormConfig: {
        formItems: [
          {
            filed: 'name',
            type: 'input',
            label: '姓名'
          },
          {
            filed: 'phone',
            type: 'input',
            label: '手机号'
          }
        ],
        online: true
      },
    }
  },
  created() {
    this.changeRadio('0')
    this.getList()
  },
  methods: {
    changeRadio(day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
      this.$set(this.filters, 'selDate', arr)
      this.getList()
    },
    changeForm(str) {
      if (str === 'selDate') {
        this.$set(this.filters, 'fastdate', null)
        this.getList()
      }
    },
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      platformJobPage({
        model: {
          ...filters,
          jobType: '0',
          createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
        },
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
        this.loading = false
        this.list = res.records || []
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
        })
        this.pagination.total = res.total || 0
      }, () => {
        this.loading = false
      })
    },
    handleDel(row) {
      this.$dialog.exportConfirm('确认删除吗？').then(() => {
        platformJobDel(row.id).then(res => {
          Message.success('删除成功')
          this.getList()
        })
      })
    },
    handleEx() {
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          this.exLoading = true
          platformJobExport({
            page: this.pagination.page,
            capacity: 1000000,
            jobType: '0',
            model: this.filters
          })
            .then(response => {
              this.download(response)
            })
            .catch(e => {
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.exLoading = false
            })
        })
    },
    clear() {
      this.pagination.page = 1
      this.filters = {
        selDate: [],
        fastdate: 0
      }
      this.getList()
    },
    handleDetail(row) {
      this.isShowDetail = true
      this.$nextTick(() => {
        this.$refs.WaybillDetailRef.isShowModal = true
        this.$refs.WaybillDetailRef.id = row.id
        this.$refs.WaybillDetailRef.getDetail()
      })
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
    }
  }
}
</script>
<style lang="scss" scoped>
.param_title {
  font-size: 18px;
  font-weight: 600;
  color: #000000;
  margin-bottom: 15px;
}
</style>

 admin/src/views/platform/components/WaybillDetail.vue

@@ -27,7 +27,16 @@
      <div class="title">合同列表</div>
      <div class="content">
        <div class="item" v-for="item in info.wmsJobContractVOList">
          <div class="contract">合同号：{{ item.contractCode }}</div>
          <div class="contract">
            <span>合同号：{{ item.contractCode }}</span>
            <div>
              <span class="scs" v-if="item.platformWmsDetailList[0].status == 1">WMS作业已完成</span>
              <span class="pad" v-if="item.platformWmsDetailList[0].status == 0">WMS作业未完成</span>
              <span class="err" v-if="item.platformWmsDetailList[0].status == 2">WMS作业已取消</span>
              <span class="scs" v-if="item.platformWmsDetailList[0].lockStatus == 1">电子锁已上锁</span>
              <span class="pad" v-if="item.platformWmsDetailList[0].lockStatus == 0">电子锁未上锁</span>
            </div>
          </div>
          <div class="placeholder6">收货地：{{ item.address }}</div>
          <div class="list">
            <div class="line" v-for="line in item.platformWmsDetailList">
@@ -151,6 +160,17 @@
        font-size: 15px;
        color: #279baa;
        margin-bottom: 4px;
        display: flex;
        justify-content: space-between;
        .scs{
          color: #00ba67;
        }
        .pad{
          color: #f19c3f;
        }
        .err{
          color: red;
        }
      }

      .line {

 admin/src/views/platform/platformGroup.vue

@@ -26,8 +26,8 @@
            <span v-if="row.type == 2">市公司卸货</span>
          </template>
        </el-table-column>
        <el-table-column prop="waitCallTime" label="叫号等待时间（分钟）" min-width="100px"  align="center"></el-table-column>
        <el-table-column prop="editDate" label="最近更新时间" min-width="140px"  align="center"></el-table-column>
        <el-table-column prop="waitCallTime" label="叫号等待时间（分钟）" min-width="140px"  align="center"></el-table-column>
        <el-table-column prop="editDate" label="最近更新时间" min-width="150px"  align="center"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:platformgroup:update', 'business:platformgroup:delete'])"
          label="操作"

 admin/src/views/system/smsMessage.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,132 @@
<template>
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)"
      @clear="clear">
    </QueryForm>
    <!-- <div class="pt16">
      <el-button :loading="exLoading" @click="handleEx"
        v-permissions="['business:platformjob:exportExcel']">导出</el-button>
    </div> -->
    <el-table class="mb20" v-loading="loading" :data="list" stripe>
      <el-table-column prop="name" label="消息标题" min-width="160" show-overflow-tooltip />
      <el-table-column prop="code" label="消息编码" min-width="150" show-overflow-tooltip />
      <el-table-column prop="content" label="消息模板" min-width="300" show-overflow-tooltip />
      <el-table-column label="状态" width="120" align="center" fixed="right">
        <template v-slot="scope">
          <el-switch v-model="scope.row.status" @change="changeStatus(scope.row)" :active-value="0" :inactive-value="1">
          </el-switch>  
        </template>
      </el-table-column>
    </el-table>
    <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
  </div>
</template>

<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import { getSmsList, SmsStatusUpdate } from '@/api/system/sms'

import GlobalWindow from '@/components/common/GlobalWindow'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
export default {
  components: {
    Pagination,
    QueryForm,
    GlobalWindow,
  },
  data() {
    return {
      isShowDetail: false,
      exLoading: false,
      loading: false,
      pagination: {
        pageSize: 10,
        page: 1,
        total: 0
      },
      filters: {},
      list: [],
      queryFormConfig: {
        formItems: [
          {
            filed: 'name',
            type: 'input',
            label: '消息标题'
          },
          {
            filed: 'status',
            type: 'select',
            label: '启用状态',
            options: [
              { value: 0, label: '启用' },
              { value: 1, label: '禁用' },
            ]
          },
          {
            filed: 'code',
            type: 'input',
            label: '消息编码'
          }
        ],
        online: true
      },
    }
  },
  created() {
    this.getList()
  },
  methods: {
    changeStatus(row) {
      console.log('row', row);
      SmsStatusUpdate({
        ...row
      }).then(res => {
        Message.success('状态更新成功')
      }, () => {
        this.getList()
      })
    },
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      getSmsList({
        model: {
          ...filters,
        },
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
        this.loading = false
        this.list = res.records || []
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
        })
        this.pagination.total = res.total || 0
      }, () => {
        this.loading = false
      })
    },
   
    
    clear() {
      this.pagination.page = 1
      this.filters = {}
      this.getList()
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
    }
  }
}
</script>
<style lang="scss" scoped>
.param_title {
  font-size: 18px;
  font-weight: 600;
  color: #000000;
  margin-bottom: 15px;
}
</style>

 admin/src/views/vehicle/components/OperaCategoryWindow.vue

@@ -1,13 +1,13 @@
<template>
  <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" width="600px" @close="close" @confirm="confirm">
    <el-form :model="form" ref="form" :rules="rules">
      <el-form-item label="一级分类" prop="parentId">
      <el-form-item label="所属分类" prop="parentId">
        <el-select v-model="form.parentId" placeholder="不填为则一级分类">
          <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="二级分类" prop="name">
        <el-input v-model="form.name" placeholder="请输入二级分类" v-trim />
      <el-form-item label="分类名称" prop="name">
        <el-input v-model="form.name" placeholder="请输入分类名称" v-trim />
      </el-form-item>
      <!-- <el-form-item label="状态" prop="status">
        <el-select v-model="form.status" placeholder="请选择">

 screen/src/views/PlatformCall.vue

@@ -1,5 +1,5 @@
<script setup>
import { ref, onMounted } from 'vue'
import { ref, onMounted, nextTick } from 'vue'
import dayjs from 'dayjs'
import UQRCode from 'uqrcodejs'
import { getLargeScreenData } from '@/utils/request'
@@ -22,7 +22,8 @@
    if (res.data && res.data.allList) {
      contentList.value = res.data.allList.map(item => {
        if (item.optTime) {
          item.optTimeTemp = dayjs.duration(item.optTime).format('HH小时mm分')
          item.optTimeTemp = dayjs(item.optTime).format('HH:mm')
          // item.optTimeTemp = dayjs.duration(Math.abs(new Date().getTime() - item.optTime)).format('HH:mm')
        }
        return item
      })
@@ -106,7 +107,7 @@
  var qr = new UQRCode()
  // è®¾ç½®äºŒç»´ç å†…容
  qr.data = qrcode.value
  qr.size = 220
  qr.size = 210
  // è°ƒç”¨åˆ¶ä½œäºŒç»´ç æ–¹æ³•
  qr.make()
  var canvas = document.getElementById("qrcode")
@@ -139,6 +140,51 @@
  newDate.value = dayjs().format('YYYY-MM-DD')
  newTime.value = dayjs().format('HH:mm')
}, 1000)

const isFullscreen = ref(false);
const handleFull = () => {
  if(!isFullscreen.value){
    handleFullScreen()
  }else{
    cancelFullscreen()
  }
}
setTimeout(() => {
  handleFull()
}, 1000)
const handler = () => {
  isFullscreen.value = document.fullscreenElement !== null;
  if (!isFullscreen) {
    // é€€å‡ºå…¨å±æ—¶å€™è§£é™¤ç›‘听，不然每次监听都会添加一次绑定 
    document.removeEventListener("fullscreenchange", handler);
  }
};
document.addEventListener("fullscreenchange", handler);
const handleFullScreen = () => {
  let elem = document.documentElement
  // å°è¯•å¯ç”¨å…¨å±æ¨¡å¼
  if (elem.requestFullscreen) {
    elem.requestFullscreen()
  } else if (elem.mozRequestFullScreen) { // å…¼å®¹ Firefox
    elem.mozRequestFullScreen()
  } else if (elem.webkitRequestFullscreen) { // å…¼å®¹ Chrome, Safari å’Œ Opera
    elem.webkitRequestFullscreen()
  } else if (elem.msRequestFullscreen) { // å…¼å®¹ IE/Edge
    elem.msRequestFullscreen()
  }
}
function cancelFullscreen() {
  if (document.exitFullscreen) {
    document.exitFullscreen();
  } else if (document.msExitFullscreen) {
    document.msExitFullscreen();
  } else if (document.mozCancelFullScreen) {
    document.mozCancelFullScreen();
  } else if (document.webkitExitFullscreen) {
    document.webkitExitFullscreen();
  }
}

</script>
<template>
  <div class="main_app">
@@ -203,14 +249,14 @@
        </div>
        <div class="qrcode_wrap">
          <div class="qrcode">
            <canvas id="qrcode" width="220" height="220"></canvas>
            <canvas id="qrcode" width="210" height="210"></canvas>
          </div>
          <div class="title">请扫码签到</div>
        </div>
      </div>
    </div>
    <div class="main_footer">
      <img src="@/assets/images/call/ic_news@2x.png" class="icon" alt="">
      <img @click="handleFull" src="@/assets/images/call/ic_news@2x.png" class="icon" alt="">
      <div class="title">请根据队列提示信息，依次等候进场</div>
      <div class="icon"></div>
    </div>
@@ -221,6 +267,7 @@
div{
  box-sizing: border-box;
}

.main_app {
  color: #fff;
  position: fixed;
@@ -231,10 +278,10 @@
  overflow: hidden;
  background-color: #092030;
  position: relative;
  z-index: -2;
  display: flex;
  flex-direction: column;
  justify-content: space-between;

  .main_header {
    width: 100%;
    height: 112px;
@@ -243,7 +290,7 @@
    align-items: center;
    justify-content: space-between;
    padding: 0 50px;

    z-index: 11;
    .title {
      font-weight: 800;
      font-size: 48px;
@@ -288,15 +335,18 @@
    display: flex;
    padding: 30px 20px;
    position: relative;

    .list {
      flex: 5;
      margin-right: 20px;
      display: flex;
      flex-direction: column;

      .line {
        display: flex;
        align-items: center;
        flex: 1;
        height: 11.1%;

        &:nth-of-type(2n) {
          background: rgba(255, 255, 255, 0);
        }
@@ -311,13 +361,15 @@
          align-items: center;
          flex-direction: column;
          font-weight: 500;
          font-size: 36px;
          font-size: 30px;
          flex: 10;
          height: 100%;

          .time_place{
            font-weight: 500;
            font-size: 24px;
            font-size: 22px;
          }

          .status {
            /* padding: 0 28px; */
            width: 170px;
@@ -348,8 +400,10 @@
      }

      .header {
        .item {
        font-size: bold;
        font-size: 40px;
          font-size: 36px;
        }
        background: linear-gradient(180deg, #00B5D1 0%, #003C57 100%) !important;
      }
    }
@@ -359,13 +413,14 @@
      flex: 2;
      display: flex;
      flex-direction: column;
      border: 1px solid red;

      .tip_wrap {
        margin-bottom: 20px;
        width: 100%;
        position: relative;
        /* flex-shrink: 0; */
        flex: 1;

        .current_plat {
          display: flex;
          flex-direction: column;
@@ -373,14 +428,14 @@
          justify-content: center;
          padding: 30px 40px;
          color: #FFA000;

          height: 100%;
          .id_card {
            font-weight: bold;
            font-weight: 500;
            font-size: 68px;
          }

          .no {
            margin: 10px 0;
            margin: 8px 0;
            font-weight: 500;
            font-size: 52px;
          }
@@ -392,24 +447,27 @@

          .plat {
            color: #fff;
            margin: 0 10px;
            margin: 0 6px;
          }
        }

        .empty {
          padding: 30px 40px;
          display: flex;
          flex-direction: column;
          justify-content: center;
          font-weight: 500;
          font-size: 30px;

          font-size: 26px;
          height: 100%;
          .title {
            text-align: center;
            font-weight: bold;
            font-size: 36px;
            margin-bottom: 20px;
            font-size: 32px;
            margin-bottom: 16px;
          }

          .line {
            margin-bottom: 10px;
            margin-bottom: 8px;
            padding-left: 32px;
          }
        }

@@ -446,9 +504,9 @@
        }

        .title {
          margin-top: 20px;
          margin-top: 16px;
          font-weight: bold;
          font-size: 34px;
          font-size: 28px;
          color: #111111;
        }
      }

 screen/vite.config.js

@@ -16,6 +16,9 @@
      '@': fileURLToPath(new URL('./src', import.meta.url))
    }
  },
  build: {
    outDir: 'platform_screen'
  },
  server: {
    proxy: {
      "/gateway_interface": {

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

@@ -317,6 +317,35 @@
        }
    }


    /**
     * èŽ·å–X月份之前的月份数
     * @param currentDate
     * @param month
     * @return
     */
    public static List<String> getBeforMonth(Date currentDate , Integer month) {
        SimpleDateFormat sdfYear = new SimpleDateFormat("yyyy");
        SimpleDateFormat sdfMonth = new SimpleDateFormat("MM");
        int currentYear = Integer.parseInt(sdfYear.format(currentDate));
        int currentMonth = Integer.parseInt(sdfMonth.format(currentDate));
        List<String> list = new ArrayList<>();

        System.out.println("近12个月份：");
        for (int i = 0; i < month; i++) {
            int tempYear = currentYear;
            int tempMonth = currentMonth - i;

            if (tempMonth <= 0) {
                tempYear--;
                tempMonth += 12;
            }
            list.add(tempYear +"-" + StringUtils.leftPad(Integer.toString(tempMonth),2,"0"));
        }
        return list;
    }


    /**
     * Descrption:取得当前日期时间,格式为:YYYYMMDDHHMISS
     *
@@ -2775,16 +2804,18 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
            Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
            Long intervalTime = 35L;
            DateUtil.getBeforMonth(new Date(),12);


            DateUtil.checkDateInterval( startTime.toInstant()
                    .atZone(ZoneId.systemDefault())
                    .toLocalDateTime(), endTime.toInstant()
                    .atZone(ZoneId.systemDefault())
                    .toLocalDateTime(),intervalTime);
//            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
//            Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
//            Long intervalTime = 35L;
//
//
//            DateUtil.checkDateInterval( startTime.toInstant()
//                    .atZone(ZoneId.systemDefault())
//                    .toLocalDateTime(), endTime.toInstant()
//                    .atZone(ZoneId.systemDefault())
//                    .toLocalDateTime(),intervalTime);

        } catch (Exception ex) {
            ex.printStackTrace();

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

@@ -19,31 +19,32 @@

public class SmsConstants {

    public interface SmsObjectType{
        String inventCode = "0"; //验证码
        String visit= "1"; //访客申请
        String visitReport = "2"; //访客报备
        String hiddenDanger ="3";//隐患随手拍
        String carUse ="4";//用车申请
        String meeting ="5";//会议预约
        String platformBook ="6";//物流车预约
        String platformJob ="7";//月台作业
    }


    public static final String inventCode ="inventCode" ;
    public static final String visit ="visit" ;
    public static final String visitReport ="visitReport" ;
    public static final String hiddenDanger ="hiddenDanger" ;
    public static final String carUse ="carUse" ;
    public static final String meeting ="meeting" ;
    public static final String platformBook ="platformBook" ;
    public static final String platformJob ="platformJob" ;


    /**
     * è®¿å®¢ç”³è¯·
     */
    public interface visitContent{
        //访客申请-通知（给审批人）
        String visitNotice = "您有一条【{访客申请}】需要处理，详细信息请前往微信公众号查看。";
        String visitNotice = "visitNotice";
        //访客申请-审批通过通知（给申请人）：。
        String visitAuditSuccess = "您的【{访客申请}】已经审批通过，请于{预约入园开始时间}前往门卫室访客机签到入园，如有疑问，请联系被访人";
        String visitAuditSuccess = "visitAuditSuccess";
        //访客申请-审批驳回通知（给申请人）：。
        String visitAuditFail = "您的【{访客申请}】已被驳回，驳回原因为：{驳回原因}。如有疑问，请联系被访人。";
        String visitAuditFail = "visitAuditFail";
        //访客申请-超时未签离-通知（给申请人）：
        String visitTimeOutSignOut = "您的【访客申请】已于{到期时间}到期，请及时离场并前往门卫室访客机签离，如有疑问，请联系被访人";
        String visitTimeOutSignOut = "visitTimeOutSignOut";
        //访客申请-超时未签离-通知（给指定接收人）
        String visitTimeOutSignOutNum = "今日还有{未签离数量}个访客未签离，请前往PC端查看详细信息。";
        String visitTimeOutSignOutNum = "visitTimeOutSignOutNum";

    }

@@ -53,15 +54,15 @@
     */
    public interface visitReportingContent{
        //访客报备-通知（给审批人）
        String visitReportingNotice = "您有一条【{访客报备}】需要处理，详细信息请前往微信公众号查看。";
        String visitReportingNotice = "visitReportingNotice";
        //访客报备-审批通过通知（给申请人）：。
        String visitReportingAuditSuccess = "您的【{访客报备}】已经审批通过，请通知访客于{预约入园开始时间}后乘坐{车牌号}入园，如有疑问，请联系被访人。";
        String visitReportingAuditSuccess = "visitReportingAuditSuccess";
        //访客报备-审批驳回通知（给申请人）：。
        String visitReportingAuditFail = "您的【{访客报备}】已被驳回，驳回原因为：{驳回原因}。如有疑问，请联系审批人。";
        String visitReportingAuditFail = "visitReportingAuditFail";
        //访客报备-超时未离场-通知（给申请人）：
        String visitReportingTimeOutSignOut = "您的【访客报备】已于{预约入园结束时间}到期，请及时离场，如有疑问，请联系被访人";
        String visitReportingTimeOutSignOut = "visitReportingTimeOutSignOut";
        //访客报备-超时未离场-通知（给指定接收人）
        String visitReporting_time_out_sign_out_num = "今日还有{未签离数量}个访客报备车辆未离场，请前往PC端查看详细信息。";
        String visitReportingTimeOutSignOutNum = "visitReportingTimeOutSignOutNum";
    }


@@ -70,9 +71,9 @@
     */
    public interface hiddenDangerContent{
        //隐患随手拍-通知（给处理人）
        String hiddenDanger_deal_user = "您有一条【{隐患随手拍-消防隐患}】需要处理，详细信息请前往微信公众号查看";
        String hiddenDangerDealUser = "hiddenDangerDealUser";
        //隐患随手拍-处理完成（给申请人）：。
        String hiddenDanger_deal_over = "您提交的【{隐患随手拍-消防隐患}】已经处理完毕，详细信息请前往微信公众号查看。";
        String hiddenDangerDealOver = "hiddenDangerDealOver";
    }


@@ -81,13 +82,13 @@
     */
    public interface carUseBookContent{
        //短信通知模板（给处理人）
        String carUseBook_wait_audit = "您有一条【{用车申请}】需要处理，详细信息请前往微信公众号查看。";
        String carUseBookWaitAudit = "carUseBookWaitAudit";
        //用车申请-审批通过通知（给申请人）：。
        String carUseBook_audit_success = "您的【{用车申请}】已经审批通过，出发时间为{提交的出发时间}，请按时用车。如用车计划有变，请及时联系派车员。";
        String carUseBookAuditSuccess = "carUseBookAuditSuccess";
        //用车申请-审批驳回通知（给申请人）：。
        String carUseBook_audit_fail = "您的【{用车申请}】已被驳回，驳回原因为：{驳回原因}。如有疑问，请联系派车员。";
        String carUseBookAuditFail = "carUseBookAuditFail";
        //用车申请-审批驳回通知（给申请人）：。
        String carUseBook_cancel = "您的【{用车申请}】已被取消，取消原因为：{取消原因}。如有疑问，请联系派车员。";
        String carUseBookCancel = "carUseBookCancel";
    }


@@ -96,13 +97,13 @@
     */
    public interface platformBookContent{
        //短信通知模板（给处理人）
        String platformBook_wait_audit = "您有一条【车辆入园申请】需要处理，详细信息请前往微信公众号查看。";
        String platformBookWaitAudit = "platformBookContent";
        //物流车预约-审批通过通知（给申请人）：。
        String platformBook_audit_success = "您的【车辆入园申请】已经审批通过，入园时间为2024-7-19 09:00，请提前30分钟前往现场签到。如计划有变，请及时联系审核人员。";
        String platformBookAuditSuccess = "platformBookAuditSuccess";
        //物流车预约-审批驳回短信通知模板（给申请人）
        String platformBook_audit_fail = "您的【车辆入园申请】已被驳回，驳回原因为：{驳回原因}。如有疑问，请联系审核人员。";
        String platformBookAuditFail = "platformBookAuditFail";
        //物流车预约-入园预约取消短信通知模板（给申请人）
        String carUseBook_cancel = "您的【车辆入园申请】已被取消，取消原因为：{取消原因}。如有疑问，请联系审核人员。";
        String carUseBookCancel = "carUseBookCancel";
    }


@@ -111,25 +112,25 @@
     */
    public interface platformJobContent{
        // è¿è¾“任务下达 ï¼ˆç»™å¸æœºï¼‰
        String platformJob_new_job = "【车牌号】车主您好，您有一个新的运输任务，详细信息请前往微信公众号查看。";
        String platformJobNewJob = "platformJobNewJob";
        //物流车作业-运输任务中止提醒（给司机）：。
        String platformJob_stop_job = "【车牌号】车主您好，您的运输任务已被取消，详细信息请前往微信公众号查看。";
        String platformJobStopJob = "platformJobStopJob";
        //物流车预约-叫号入园等待（给司机）
        String platformBook_call_in = "【车牌号】车主您好，请在10分钟内，前往园区等待区等待叫号作业。";
        String platformBookCallIn = "platformBookCallIn";
        //物流车预约-月台叫号（给司机）
        String platformBook_sing_in = "【车牌号】车主您好，请在10分钟内，前往{月台名称}进行作业。";
        String platformBookSingIn = "platformBookSingIn";
        //物流车预约-月台叫号过号（给司机）
        String platformBook_over_num = "【车牌号】车主您好，您的任务已过号，请重新签到排队等待。";
        String platformBookOverNum = "platformBookOverNum";
        //物流车预约-作业开始（给司机）
        String platformBook_working = "【车牌号】车主您好，您的车辆已在{月台名称}开始作业，请随时关注作业情况。";
        String platformBookWorking = "platformBookWorking";
        //物流车预约-作业完成（给司机）
        String platformBook_finish = "【车牌号】车主您好，您的车辆已在{月台名称}完成作业，请及时驶离月台。";
        String platformBookFinish = "platformBookFinish";
        //物流车预约-作业异常挂起（给司机）
        String platformBook_error = "【车牌号】车主您好，您在{月台名称}的作业任务已经被异常挂起，请及时关注具体情况";
        String platformBookError = "platformBookError";
        //物流车预约-月台转移（给司机）
        String platformBook_move = "【车牌号】车主您好，您在{月台名称}的作业任务已经已被转移至{转移后月台名称}，请及时关注叫号情况。";
        String platformBookMove = "platformBookMove";
        //物流车预约-月台停靠超时（给司机）
        String platformBook_time_out = "【车牌号】车主您好，您在{月台名称}已停靠超时，请尽快驶离以免影响后续作业。";
        String platformBookTimeOut = "platformBookTimeOut";

    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java

@@ -123,10 +123,27 @@

    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("【用水量】近12个月用水量信息列表")
    @PostMapping("/water/lastMonthsDataList")
    public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsWaterList() {
        return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ZERO));
    }

    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("【用气量】本月、上月和去年同月")
    @PostMapping("/gas/dataByMonth")
    public ApiResponse<GasByMonthResponse> gasDataByMonth(@RequestBody GasByMonthRequest param) {
        return ApiResponse.success(platformWaterGasService.gasDataByMonth(param));
    }


    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("【用气量】近12个月用气量信息列表")
    @PostMapping("/gas/lastMonthsDataList")
    public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsGasList () {
        return ApiResponse.success(platformWaterGasService.getPlatformLastMonthListResponse(Constants.ONE));
    }

    @LoginNoRequired
@@ -151,7 +168,7 @@
    @PreventRepeat
    @ApiOperation("【月台】月台当前作业信息列表")
    @PostMapping("/platform/workingDataList")
    public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList(@RequestBody PlatformDataListRequest param) {
    public ApiResponse<List<PlatformDataListResponse>> workingDataList(@RequestBody PlatformDataListRequest param) {
        return ApiResponse.success(platformJobService.platformWorkingDataList(param));
    }

@@ -159,7 +176,7 @@
    @PreventRepeat
    @ApiOperation("【月台】月台作业详情信息")
    @PostMapping("/platform/workDataInfo")
    public ApiResponse<PlatformDataInfoResponse> platformWorkingDataList(@RequestBody PlatformDataInfoRequest param) {
    public ApiResponse<PlatformDataInfoResponse> workDataInfo(@RequestBody PlatformDataInfoRequest param) {
        return ApiResponse.success(platformJobService.platformWorkingDataList(param));
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformWarnEventListResponse.java

@@ -19,6 +19,8 @@
    private String title;
    @ApiModelProperty(value = "时间")
    private Date createDate;
    @ApiModelProperty(value = "车牌号")
    private String carCode;
    @ApiModelProperty(value = "事件内容说明")
    private String content;
    @ApiModelProperty(value = "月台名称")

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

@@ -8,6 +8,7 @@
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
import com.doumee.dao.openapi.response.GasByMonthResponse;
import com.doumee.dao.openapi.response.PlatformLastMonthListResponse;
import com.doumee.dao.openapi.response.WaterByMonthResponse;

import java.util.List;
@@ -107,4 +108,6 @@
    WaterByMonthResponse waterDataByMonth(WaterByMonthRequest param);

    GasByMonthResponse gasDataByMonth(GasByMonthRequest param);

    List<PlatformLastMonthListResponse> getPlatformLastMonthListResponse(Integer type);
}

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

@@ -98,6 +98,8 @@
    private PlatformLogMapper platformLogMapper;
    @Autowired
    private PlatformReasonMapper platformReasonMapper;
    @Autowired
    private PlatformGroupMapper platformGroupMapper;


    @Autowired
@@ -1513,12 +1515,25 @@
            platformBooks.setEditDate(new Date());
            platformBooks.setEditor(approveDTO.getLoginUserInfo().getMemberId());
            PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
            if(Objects.isNull(platformReason)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到入园原因数据");
            }
            PlatformGroup platformGroup = platformGroupMapper.selectById(platformReason.getGroupId());
            if(Objects.isNull(platformGroup)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到入园原因配置月台组数据");
            }

            //生成任务记录
            PlatformJob platformJob = platformBooks.toPlatformJob();
            platformJob.setId(null);
            platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
            if(Constants.equalsInteger(platformGroup.getType(),Constants.ZERO)){
                platformJob.setType(Constants.platformJobType.wxcxh);
            }else if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
                platformJob.setType(Constants.platformJobType.wxczh);
            }else{
            platformJob.setType(Constants.platformJobType.sgscxh);
            }
            platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
            platformJobMapper.insert(platformJob);
            platformBooks.setJobId(platformJob.getId());

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

@@ -1570,9 +1570,12 @@
                );
                platformDataListResponse.setWorkStatus(Constants.ONE);
                //查询作业时长
//                Long workTime = this.getWorkTime(platformJob);
                Long min = (System.currentTimeMillis() - platformJob.getNewStartDate().getTime())/1000/60;
                platformDataListResponse.setWorkTime(
                        this.getWorkTime(platformJob)
                        min
                );

                //计算已作业时长 æ ¹æ®æœˆå°å·¥ä½œæ•ˆçŽ‡ è®¡ç®—任务量需要时间
                if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) {
                    platformDataListResponse.setFinishTime(null);

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

@@ -120,6 +120,7 @@
                platformWarnEventListResponse.setContent(event.getEventContent());
                platformWarnEventListResponse.setTitle(event.getTitle());
                platformWarnEventListResponse.setPlatfromHkId(event.getPlatfromHkId());
                platformWarnEventListResponse.setCarCode(event.getCarCode());
                list.add(platformWarnEventListResponse);
            }
        }
@@ -201,6 +202,7 @@
        platformWarnEvent.setCreateDate(new Date());
        platformWarnEvent.setIsdeleted(Constants.ZERO);
        platformWarnEvent.setPlatformId(savePlatformWarnEventDTO.getPlatformId());
        platformWarnEvent.setCarCode(savePlatformWarnEventDTO.getCarCode());
        Constants.PlatformWarnEvent cPl = Constants.PlatformWarnEvent.STOP_TIMEOUT;
        if(Constants.equalsInteger(savePlatformWarnEventDTO.getEventType(),Constants.ZERO)){
            if(Objects.isNull(savePlatformWarnEventDTO.getPlatformJobId())){

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

@@ -15,6 +15,7 @@
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
import com.doumee.dao.openapi.response.GasByMonthResponse;
import com.doumee.dao.openapi.response.PlatformLastMonthListResponse;
import com.doumee.dao.openapi.response.WaterByMonthResponse;
import com.doumee.service.business.PlatformWaterGasService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,10 +30,7 @@
import org.springframework.web.bind.annotation.RequestBody;

import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;

/**
 * æœˆå°_用水用气信息记录表Service实现
@@ -244,7 +242,7 @@
        list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .eq(PlatformWaterGas::getType,Constants.ZERO)
                .like(PlatformWaterGas::getTimeInfo,beforMonth)
                .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforMonth,"yyyy-MM"))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
            waterByMonthResponse.setLastMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -253,7 +251,7 @@
        list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .eq(PlatformWaterGas::getType,Constants.ZERO)
                .like(PlatformWaterGas::getTimeInfo,beforYearMonth)
                .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforYearMonth,"yyyy-MM"))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
            waterByMonthResponse.setLastYearMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -287,7 +285,7 @@
        list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .eq(PlatformWaterGas::getType,Constants.ONE)
                .like(PlatformWaterGas::getTimeInfo,beforMonth)
                .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforMonth,"yyyy-MM"))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
            response.setLastMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -296,7 +294,7 @@
        list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .eq(PlatformWaterGas::getType,Constants.ONE)
                .like(PlatformWaterGas::getTimeInfo,beforYearMonth)
                .like(PlatformWaterGas::getTimeInfo,DateUtil.getDate(beforYearMonth,"yyyy-MM"))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
            response.setLastYearMonth(list.stream().map(m->m.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
@@ -304,4 +302,31 @@
        return response;
    }


    /**
     *
     * @param type 0用水 1用气
     * @return
     */
    @Override
    public List<PlatformLastMonthListResponse> getPlatformLastMonthListResponse(Integer type){
        List<PlatformLastMonthListResponse> lastMonthListResponses = new ArrayList<>();

        List<PlatformWaterGas> platformWaterGasList = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
                .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
                .eq(PlatformWaterGas::getType,type)
        );
        List<String> monthList = DateUtil.getBeforMonth(new Date(),12);
        for (String str:monthList) {
            PlatformLastMonthListResponse platformLastMonthListResponse = new PlatformLastMonthListResponse();
            platformLastMonthListResponse.setNum(platformWaterGasList.stream().filter(i->DateUtil.dateToString(i.getTimeInfo(),"yyyy-MM").equals(str)).map(i->i.getNum()).reduce(BigDecimal.ZERO,BigDecimal::add));
            platformLastMonthListResponse.setTimeInfo(str);
            lastMonthListResponses.add(platformLastMonthListResponse);
        }
        return lastMonthListResponses;
    }




}

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

@@ -251,9 +251,14 @@
    }


    public static void sendBusiness(EmayService emayService ,SmsEmailMapper smsEmailMapper ,List<String> phoneList,String objType,String content,Integer objId){
        //TODO æ˜¯å¦å‘送短信

    





    public static void sendBusiness(EmayService emayService ,SmsEmailMapper smsEmailMapper ,List<String> phoneList,String objType,String content,Integer objId){
        for (String phone:phoneList) {
            boolean result=   emayService.sendSingleSms(phone,content);
            if(!result){