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

liukangdong

2024-05-13 6bf26cf68e5188affb9f3fe3694456638769007e

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

 admin/src/api/business/member.js

@@ -28,11 +28,23 @@
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/member/create', data)
}
export function memberList (data) {
  return request.post('/visitsAdmin/cloudService/business/member/list', data)
}

// ä¿®æ”¹
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/business/member/updateById', data)
}
export function updateHead (data) {
  return request.post('/visitsAdmin/cloudService/business/member/updateHead', data)
}
export function updateWorkStatus (data) {
  return request.post('/visitsAdmin/cloudService/business/member/updateWorkStatus', data)
}
export function updateCanVisit (data) {
  return request.post('/visitsAdmin/cloudService/business/member/updateCanVisitById', data)
}

// æ‰¹é‡æ‹‰é»‘
export function batchBlock (ids) {

 admin/src/components/business/OperaMemberWindow.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,155 @@
<template>
    <GlobalWindow
        :title="title"
        width="60%"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm"
    >
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="姓名" prop="name">
                <el-input v-model="form.name" placeholder="请输入姓名" v-trim/>
            </el-form-item>
            <el-form-item label="所属组织" prop="companyId">
              <el-cascader
                  v-model="form.company"
                  :options="department"
                  @change="handleChangeCompany"
                  :show-all-levels="false"
                  clearable
                  :props="departprops"
              ></el-cascader>
            </el-form-item>
            <el-form-item label="手机号" prop="phone">
                <el-input v-model="form.phone" placeholder="请输入手机号" v-trim/>
              <div style="color: #F56C6C;font-size: 12px">（注：员工手机号将作为平台登录账号，初始密码为系统默认密码配置项）</div>
            </el-form-item>
            <el-form-item label="身份证号" prop="idcardNo" v-if="form.id ==null">
                <el-input v-model="form.idcardNo" placeholder="请输入身份证号" v-trim/>
            </el-form-item>
            <el-form-item label="修改身份证号" prop="idcardNoNew" v-if="form.id !=null">
                <el-input v-model="form.idcardNoNew" placeholder="可修改身份证号" v-trim/>
              <div style="font-size: 12px" v-if="form.id !=null">
                ï¼ˆæ³¨ï¼šå½“前身份证号为<span style="color: #F56C6C">【{{form.idcardDecode}}】</span>，如需修改，请在输入栏填写新的身份证号!）
              </div>
            </el-form-item>
            <el-form-item label="工号" prop="code">
                <el-input v-model="form.code" placeholder="请输入员工工号" v-trim/>
            </el-form-item>
          <el-form-item label="人脸照片" prop="faceImgFull" >
            <UploadAvatarImage
                :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }"
                :uploadData="uploadData"
                @uploadSuccess="uploadAvatarSuccess"
                @uploadEnd="isUploading = false"
                @uploadBegin="isUploading = true"
            />
          </el-form-item>
</el-form>
</GlobalWindow>
</template>

<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import {checkMobile, validIdCardNo, validIdCardNoNew} from '@/utils/form'
export default {
  name: 'OperaCompanyWindow',
  extends: BaseOpera,
  components: { GlobalWindow, UploadAvatarImage },
  data () {
    return {
      uploadData: {
        folder: 'member'
      },
      departprops: {
        label: 'name',
        value: 'id',
        checkStrictly: true
      },
      department: [],
      // è¡¨å•æ•°æ®
      form: {
        id: null,
        name: '',
        type: '',
        company: [],
        code: '',
        idcardNo: '',
        idcardNoNew: '',
        linkName: '',
        idcardDecode: '',
        companyId: null,
        idcardType: 0,
        phone: '',
        faceImg: '',
        faceImgFull: ''
      },
      // éªŒè¯è§„则
      rules: {
        name: [{ required: true, message: '请输入员工姓名', trigger: 'blur' }],
        phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
        companyId: [{ required: true, message: '请选择所属组织' }],
        idcardNo: [{ required: true, validator: validIdCardNo, message: '请输入身份证号', trigger: 'blur' }],
        idcardNoNew: [{ required: false, validator: validIdCardNoNew, trigger: 'blur' }]
      }
    }
  },
  created () {
    this.config({
      api: '/business/member.js',
      'field.id': 'id'
    })
  },
  methods: {
    handleChangeCompany (value) {
      if (this.form.company && this.form.company.length > 1) {
        this.form.companyId = this.form.company[this.form.company.length - 1]
      }
    },
    /**
     * æ‰“开窗口
     * @title çª—口标题
     * @target ç¼–辑的对象
     */
    open (title, target, depart) {
      this.title = title
      this.department = depart
      this.visible = true
      // æ–°å»º
      if (target == null) {
        this.$nextTick(() => {
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
          this.form.company = []
        })
        return
      }
      // ç¼–辑
      var that = this
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
          this.form.idcardNo = ''
        }
        this.form.company =[]
        if (target.companyId && target.companyPath) {
          var array = target.companyPath.split('/')
          array.forEach(item => {
            if (item && item != null && item != '') {
              that.form.company.push(parseInt(item))
            }
          })
        }
        console.log(that.form.company)
      })
    },
    // ä¸Šä¼ å›¾ç‰‡
    uploadAvatarSuccess (file) {
      this.form.faceImg = file.imgurl
      this.form.faceImgFull = file.imgurlfull
    }
  }
}
</script>

 admin/src/utils/form.js

@@ -1,7 +1,7 @@
// éªŒè¯æ‰‹æœºå·ç 
export function checkMobile (rule, value, callback) {
  if (value == null || value.trim() === '') {
    callback()
    callback(new Error('请输入正确的手机号'))
    return
  }
  if (!/^1\d{10}$/.test(value)) {
@@ -24,8 +24,7 @@
  callback()
}


export function numRule(rule, value, callback) {
export function numRule (rule, value, callback) {
  // debugger
  if (value == null || value < 0 || !value) {
    callback(new Error())
@@ -33,7 +32,7 @@
    callback()
  }
}
export function arrayRule(rule, value, callback) {
export function arrayRule (rule, value, callback) {
  // debugger
  if (value == null || value.length <= 0 || !value) {
    callback(new Error())
@@ -69,13 +68,31 @@
    }
    return
  }
  let re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
  const re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
  var result = re.test(value)
  if(!result) {
  if (!result) {
    callback(new Error('请输入正确的社会信用代码'))
  } else {
    callback()
  }
}


export function validIdCardNo (rule, value, callback) {
  const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
  if (value == null || value.trim() ==='') {
    callback(new Error('请输入身份证号'))
  } else if (!pattern.test(value)) {
    callback(new Error('请输入正确的身份证号'))
  } else {
    callback()
  }
}
export function validIdCardNoNew (rule, value, callback) {
  const pattern = /^[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/
  if (value == null || value.trim() ==='') {
    callback()
  } else if (!pattern.test(value)) {
    callback(new Error('请输入正确的身份证号'))
  } else {
    callback()
  }
}

 admin/src/views/business/internalCompany.vue

@@ -39,7 +39,7 @@
                      <span v-if="row.type == 1">内部组织</span>
                  </template>
                </el-table-column>
                <el-table-column prop="companyPath" label="组织路径" min-width="100px"></el-table-column>
                <el-table-column prop="companyNamePath" label="组织路径" min-width="100px"></el-table-column>
              <el-table-column prop="editorName" label="操作人" min-width="100px"></el-table-column>
              <el-table-column prop="editDate" label="最后更新时间" min-width="100px"></el-table-column>
                <el-table-column

 admin/src/views/business/internalMember.vue

@@ -31,6 +31,9 @@
                    <el-option label="同步失败" value="2"></el-option>
                </el-select>
            </el-form-item>
          <el-form-item label=""  >
              <el-checkbox style="font-size: 12px"  label="1" v-model="searchForm.includeChild" key="1"  >是否包含下级组织</el-checkbox>
          </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
@@ -44,10 +47,13 @@
        </template>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
            <ul class="toolbar" v-permissions="['business:member:delete','business:member:create']">
<!--                <li><el-button type="primary">门禁授权</el-button></li>-->
<!--
                <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">同步</el-button></li>
                <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">删除</el-button></li>
-->
                <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('新建员工',null,department)"  icon="el-icon-plus" v-permissions="['business:member:create']">新建员工</el-button></li>
                <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">批量删除</el-button></li>
            </ul>
            <el-table
                v-loading="isWorking.search"
@@ -58,6 +64,7 @@
                <el-table-column type="selection" width="55"></el-table-column>
                <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column>
                <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
                <el-table-column prop="idcardDecode" label="身份证号" min-width="100px"></el-table-column>
                <el-table-column label="性别" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.sex == 1">男</span>
@@ -72,7 +79,36 @@
                        <span v-if="row.status == 2" style="color: red">拉黑/冻结</span>
                    </template>
                </el-table-column>
                <el-table-column prop="code" label="工号" min-width="100px"></el-table-column>
              <el-table-column label="部门类型" min-width="100px">
                <template slot-scope="{row}">
                  <span v-if="row.companyType == 0">相关方组织</span>
                  <span v-if="row.companyType == 1">内部组织</span>
                </template>
              </el-table-column>
              <el-table-column label="在职状态">
              <template slot-scope="{row}">
                <el-switch
                    @change="changeWorkStatus($event, row)"
                    v-model="row.workStatus"
                    active-color="#13ce66"
                    inactive-color="#ff4949"
                    :active-value="0"
                    :inactive-value="1">
                </el-switch>
              </template>
            </el-table-column>
              <el-table-column label="是否可拜访">
                <template slot-scope="{row}">
                  <el-switch
                      @change="changeCanvisit($event, row)"
                      v-model="row.canVisit"
                      active-color="#13ce66"
                      inactive-color="#ff4949"
                      :active-value="1"
                      :inactive-value="0">
                  </el-switch>
                </template>
              </el-table-column>
                <el-table-column label="可拜访" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.canVisit != 1">否</span>
@@ -87,34 +123,47 @@
                        <span v-if="row.hkStatus == 3" style="color: red">不符合下发条件</span>
                </template>
                </el-table-column>
                <el-table-column label="是否授权" min-width="100px">
                  <template slot-scope="{row}">
                    <span v-if="row.authStatus == 1" style="color: green">是</span>
                    <span v-if="row.authStatus == 0" style="color: red">否</span>
                  </template>
                </el-table-column>
                <el-table-column label="门禁角色" min-width="100px">
                    <template slot-scope="{row}">
                        <span>{{row.roleNames.join(',')}}</span>
                        <span>{{(row.roleNames && row.roleNames.length) ?row.roleNames.join(','): '-'}}</span>
                    </template>
                </el-table-column>
              <el-table-column prop="code" label="工号" min-width="100px"></el-table-column>
              <el-table-column label="卡片" min-width="80px">
                <template slot-scope="{row}">
                  <el-button @click="$refs.cardOpeningRecord.open('开卡记录', row.id)" type="text">{{row.memberCardCount || '0'}}</el-button>
                </template>
              </el-table-column>
              <el-table-column prop="editorName" label="操作人" min-width="100px"></el-table-column>
              <el-table-column prop="editDate" label="最后操作时间" min-width="150px"></el-table-column>
                <el-table-column fixed="right" label="人脸信息" min-width="100px">
                    <template slot-scope="{row}">
                        <el-image
                            v-if="row.faceImg"
                            v-if="row.faceImgFull"
                            style="width: 60px; height: 60px"
                            :src="row.faceImg"
                            :preview-src-list="[row.faceImg]">
                            :src="row.faceImgFull"
                            :preview-src-list="[row.faceImgFull]">
                        </el-image>
                    </template>
                </el-table-column>
                <el-table-column fixed="right" label="卡片信息" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button @click="$refs.cardOpeningRecord.open('开卡记录', row.id)" type="text">{{row.memberCardCount || '0'}}</el-button>
                    </template>
                </el-table-column>
                <el-table-column
                    v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
                    label="操作"
                    min-width="120"
                    min-width="280"
                    fixed="right"
                >
                    <template slot-scope="{row}">
                        <el-button type="text" @click="empower(row.id)" v-permissions="['business:empower:create']">重新授权</el-button>
                        <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息',row,department)" v-permissions="['business:empower:update']">编辑</el-button>
                        <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">取消主管</el-button>
                        <el-button type="text" :loading="heading"  icon="el-icon-edit" @click="updateHead(row,1)"  v-if="row.headStatus  == 0"  v-permissions="['business:member:head']">设为主管</el-button>
                        <el-button type="text"  icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">重新授权</el-button>
                        <el-button  type="text"  icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -126,6 +175,7 @@
            </pagination>
            <!--    æŸ¥çœ‹äººå‘˜å¼€å¡è®°å½•    -->
            <cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
            <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
        </template>
    </TableLayout1>
</template>
@@ -136,12 +186,13 @@
import Pagination from '@/components/common/Pagination'
import cardOpeningRecord from '@/components/business/cardOpeningRecord'
import Tree from '@/components/common/Tree'
import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import { fetchList } from '@/api/business/company'
import { memberSync, roleAuth } from '@/api/business/member'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
  name: 'internalMember',
  extends: BaseTable,
  components: { TableLayout1, Pagination, Tree, cardOpeningRecord },
  components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow },
  data () {
    return {
      TreeList: [],
@@ -150,6 +201,7 @@
        name: '',
        status: '',
        hkStatus: '',
        includeChild: false,
        canVisit: '',
        keyword: '',
        type: 2,
@@ -157,8 +209,12 @@
        companyId: '',
        hasFace: ''
      },
      loading:false,
      companyTree: []
      loading: false,
      heading: false,
      working: false,
      canvisiting: false,
      companyTree: [],
      department: []
    }
  },
  created () {
@@ -172,7 +228,7 @@
    this.getfindCompanyTreePage()
  },
  methods: {
    empower(id) {
    empower (id) {
      var that = this
      this.$confirm('确定重新授权吗?', '提示', {
        confirmButtonText: '确定',
@@ -181,11 +237,12 @@
      }).then(() => {
        roleAuth(id)
          .then(res => {
            this.$tip.apiSuccess(res || '操作成功')
            that.search()
          })
      }).catch(() => {

      });
        this.$tip.apiSuccess(  '操作失败')
      })
    },
    // èŽ·å–组织树
    getfindCompanyTreePage () {
@@ -196,8 +253,26 @@
            this.companyTree = res
            // this.searchForm.erpOrgId = res[0].erpId
            this.search()
            this.department = this.getDepartmentTree(res)
          }
        })
    },
    getDepartmentTree (tree) {
      if (tree == null) {
        return []
      }
      return tree.map(item => {
        const newItem = { ...item }
        if (newItem) {
          newItem.children = newItem.childList
        }
        if (item.children && item.children.length == 0) {
          this.$delete(newItem, 'children')
        } else {
          newItem.children = this.getDepartmentTree(newItem.children)
        }
        return newItem
      })
    },
    // åŒæ­¥ä¿¡æ¯
    async synchronous () {
@@ -218,6 +293,54 @@
        })
        .catch(() => {})
    },
    async updateHead (row, type) {
      this.$dialog.actionConfirm('您确认进行当前操作吗？', '部门主管设置操作提示')
          .then(() => {
        this.heading = true
        updateHead({ id: row.id, headStatus: type })
          .then(res => {
            this.$tip.apiSuccess(res || '操作成功')
            this.search()
          })
          .catch(e => {
            this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.heading = false
          })
          .catch(() => {})
          })
    },
    changeWorkStatus (e, row) {
      this.working = true
      updateWorkStatus({ id: row.id, workStatus: e })
        .then(res => {
          this.$tip.apiSuccess(res || '操作成功')
          this.search()
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.working = false
        })
        .catch(() => {})
    },
     changeCanvisit (e, row) {
      this.canvisiting = true
      updateCanVisit({ id: row.id, canVisit: e })
        .then(res => {
          this.$tip.apiSuccess(res || '操作成功')
          this.search()
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.canvisiting = false
        })
        .catch(() => {})
    },
    callback (row) {
      this.searchForm.erpOrgId = row.erpId
      this.searchForm.companyId = row.id

 admin/src/views/meeting/bookings.vue

@@ -141,7 +141,7 @@
import OperaBookingsDetailWindow from '@/views/meeting/components/OperaBookingsDetailWindow'
import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
import { fetchTree } from '@/api/system/department'
import { fetchList } from '@/api/business/company'
import { cancelById, bookingsDetail } from '@/api/meeting/bookings'
export default {
  name: 'Bookings',
@@ -163,7 +163,6 @@
        isdeleted: '',
        remark: '',
        name: '',
        roomId: '',
        startTime: '',
        endTime: '',
        content: ''
@@ -199,7 +198,7 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    fetchTree()
    fetchList(1)
      .then(res => {
        this.department = this.newTree(res)
      })
@@ -216,9 +215,15 @@
  },
  methods: {
    newTree(tree) {
      if(tree ==null){
        return []
      }
      return tree.map(item => {
        let newItem = {...item}
        if (item.children.length == 0) {
        if(newItem){
          newItem.children=newItem.childList
        }
        if (item.children && item.children.length == 0) {
          this.$delete( newItem, 'children' )
        } else {
          newItem.children = this.newTree(newItem.children)

 admin/src/views/meeting/components/OperaRoomsWindow.vue

@@ -42,8 +42,7 @@
            v-for="item in userList()"
            :key="item.id"
            :value="item.id"

            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
          />
        </el-select>
      </el-form-item>
@@ -101,7 +100,7 @@
        id: null,
        sysList: [],
        projectList: [],
        createDate: null,
        createDate: '',
        editor: '',
        editDate: null,
        isdeleted: 0,

 admin/src/views/meeting/rooms.vue

@@ -18,7 +18,7 @@
            v-for="item in userList"
            :key="item.id"
            :value="item.id"
            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
            ></el-option>
            <!-- :label="`${item.department.name}-${item.realname}`" -->
          <!-- <el-option :key="1" :value="1" label="禁用" /> -->

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

@@ -452,14 +452,11 @@
        queryWrapper.selectAll(Bookings.class);
        queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
        queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);

        queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);

        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);

        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
        queryWrapper.orderByDesc(Bookings::getCreateDate);
        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);

@@ -467,7 +464,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, SystemDepartment::getId, pageWrap.getModel().getDepartmentId());
        queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, SystemUser::getId, pageWrap.getModel().getDepartmentId());

        if (pageWrap.getModel().getStartTime() != null) {
            queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -533,11 +530,10 @@
        queryWrapper.selectAll(Bookings.class);
        queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
        queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
        queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
        queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
        queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
        queryWrapper.eq(queryParam.getId() != null, Bookings::getId, queryParam.getId());
        queryWrapper.eq(queryParam.getRoomId() != null, Bookings::getRoomId, queryParam.getRoomId());
@@ -996,7 +992,7 @@

        lambdaWrapper.selectAll(Bookings.class)
                        .selectAs(SystemUser::getRealname, Bookings::getRealName)
                        .selectAs(SystemDepartment::getName, Bookings::getDepartmentName)
                        .selectAs(Company::getName, Bookings::getDepartmentName)
                        .selectAs(Rooms::getName, Bookings::getRoomName)
                .select("CASE DAYOFWEEK(t.START_TIME)\n" +
                        "\tWHEN 1 THEN \t\"星期日\" \tWHEN 2 THEN \"星期一\"\n" +
@@ -1010,8 +1006,7 @@
              //  .leftJoin(RoomTime.class, RoomTime::getId, BookingTime::getTimeId)
                .leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator)
                .leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId)
                .leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator)
                .leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId)
                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                .eq(Objects.nonNull(roomId), Bookings::getRoomId, roomId)
                .eq(Bookings::getIsdeleted, MeetConstants.ZERO)
                .eq(Bookings::getStatus, MeetConstants.ZERO)

 server/meeting/meeting_service/src/main/resources/banner.txt

@@ -2,17 +2,17 @@
${AnsiColor.BLUE}
================================================================================

                             æ¬¢è¿Žä½¿ç”¨ä¼Šå¨ƒæ¡†æž¶ï¼ˆå•åº”用版）
                             æ¬¢è¿Žä½¿ç”¨è±†ç±³æ¡†æž¶ï¼ˆå•åº”用版）
                                 Version :: 1.0

                         â–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆ â–ˆâ–ˆ      â–ˆâ–ˆ     â–ˆâ–ˆ
                        â–‘██░░░░░ â–‘██     â–‘██    â–ˆâ–ˆâ–ˆâ–ˆ
                        â–‘██      â–‘██     â–‘██   â–ˆâ–ˆâ–‘░██
                        â–‘███████ â–‘░██    â–ˆâ–ˆ   â–ˆâ–ˆ  â–‘░██
                        â–‘██░░░░   â–‘░██  â–ˆâ–ˆ   â–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆ
                        â–‘██        â–‘░████   â–‘██░░░░░░██
                        â–‘████████   â–‘░██    â–‘██     â–‘██
                        â–‘â–‘â–‘â–‘â–‘â–‘â–‘â–‘     â–‘â–‘     â–‘â–‘      â–‘â–‘
                         â–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆâ–ˆ         â–ˆâ–ˆ       â–ˆâ–ˆ
                        â–‘██░░░░░ â–ˆâ–ˆ     â–‘██░██    â–ˆâ–ˆ â–ˆâ–ˆ
                        â–‘██     â–‘░██   â–‘██ â–‘░██  â–ˆâ–ˆ â–‘░██
                        â–‘██      â–‘██  â–‘██   â–‘░████   â–‘░██
                        â–‘██      â–‘██ â–‘██     â–‘░██     â–‘░██
                        â–‘██      â–ˆâ–ˆ  â–‘██      â–‘██      â–‘██
                        â–‘████████░   â–‘██      â–‘██      â–‘██
                        â–‘â–‘â–‘â–‘â–‘â–‘â–‘â–‘     â–‘â–‘       â–‘â–‘       â–‘â–‘

      å¯åŠ¨ç«¯å£: ${server.port}  å¯åŠ¨çŽ¯å¢ƒ: ${project.env}  æ—¥å¿—等级: ${logback.level}  å¯ç”¨Swagger: ${swagger.enabled}


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

@@ -591,6 +591,64 @@

    }

    /**
     * å‘˜å·¥ä¿¡æ¯ç»´æŠ¤æ“ä½œåŽ†å²ç±»åž‹ 0解冻 1冻结 2拉黑 3恢复 4设为拜访人 5取消拜访人 6设为高级审批人 7取消高级审批人 8手动离场 9删除 10更新 11授权门禁权限 12离职 13恢复在职
     */
    public  enum UserActionType {
        CANCEL_FREEZE(0, "解冻","由【${param1}】于【操作时间：${param2}】，进行【解冻】" ),
        FREEZE(1, "冻结","由【${param1}】于【操作时间：${param2}】，进行【冻结】" ),
        BLACKLIST(2, "拉黑","由【${param1}】于【操作时间：${param2}】，进行【拉黑】"),
        CANCEL_BLACKLIST(3, "恢复","由【${param1}】于【操作时间：${param2}】，进行【移出黑名单】" ),
        CANVISIT(4, "设为拜访人","由【${param1}】于【操作时间：${param2}】，进行【设为拜访人】" ),
        CANCEL_VISIT(5, "取消拜访人","由【${param1}】于【操作时间：${param2}】，进行【取消拜访人】" ),
        //续保通知
        HIGHCHECKOR(6, "设为高级审批人","由【${param1}】于【操作时间：${param2}】，进行【设为高级审批人】" ),
        CANCEL_HIGHCHECKOR(7, "取消高级审批人","由【${param1}】于【操作时间：${param2}】，进行【取消高级审批人】" ),
        LEVEL(8, "手动离场","由【${param1}】于【操作时间：${param2}】，进行【手动离场】" ),
        DELETE(9, "删除","由【${param1}】于【操作时间：${param2}】，进行【删除】" ),
        EDIT(10, "更新","由【${param1}】于【操作时间：${param2}】，进行【更新】" ),
        AUTH_ROLE(11, "授权门禁权限","由【${param1}】于【操作时间：${param2}】，进行【授权门禁权限】" ),
        WORK_OFF(12, "离职","由【${param1}】于【操作时间：${param2}】，进行【离职】操作" ),
        WORK_ON(13, "在职","由【${param1}】于【操作时间：${param2}】，进行【在职】操作" ),
        ;

        // æˆå‘˜å˜é‡
        private int key;
        private String name;
        private String info;

        // æž„造方法
        UserActionType(int key, String name,String info ) {
            this.key = key;
            this.info = info;
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public String getInfo() {
            return info;
        }

        public void setInfo(String info) {
            this.info = info;
        }
    }

    public  enum NoticeObjectType {
        MEETING_BOOK_SUCCESS(0, "会与预定成功","会与预定成功"),
        MEETING_CACEL(1, "会议取消","会议取消"),

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

@@ -1876,11 +1876,10 @@
    }

    public static int compareDate(String format, String str1, Date date2) {

        Date date1 = null;
        try {
            date1 = fromStringToDate(format, str1);
        } catch (ParseException e) {
        } catch (Exception e) {
            // TODO è‡ªåŠ¨ç”Ÿæˆ catch å—
            e.printStackTrace();
        }
@@ -2785,7 +2784,7 @@

            stringDate = getFomartDate(new Date(now), formate);

        } catch (ParseException e) {
        } catch (Exception e) {

            e.printStackTrace();
        }
@@ -2800,8 +2799,7 @@
            long now = date.getTime() + (long) Integer.parseInt(days) * DAY_IN_MILLISECOND;

            date = new Date(now);

        } catch (ParseException e) {
        } catch (Exception e) {

            e.printStackTrace();
        }
@@ -2818,10 +2816,16 @@
     *
     * å­—符串形式转化为Date类型 String类型按照format格式转为Date类型
     **/
    public static Date fromStringToDate(String format, String dateTime) throws ParseException {
    public static Date fromStringToDate(String format, String dateTime)  {
        Date date = null;
        SimpleDateFormat sdf = new SimpleDateFormat(format);
        date = sdf.parse(dateTime);
        try {

            SimpleDateFormat sdf = new SimpleDateFormat(format);
            date = sdf.parse(dateTime);
        }catch (Exception e){

        }

        return date;
    }


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

ÎļþÃû´Ó server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.dao.business;
package com.doumee.dao.business.dao;

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

 server/system_service/src/main/java/com/doumee/dao/business/dao/join/CompanyJoinMapper.java

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

import com.doumee.dao.business.model.Company;
import com.github.yulichang.base.mapper.MPJJoinMapper;

/**
 * @author T14
 */
//@Repository
public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
}

 server/system_service/src/main/java/com/doumee/dao/business/model/Company.java

ÎļþÃû´Ó server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java ÐÞ¸Ä
@@ -1,15 +1,15 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
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;
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.util.List;

@@ -122,7 +122,7 @@

    @ApiModelProperty(value = "负责人编码（关联member)")
    @ExcelColumn(name="负责人编码")
    private String headId;
    private Integer headId;

    @ApiModelProperty(value = "ERP同步时间")
    @ExcelColumn(name="ERP同步时间")
@@ -181,9 +181,12 @@
    @ApiModelProperty(value = "海康部门级别路径", example = "1")
    @ExcelColumn(name="海康部门级别路径")
    private String hkCompanyPath;
    @ApiModelProperty(value = "自建部门编码级别路径", example = "1")
    @ExcelColumn(name="自建部门编码级别路径")
    private String companyPath;
    @ApiModelProperty(value = "自建部门级别路径", example = "1")
    @ExcelColumn(name="自建部门级别路径")
    private String companyPath;
    private String companyNamePath;
    @ApiModelProperty(value = "父级部门级别路径", example = "1")
    @TableField(exist = false)
    private String parentCompanyPath;

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

@@ -102,5 +102,10 @@

    @ApiModelProperty(value = "0 å¯ç”¨ 1 ç¦ç”¨")
    private Integer status;
    @ApiModelProperty(value = "企业编码（关联company）")
    private Integer companyId;
    @ApiModelProperty(value = "0 å¯ç”¨ 1 ç¦ç”¨")
    @TableField(exist = false)
    private String companyName;

}

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

@@ -124,13 +124,13 @@
    @Override
    public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
        // æ ¹éƒ¨é—¨æ¡ä»¶å¤„理（需查询根部门下所有部门的用户）
        if (pageWrap.getModel().getRootDeptId() != null) {
    /*    if (pageWrap.getModel().getRootDeptId() != null) {
            pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
        } else {
            List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
            List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
            pageWrap.getModel().setDepartmentIds(collect);
        }
        }*/
        // æ‰§è¡ŒæŸ¥è¯¢
        PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
        List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());

 server/system_service/src/main/resources/mappers/SystemUserMapper.xml

@@ -5,10 +5,10 @@
  <!-- æŸ¥è¯¢ç”¨æˆ·åˆ—表 -->
  <resultMap id="SystemUserListVO" type="com.doumee.dao.system.vo.SystemUserListVO" autoMapping="true">
    <id column="ID" property="id"/>
    <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
 <!--   <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
      <result column="DEPARTMENT_ID" property="id"/>
      <result column="DEPARTMENT_NAME" property="name"/>
    </association>
    </association>-->
    <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
      <result column="CREATE_USER_ID" property="id"/>
      <result column="CREATE_USER_NAME" property="username"/>
@@ -26,14 +26,12 @@
      usr.ID, usr.BIRTHDAY, usr.EMAIL, usr.EMP_NO, usr.MOBILE, usr.AVATAR, usr.USERNAME, usr.REALNAME, usr.SEX, usr.FIXED, usr.CREATE_TIME, usr.UPDATE_TIME,
      sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
      create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
      update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME
      update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
      sd.name as companyName
    FROM `SYSTEM_USER` usr
    LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
    LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
--     LEFT JOIN `SYSTEM_POSITION_USER` spu ON spu.USER_ID = usr.ID AND spu.DELETED = 0
--     LEFT JOIN `SYSTEM_POSITION` sp ON sp.ID = spu.POSITION_ID AND sp.DELETED = 0
    LEFT JOIN `SYSTEM_DEPARTMENT_USER` sdu ON sdu.USER_ID = usr.ID AND sdu.DELETED = 0
    LEFT JOIN `SYSTEM_DEPARTMENT` sd ON sd.ID = sdu.DEPARTMENT_ID AND sd.DELETED = 0
    LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0
    <if test="dto.roleId != null">
      RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
    </if>
@@ -43,10 +41,10 @@
<!--        AND spu.POSITION_ID = #{dto.positionId}-->
<!--      </if>-->
      <if test="dto.strictDeptId != null">
        AND sdu.DEPARTMENT_ID = #{dto.strictDeptId}
        AND  sd.ID = #{dto.strictDeptId}
      </if>
      <if test="dto.departmentIds != null and dto.departmentIds.size > 0">
        AND sdu.DEPARTMENT_ID IN
        AND sd.ID IN
        <foreach collection="dto.departmentIds" open="(" close=")" separator="," item="id">
          #{id}
        </foreach>

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -9,7 +9,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.MemberService;
@@ -63,7 +62,7 @@
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:member:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        memberService.deleteById(id);
        memberService.deleteById(id,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

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

@@ -123,28 +122,6 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("人员移除/解冻")
    @PostMapping("/updateRemoveStatusById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
        if(list.size()>0){
            memberService.updateRemoveStatusById(list);
            return ApiResponse.success(null);
        }else{
            return ApiResponse.failed("参数错误");
        }

    }

    @ApiOperation("人员拉黑/冻结")
    @PostMapping("/updateVisitsStatusById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateVisitsStatusById(@RequestBody Member member){
        memberService.updateVisitsStatusById(member);
        return ApiResponse.success(null);
    }


    @ApiOperation("批量拉黑")
    @GetMapping("/batchBlock")
    @RequiresPermissions("business:member:delete")
@@ -154,7 +131,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        memberService.batchBlock(idList,2);
        memberService.batchBlock(idList,2,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

@@ -167,7 +144,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        memberService.batchBlock(idList,1);
        memberService.batchBlock(idList,1,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

@@ -188,12 +165,6 @@
        return ApiResponse.success(memberService.findPage(pageWrap));
    }

    @ApiOperation("分页劳务用户信息查询")
    @PostMapping("/findLaborMemberInfoPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
@@ -221,7 +192,7 @@
    @ApiOperation("分页查询内部人员信息")
    @PostMapping("/findMemberInfoPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
    public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
        if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
            return ApiResponse.success(memberService.findVisitPage(pageWrap));
        }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -234,7 +205,7 @@
    @ApiOperation("分页查询访客人员信息")
    @PostMapping("/findVisitPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
    public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
        return ApiResponse.success(memberService.findVisitPage(pageWrap));
    }

@@ -242,7 +213,7 @@
    @ApiOperation("异常人员冻结/拉黑")
    @PostMapping("/findUnusualPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
    public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
        return ApiResponse.success(memberService.findUnusualPage(pageWrap));
    }


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

@@ -58,7 +58,7 @@
    @ApiOperation("创建劳务公司")
    @PostMapping("/createLaborServices")
    @CloudRequiredPermission("business:company:create")
    public ApiResponse<Integer> createLaborServices(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<Integer> createLaborServices(@RequestBody Company company, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        company.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(companyService.createLaborServices(company));
    }

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

@@ -11,7 +11,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
@@ -46,8 +45,15 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:member:create")
    public ApiResponse create(@RequestBody Member member) {
        return ApiResponse.success(memberService.create(member));
    public ApiResponse create(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
           member.setLoginUserInfo(this.getLoginUser(token));
           Member insert = memberService.create(member);
            //创建人脸信息
            return ApiResponse.success("操作成功！");
        }else{
            return ApiResponse.failed("对不起，无权限操作！");
        }
    }

    @PreventRepeat
@@ -62,7 +68,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:member:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        memberService.deleteById(id);
        memberService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

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

@@ -110,63 +116,88 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse updateById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        member.setLoginUserInfo(this.getLoginUser(token));
        memberService.updateById(member);
        return ApiResponse.success(null);
    }
    @ApiOperation("设置或取消主管")
    @PostMapping("/updateHead")
    @CloudRequiredPermission("business:member:head")
    public ApiResponse updateHead(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        member.setLoginUserInfo(this.getLoginUser(token));
        memberService.updateHead(member);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID ç¦å¯ç”¨  ")
    @PostMapping("/updateStatusById")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse updateStatusById(@RequestBody Member member){
    public ApiResponse updateStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        member.setLoginUserInfo(this.getLoginUser(token));
        memberService.updateStatusById(member);
        return ApiResponse.success(null);
    }

    @ApiOperation("人员移除/解冻")
    @PostMapping("/updateRemoveStatusById")
    @ApiOperation("根据ID è®¾ç½®åœ¨èŒã€ç¦»èŒ  ")
    @PostMapping("/updateWorkStatus")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
        if(list.size()>0){
            memberService.updateRemoveStatusById(list);
            return ApiResponse.success(null);
        }else{
            return ApiResponse.failed("参数错误");
        }

    }

    @ApiOperation("人员拉黑/冻结")
    @PostMapping("/updateVisitsStatusById")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse updateVisitsStatusById(@RequestBody Member member){
        memberService.updateVisitsStatusById(member);
    public ApiResponse updateWorkStatus(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        member.setLoginUserInfo(this.getLoginUser(token));
        memberService.updateWorkStatus(member);
        return ApiResponse.success(null);
    }



    @ApiOperation("批量拉黑")
    @GetMapping("/batchBlock")
    @CloudRequiredPermission("business:member:delete")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse batchBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray ){
            idList.add(Integer.valueOf(id));
        }
        memberService.batchBlock(idList,2);
        memberService.batchBlock(idList,2,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("批量冻结")
    @GetMapping("/batchFreeze")
    @CloudRequiredPermission("business:member:delete")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse batchFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray ){
            idList.add(Integer.valueOf(id));
        }
        memberService.batchBlock(idList,1);
        memberService.batchBlock(idList,1,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("批量移出黑名单")
    @GetMapping("/batchRemoveBlock")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse batchCancelBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray ){
            idList.add(Integer.valueOf(id));
        }
        memberService.batchRemoveBlock(idList,2,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("批量解除冻结")
    @GetMapping("/batchRemoveFreeze")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse batchRemoveFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray ){
            idList.add(Integer.valueOf(id));
        }
        memberService.batchRemoveBlock(idList,1,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -175,7 +206,8 @@
    @ApiOperation("是否可拜访状态修改")
    @PostMapping("/updateCanVisitById")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse updateCanVisitById(@RequestBody Member member){
    public ApiResponse updateCanVisitById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        member.setLoginUserInfo(this.getLoginUser(token));
        memberService.updateCanVisitById(member);
        return ApiResponse.success(null);
    }
@@ -186,13 +218,13 @@
    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(memberService.findPage(pageWrap));
    }

    @ApiOperation("分页劳务用户信息查询")
    @PostMapping("/findLaborMemberInfoPage")
    @ApiOperation("查询全部")
    @PostMapping("/list")
    @CloudRequiredPermission("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
    public ApiResponse<List<Member>> findPage (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(memberService.findList(model));
    }


    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
@@ -220,7 +252,7 @@
    @ApiOperation("分页查询内部人员信息")
    @PostMapping("/findMemberInfoPage")
    @CloudRequiredPermission("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
    public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
            return ApiResponse.success(memberService.findVisitPage(pageWrap));
        }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -233,7 +265,7 @@
    @ApiOperation("分页查询访客人员信息")
    @PostMapping("/findVisitPage")
    @CloudRequiredPermission("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(memberService.findVisitPage(pageWrap));
    }

@@ -241,7 +273,7 @@
    @ApiOperation("异常人员冻结/拉黑")
    @PostMapping("/findUnusualPage")
    @CloudRequiredPermission("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(memberService.findUnusualPage(pageWrap));
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -90,10 +90,7 @@
     * @return
     */
    public static String getRootOrg() {
        Map<String, String> path = getPath(HKConstants.InterfacePath.rootOrg);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, "", null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog("",result,path);
        return  result;
        return  startDoPostStringArtemis(HKConstants.InterfacePath.rootOrg,null);
    }


@@ -103,10 +100,7 @@
     * @return
     */
    public static String editOrg(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.editOrg);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return   startDoPostStringArtemis(HKConstants.InterfacePath.editOrg,body);
    }

    /**
@@ -115,10 +109,7 @@
     * @return
     */
    public static String addBatchOrg(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchOrg);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchOrg,body);
    }
    /**
     * åˆ é™¤ç»„织信息
@@ -126,10 +117,7 @@
     * @return
     */
    public static String delOrg(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchOrg);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchOrg,body);
    }

    /**
@@ -138,10 +126,7 @@
     * @return
     */
    public static String addUser(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.addUser);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.addUser,body);
    }


@@ -151,10 +136,7 @@
     * @return
     */
    public static String addBatchUser(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchUser);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchUser,body);
    }

    /**
@@ -163,10 +145,7 @@
     * @return
     */
    public static String delBatchUser(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchUser);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchUser,body);
    }

    /**
@@ -175,10 +154,7 @@
     * @return
     */
    public static String editUser(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.editUser);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.editUser,body);
    }
    /**
     *    æ·»åŠ äººè„¸ä¿¡æ¯
@@ -186,10 +162,7 @@
     * @return
     */
    public static String addFace(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.addFace);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.addFace,body);
    }
    /**
     *    ç¼–辑人脸信息
@@ -197,10 +170,7 @@
     * @return
     */
    public static String editFace(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.editFace);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.editFace,body);
    }
    /**
     *    åˆ é™¤äººè„¸ä¿¡æ¯
@@ -208,10 +178,7 @@
     * @return
     */
    public static String delFace(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.delFace);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.delFace,body);
    }
    /**
     *    å…¨é‡èŽ·å–车库信息
@@ -219,10 +186,7 @@
     * @return
     */
    public static String parkList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.getParkList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.getParkList,body);
    }
    /**
     *    æ ¹æ®è½¦åº“编码查询出入口列表
@@ -230,10 +194,7 @@
     * @return
     */
    public static String entranceList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.getEntranceList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.getEntranceList,body);
    }
    /**
     *    è½¦è¾†é¢„约
@@ -241,10 +202,7 @@
     * @return
     */
    public static String parkAddition(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.parkAddition);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.parkAddition,body);
    }
    /**
     *    è½¦è¾†å–消预约
@@ -252,10 +210,7 @@
     * @return
     */
    public static String parkDeletion(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.parkDeletion);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.parkDeletion,body);
    }
    /**
     *    å›ºå®šè½¦è¾†å……值（包期）
@@ -263,10 +218,7 @@
     * @return
     */
    public static String carChargeAddtion(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeAddtion);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeAddtion,body);
    }
    /**
     *    å›ºå®šè½¦è¾†å–消包期
@@ -274,10 +226,7 @@
     * @return
     */
    public static String carChargeDeletion(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeDeletion);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeDeletion,body);
    }


@@ -305,7 +254,6 @@
     * @return
     */
    public static InputStream getVisitPicture(String body)  throws  Exception{

        Map<String, String> path = getPath(HKConstants.InterfacePath.visitPicture);
        //参数根据接口实际情况设置
        HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
@@ -360,10 +308,7 @@
     * @return
     */
    public static String doorSearch(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.doorSearch);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.doorSearch,body);
    }
    /**
     *    èŽ·å–门禁设备列表
@@ -371,10 +316,7 @@
     * @return
     */
    public static String acsDeviceList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
    }
    /**
     *    å¢žé‡èŽ·å–门禁设备列表
@@ -382,10 +324,7 @@
     * @return
     */
    public static String acsDeviceTimeRangeList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
    }
    /**
     *    è®¿å®¢é¢„约
@@ -393,10 +332,7 @@
     * @return
     */
    public static String visitAppiontment(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontment);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontment,body);
    }
    /**
     *    è®¿å®¢å…ç™»è®°é¢„约
@@ -404,10 +340,7 @@
     * @return
     */
    public static String visitAppiontmentMDJ(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontmentMDJ);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontmentMDJ,body);
    }

    /**
@@ -416,10 +349,17 @@
     * @return
     */
    public static String visitCancel(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.visitCancel);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        return  startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
    }

    public static String startDoPostStringArtemis(String pathStr,String body){
        Map<String, String> path = getPath(pathStr);
        Map<String, String> header = new HashMap<>();
        header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return result;

    }
    /**
     *    ç­¾ç¦»è®¿å®¢é¢„约
@@ -427,10 +367,7 @@
     * @return
     */
    public static String visitOut(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.visitOut);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.visitOut,body);
    }
    /**
     *    è®¿å®¢æƒé™ç»„
@@ -438,10 +375,7 @@
     * @return
     */
    public static String privilegeGroup(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.privilegeGroup);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.privilegeGroup,body);
    }
    /**
     *    äº‹ä»¶è®¢é˜…
@@ -449,10 +383,7 @@
     * @return
     */
    public static String eventSub(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.eventSub);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.eventSub,body);
    }
    /**
     *    å–消事件订阅
@@ -460,10 +391,7 @@
     * @return
     */
    public static String cancelEventSub(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.cancelEventSub);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.cancelEventSub,body);
    }
    /**
     *    åˆ›å»ºä¸€å¡é€šæƒé™ä¸‹è½½ä»»åŠ¡
@@ -471,10 +399,7 @@
     * @return
     */
    public static String taskAddition(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.taskAddition);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.taskAddition,body);
    }
    /**
     *    æŸ¥è¯¢ä¸€å¡é€šæƒé™æŸ¥è¯¢è®¾å¤‡é€šé“的人员权限下载详情总数v2
@@ -482,10 +407,7 @@
     * @return
     */
    public static String taskProgress(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgress);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgress,body);
    }
    /**
     *    æŸ¥è¯¢ä¸€å¡é€šæƒé™ä¸‹è½½ä»»åŠ¡è¿›åº¦
@@ -493,10 +415,7 @@
     * @return
     */
    public static String taskProgressNum(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgressNum);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgressNum,body);
    }
    /**
     *    ä¸€å¡é€šæƒé™ä¸‹è½½ä»»åŠ¡ä¸­æ·»åŠ æ•°æ®_根据人员与设备通道指定下载
@@ -504,10 +423,7 @@
     * @return
     */
    public static String taskDataAddition(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.taskDataAddition);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.taskDataAddition,body);
    }
    /**
     *    ä¸€å¡é€šå¼€å§‹ä¸‹è½½ä»»åŠ¡
@@ -515,10 +431,7 @@
     * @return
     */
    public static String taskStart(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.taskStart);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.taskStart,body);
    }
    /**
     * æŸ¥è¯¢æƒé™æ¡ç›®åˆ—表
@@ -526,13 +439,7 @@
     * @return
     */
    public static String authItemList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.authItemList);
        Map<String, String> header = new HashMap<>();
        header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
//        header.put("tagId", "frs");
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.authItemList,body);
    }
    /**
     * æ‰¹é‡å¼€å¡
@@ -540,11 +447,7 @@
     * @return
     */
    public static String cardBingding(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.cardBingding);
        Map<String, String> header = new HashMap<>();
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.cardBingding,body);
    }
    /**
     * é€€å¡
@@ -552,11 +455,7 @@
     * @return
     */
    public static String cardDeletion(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.cardDeletion);
        Map<String, String> header = new HashMap<>();
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.cardDeletion,body);
    }
    /**
     * æ‰¹é‡æŒ‚失
@@ -564,11 +463,7 @@
     * @return
     */
    public static String cardLoss(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.cardLoss);
        Map<String, String> header = new HashMap<>();
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.cardLoss,body);
    }
    /**
     * æ‰¹é‡è§£æŒ‚
@@ -576,11 +471,7 @@
     * @return
     */
    public static String cardUnloss(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.cardUnloss);
        Map<String, String> header = new HashMap<>();
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.cardUnloss,body);
    }
    /**
     * æŸ¥è¯¢è®¾å¤‡é€šé“的人员权限下载详情
@@ -588,11 +479,7 @@
     * @return
     */
    public static String taskPersoDetail(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.taskPersoDetail);
        Map<String, String> header = new HashMap<>();
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.taskPersoDetail,body);
    }

    /**
@@ -601,10 +488,7 @@
     * @return
     */
    public static String visitingRecords(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.visitingRecords);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.visitingRecords,body);
    }

    /**
@@ -613,10 +497,7 @@
     * @return
     */
    public static String appointmentRecords(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.appointmentRecords);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.appointmentRecords,body);
    }
    /**
     *    èŽ·å–全量组织列表
@@ -624,10 +505,7 @@
     * @return
     */
    public static String orgAllList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.orgAllList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
    }
    /**
     *    èŽ·å–全量用户列表
@@ -635,10 +513,7 @@
     * @return
     */
    public static String userAllList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.userAllList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.userAllList,body);
    }
    /**
     *    èŽ·å–全量用户列表2(根据条件分页查询）
@@ -646,10 +521,7 @@
     * @return
     */
    public static String personList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.personList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.personList,body);
    }
    /**
     *    å¢žé‡èŽ·å–组织列表
@@ -657,10 +529,7 @@
     * @return
     */
    public static String orgTimeRangeList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.orgTimeRangeList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.orgTimeRangeList,body);
    }
    /**
     *    å¢žé‡èŽ·å–用户列表
@@ -668,10 +537,7 @@
     * @return
     */
    public static String userTimeRangeList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.userTimeRangeList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.userTimeRangeList,body);
    }
    /**
     *    å¢žé‡èŽ·å–车辆列表
@@ -679,10 +545,7 @@
     * @return
     */
    public static String vehicleTimeRangeList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleTimeRangeList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleTimeRangeList,body);
    }
    /**
     *    å…¨é‡èŽ·å–车辆列表
@@ -690,10 +553,7 @@
     * @return
     */
    public static String vehicleList(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleList);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleList,body);
    }
    /**
     *    åœè½¦åœºè¿‡è½¦è®°å½•æŸ¥è¯¢
@@ -701,21 +561,15 @@
     * @return
     */
    public static String parkCrossRecords(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.parkCrossRecords);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.parkCrossRecords,body);
    }
    /**
     *    åœè½¦åœºè¿‡è½¦è®°å½•æŸ¥è¯¢
     *    äººè„¸è¯„分
     * @param body
     * @return
     */
    public static String facePictureCheck(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.facePictureCheck);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.facePictureCheck,body);
    }

    /**
@@ -724,10 +578,7 @@
     * @return
     */
    public static String acsDeviceStatus(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceStatus);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceStatus,body);
    }

    /**
@@ -736,10 +587,7 @@
     * @return
     */
    public static String tempCarInRecords(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.tempCarInRecords);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
        return startDoPostStringArtemis(HKConstants.InterfacePath.tempCarInRecords,body);
    }

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java

@@ -65,6 +65,8 @@
    @ApiModelProperty(value = "erp机构主键 ")
    private String erpOrgId;
    @ApiModelProperty(value = "机构主键 ")
    private String companyId;
    private Integer companyId;

    @ApiModelProperty(value = "是否包含下级组织用户")
    private Boolean includeChild;
}

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

ÎļþÒÑɾ³ý

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

@@ -4,8 +4,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.CarEvent;
import com.doumee.dao.business.model.Member;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -17,17 +15,6 @@
 * @date 2023/11/30 15:33
 */
public interface MemberMapper extends BaseMapper<Member> {


    @Select(" select m.* , c.name as companyName , " +
            " (select count(0) from member_card mc where mc.MEMBER_ID=m.id and mc.ISDELETED=0) as memberCardCount,  " +
            " (select GROUP_CONCAT(dr.name) from member_role mr left join device_role dr on dr.id=mr.ROLE_ID  " +
            " where mr.MEMBER_ID=m.id and mr.ISDELETED=0 GROUP BY mr.MEMBER_ID) as roleName "+
            " from member m  " +
            " left join company c on m.COMPANY_ID=c.id "+
            " ${ew.customSqlSegment} ")
    IPage<MemberInfoDTO> getPage(IPage<MemberInfoDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);


    void insertBatchSomeColumn(List<Member> list);
}

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

ÎļþÒÑɾ³ý

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

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

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;
@@ -20,7 +21,7 @@
@Data
@ApiModel("人员信息表")
@TableName("`member`")
public class Member {
public class Member extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -81,7 +82,6 @@
    @ApiModelProperty(value = "访客名称/内部人员")
    @ExcelColumn(name="访客名称")
    private String name;

    @ApiModelProperty(value = "访客年龄")
    @ExcelColumn(name="访客年龄")
    @JsonFormat(pattern = "yyyy-MM-dd")
@@ -94,6 +94,9 @@
    @ApiModelProperty(value = "身份证号（MD4加密）")
    @ExcelColumn(name="身份证号（MD4加密）")
    private String idcardNo;
    @ApiModelProperty(value = "修改的身份证号 ")
    @TableField(exist = false)
    private String idcardNoNew;

    @ApiModelProperty(value = "证件显示信息")
    @ExcelColumn(name="证件显示信息")
@@ -145,12 +148,18 @@
    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步 2同步失败 3不符合下发条件 4等待删除权限  ", example = "1")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步 2同步失败 3不符合下发条件 4等待删除权限")
    private Integer hkStatus;
    @ApiModelProperty(value = "海康授权状态 0未授权 1已授权   ", example = "1")
    @ExcelColumn(name="海康授权状态 0未授权 1已授权 ")
    private Integer authStatus;

    @ApiModelProperty(value = "海康最近同步时间")
    @ExcelColumn(name="海康最近同步时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date hkDate;

    @ApiModelProperty(value = "在职状态 0在职 1离职", example = "1")
    @ExcelColumn(name="在职状态 0在职 1离职")
    private Integer workStatus;
    @ApiModelProperty(value = "ERP标识", example = "1")
    @ExcelColumn(name="ERP标识")
    private String erpId;
@@ -209,6 +218,21 @@
    @ApiModelProperty(value = "组织名称")
    @TableField(exist = false)
    private String companyName;
    @ApiModelProperty(value = "最后操作人")
    @TableField(exist = false)
    private String editorName;
    @ApiModelProperty(value = "组织类型")
    @TableField(exist = false)
    private Integer companyType;
    @ApiModelProperty(value = "组织编码路径")
    @TableField(exist = false)
    private String companyPath;
    @ApiModelProperty(value = "负责人编码（关联member)")
    @TableField(exist = false)
    private Integer headId;
    @ApiModelProperty(value = "组织路径")
    @TableField(exist = false)
    private String companyNamePath;
    @ApiModelProperty(value = "组织海康编码")
    @TableField(exist = false)
    private String hkOrgId;
@@ -228,6 +252,8 @@
    @ApiModelProperty(value = "姓名/手机号/工号")
    @TableField(exist = false)
    private String keyword;



    @ApiModelProperty(value = "是否有人脸：0=无；1=有；")
    @TableField(exist = false)
@@ -252,4 +278,22 @@
    @ExcelColumn(name="门禁有效期结束",index= 6,dateFormat = "yyyy-MM-dd")
    private Date endTime;

    @ApiModelProperty(value = "人脸照片完整地址")
    @TableField(exist = false)
    private String faceImgFull;
    @ApiModelProperty(value = "人脸照片完整地址")
    @TableField(exist = false)
    private String imgurlFull;
    @ApiModelProperty(value = "是否主管 0否 1是", example = "1")
    @TableField(exist = false)
    private Integer headStatus;

    @ApiModelProperty(value = "门禁角色名称")
    @TableField(exist = false)
    private String roleName;

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

}

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

@@ -51,8 +51,8 @@
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "类型 0解冻 1冻结 2拉黑 3恢复 4设为拜访人 5取消拜访人 6设为高级审批人 7取消高级审批人 8手动离场 9删除", example = "1")
    @ExcelColumn(name="类型 0解冻 1冻结 2拉黑 3恢复 4设为拜访人 5取消拜访人 6设为高级审批人 7取消高级审批人 8手动离场 9删除")
    @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 type;

    @ApiModelProperty(value = "人员操作记录日志")

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

@@ -6,6 +6,7 @@
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;

import java.util.List;

/**

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

@@ -1,11 +1,11 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
@@ -29,7 +29,7 @@
     * @param member å®žä½“对象
     * @return Integer
     */
    Integer create(Member member);
    Member create(Member member);

    /**
     *
@@ -44,7 +44,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id,LoginUserInfo user);

    void roleAuthById(Integer id);

@@ -60,9 +60,10 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);

    void batchBlock(List<Integer> ids,Integer type);
    void batchBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);
    void batchRemoveBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);

    /**
     * ä¸»é”®æ›´æ–°
@@ -70,8 +71,7 @@
     * @param member å®žä½“对象
     */
    void updateById(Member member);
    void updateFace(Member member);

    boolean updateFace(Member member);

    /**
     * ä¸»é”®æ›´æ–°åŠ³åŠ¡äººå‘˜çŠ¶æ€
@@ -80,9 +80,6 @@
     */
    void updateStatusById(Member member);

    void updateVisitsStatusById(Member member);

    void updateRemoveStatusById(List<Member> members);

    void updateCanVisitById(Member member);
    /**
@@ -127,14 +124,6 @@


    /**
     * åˆ†é¡µåŠ³åŠ¡ç”¨æˆ·ä¿¡æ¯æŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<Member>
     */
    PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param member å®žä½“对象
@@ -157,11 +146,11 @@
     * @param pageWrap
     * @return
     */
    PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
    PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);

    PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
    PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap);

    PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);
    PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap);

    /**
     * å®šæ—¶å†»ç»“内部人员
@@ -207,4 +196,8 @@
    void empowerByList(Member member);

    void delHkForce(Member member);

    void updateHead(Member member);

    void updateWorkStatus(Member member);
}

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

@@ -10,7 +10,6 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.join.CarJoinMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;

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

@@ -24,15 +24,14 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.CompanyTree;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.doumee.dao.business.vo.CompanyTree;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -85,7 +84,8 @@
            user = company.getLoginUserInfo();
        }
        String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
        company.setCompanyPath(company.getName());//名称路径
        company.setCompanyPath(company.getId()+"/");//名称路径
        company.setCompanyNamePath(company.getName());//名称路径
        company.setHkParentId(rootOrgId);
        if(company.getParentId() !=null){
            Company parent = findById(company.getParentId());
@@ -96,7 +96,8 @@
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，父级组织信息尚未同步下发成功~");
            }
            company.setHkParentId(parent.getHkId());
            company.setCompanyPath(parent.getCompanyPath()+"/"+company.getName());
            company.setCompanyPath(parent.getCompanyPath()+company.getId()+"/");
            company.setCompanyNamePath(parent.getCompanyNamePath()+"/"+company.getName());
        }
        company.setHkCompanyPath(company.getCompanyPath());
        company.setCreateDate(new Date());

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

@@ -1,37 +1,21 @@
package com.doumee.service.business.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.respose.AcsDeviceInfoResponse;
import com.doumee.core.haikang.model.param.respose.AcsDeviceListResponse;
import com.doumee.core.haikang.service.HKService;
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.DeviceMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.DeviceService;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * è®¾å¤‡ä¿¡æ¯è¡¨Service实现

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

@@ -3,9 +3,6 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Date;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
import com.doumee.dao.business.model.Company;

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

@@ -1,10 +1,12 @@
package com.doumee.service.business.impl;

import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSONObject;
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 com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -14,43 +16,41 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.UserAddRequest;
import com.doumee.core.haikang.model.param.request.UserDelRequest;
import com.doumee.core.haikang.model.param.respose.UserAddResponse;
import com.doumee.core.haikang.model.param.respose.UserDelResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.*;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
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 com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
@@ -59,6 +59,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;

@@ -111,20 +112,315 @@

    @Autowired
    private VisitsMapper visitsMapper;
    @Autowired
    private SystemUserMapper systemUserMapper;


    @Override
    public Integer create(Member member) {
        memberMapper.insert(member);
        return member.getId();
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public Member create(Member member) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = member.getLoginUserInfo();
        }
        isMemberParamValid(member);
        //获取出生日期
        //脱敏操作
        Member insert = initAddMemberModel(member,loginUserInfo);
        //海康人员新增业务
        if(dealHkUserBiz(insert)){
            try {
                memberMapper.insert(insert);
                //创建系统登陆账号（默认无任何角色）
                createSystemUser(insert);
            }catch (Exception e){
                //如果发生异常，删除已经创建的人员信息
                deleteHkUserBiz(insert.getHkId());
                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息新建失败，请稍后重试！");
            }
        }else{
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
        }
        return insert;
    }
    private void createSystemUser(Member insert) {
        SystemUser user = new SystemUser();
        // ç”Ÿæˆå¯†ç ç›
        String salt = RandomStringUtils.randomAlphabetic(6);
        // ç”Ÿæˆå¯†ç 
        user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
        user.setSalt(salt);

        // åˆ›å»ºç”¨æˆ·è®°å½•
        user.setType(insert.getType());
        user.setUsername(insert.getPhone());
        user.setEmpNo(insert.getCode());
        user.setRealname(insert.getName());
        user.setCompanyId(insert.getCompanyId());
        user.setMobile(insert.getPhone());
        user.setCreateTime(insert.getCreateDate());
        user.setCreateUser(insert.getCreator());
        user.setUpdateUser(insert.getEditor());
        user.setUpdateTime(insert.getEditDate());
        user.setMemberId(insert.getId());
        user.setDeleted(Boolean.FALSE);
        user.setFixed(Boolean.FALSE);
        user.setStatus(Constants.ZERO);
        systemUserMapper.insert(user);
    }

    private Member initAddMemberModel(Member member, LoginUserInfo loginUserInfo) {
        Member insert=  new Member();
        insert.setCreator(loginUserInfo.getId());
        insert.setCreateDate(new Date());
        insert.setEditor(loginUserInfo.getId());
        insert.setEditDate(new Date());
        insert.setIsdeleted(Constants.ZERO);
        insert.setCompanyId(member.getCompanyId());
        insert.setFaceImg(member.getFaceImg());
        insert.setImgurl(member.getImgurl());
        insert.setCode(member.getCode());
        insert.setType(Constants.TWO);
        insert.setHkDate(new Date());
        insert.setWorkStatus(Constants.ONE);//默认在职
        insert.setCanVisit(Constants.ZERO);//默认不可访问
        insert.setAuthStatus(Constants.ZERO);
        insert.setName(member.getName());
        insert.setHkStatus(Constants.ONE);
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
        insert.setPhone(member.getPhone());
        insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
        insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
        insert.setStatus(Constants.ZERO);
        return  insert;
    }

    /**
     * åˆ é™¤æµ·åº·äººå‘˜ä¿¡æ¯
     * @param hkId
     */
    private void deleteHkUserBiz(String hkId) {
        UserDelRequest request = new UserDelRequest();
        request.setPersonIds(new String[]{hkId});
        BaseResponse<List<UserDelResponse>> result =  HKService.delBatchUser(request);
    }

    /**
     * æµ·åº·äººå‘˜æ–°å¢žä¸šåŠ¡
     * @param insert
     * @return
     */
    private boolean dealHkUserBiz(Member insert) {
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
        Company company = companyMapper.selectById(insert.getCompanyId());
        if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
        }
        if(StringUtils.isBlank(company.getHkId())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！");
        }
        insert.setHkOrgId(company.getHkId());
        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
        if(hkAddRequest == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，人脸照片有误，请尝试重新上传！");
        }
        //处理新增数据
        BaseResponse<UserAddResponse> result =  HKService.addUser(hkAddRequest);
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
            insert.setHkId(hkAddRequest.getPersonId());
            insert.setFaceId(result.getData().getFaceId());
            if(StringUtils.isNotBlank(insert.getFaceId())){
                insert.setFaceStatus(Constants.ONE);
            }else{
                insert.setFaceStatus(Constants.ZERO);
            }
            return  true;
        }else  if(result!=null ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，同步安防平台失败【"+result.getMsg()+"】，请联系管理员！");
        }
        return false;
    }
    private boolean dealHkUserForUpdateBiz(Member update ) {
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();

        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);

        //处理新增数据
        BaseResponse<UserAddResponse> result =  HKService.editUser(hkAddRequest);
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
            update.setHkStatus(Constants.ONE);//已同步
            update.setRemark("人员信息已同步成功");
            if(StringUtils.isNotBlank(update.getFaceImg()) && Constants.equalsInteger(update.getFaceStatus(),Constants.ZERO)){
                //如果有人脸照片，处理人脸照片同步
                String faceid = HkSyncOrgUserToHKServiceImpl.dealMemberFace(update,path);
                if(StringUtils.isBlank(faceid)){
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，员工人脸信息不合格，请更换人脸照片重试！");
                }else{
                    update.setFaceId(faceid);
                    update.setFaceStatus(Constants.ONE);
                    //如果人脸跟你，重新下发权限数据
                    update.setRemark("人员和人脸信息同步成功"+result.getMsg());
                    //重新授权设备权限
//                    HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,update,deviceRoleMapper,empowerMapper,deviceMapper);
                }
            }
            update.setHkDate(update.getEditDate());
            return  true;
        }else  if(result!=null ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，同步安防平台失败【"+result.getMsg()+"】，请联系管理员！");
        }
        return false;
    }

    /**
     * æ¸…除员工的设备权限
     * @param member
     */
    private void cancelAllMemberEmpower(Member member) {
        //删除全部权限
        memberRoleMapper.update(null,new UpdateWrapper<MemberRole>().lambda()
                .eq(MemberRole::getMemberId,member.getId())
                .set(MemberRole::getIsdeleted,Constants.ONE)
                .set(MemberRole::getEdirot,member.getEditor())
                .set(MemberRole::getEditDate,member.getEditDate()));
        //把所有待下发的任务改成 å·²å–消
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .eq(Empower::getSendStatus,Constants.EmpowerStatus.wait)
                .set(Empower::getIsdeleted,Constants.ONE)
                .set(Empower::getSendStatus,Constants.EmpowerStatus.cancel));
        //所有下发过的任务，改为待删除权限
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .notIn(Empower::getSendStatus,Constants.EmpowerStatus.fail)
                .set(Empower::getRemark,"等待同步删除安防平台")
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .set(Empower::getSendStatus,Constants.ZERO));
    }

    private void isMemberParamValid(Member member) {
        if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (StringUtils.isBlank(member.getIdcardNo())||!IdcardUtil.isValidCard(member.getIdcardNo())){
            if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                    .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
                    .eq(Member::getIsdeleted,Constants.ZERO)
                    .ne(Member::getId,member.getId())) >0){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
            }
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
        }

        SystemUser queryUserDto = new SystemUser();
        queryUserDto.setUsername(member.getPhone());
        queryUserDto.setDeleted(Boolean.FALSE);
        SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
        if (user != null) {
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+queryUserDto.getUsername()+"】已被使用，不能重复");
        }
        // éªŒè¯å·¥å·
        if (StringUtils.isNotBlank(member.getCode())) {
            queryUserDto = new SystemUser();
            queryUserDto.setDeleted(Boolean.FALSE);
            queryUserDto.setEmpNo(member.getCode());
            user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
            if (user != null) {
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "工号【"+member.getCode()+"】已存在");
            }
        }
    }
    private Member isMemberUpdateParamValid(Member member) {
        Member model = memberMapper.selectById(member.getId());
        if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该员工信息不存在，请刷新页面重试！");
        }
        if (StringUtils.isNotBlank(member.getPhone()) && !PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (StringUtils.isNotBlank(member.getIdcardNoNew())){
            String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//身份证号加密
            if(  !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
                //如果发生改变，并且不合法，提示异常
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"修改的新身份证号格式有误");
            }
            if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
                if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                        .eq(Member::getIdcardNo,encrptNo)
                        .eq(Member::getIsdeleted,Constants.ZERO)
                        .ne(Member::getId,member.getId())) >0){
                    throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNoNew()+"】已被使用，不能重复");
                }

                member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//根据身份证号获取性别
                member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
                member.setIdcardNo(encrptNo);
            }
        }
        boolean isNeedUpdateUser = false;
        if(StringUtils.isNotBlank(member.getPhone()) && StringUtils.equals(member.getPhone(),model.getPhone())){
            //  å¦‚果手机号发生修改，校验唯一性
            SystemUser queryUserDto = new SystemUser();
            queryUserDto.setUsername(member.getPhone());
            queryUserDto.setDeleted(Boolean.FALSE);
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
                    .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
            if (user != null) {
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【" + queryUserDto.getUsername() + "】已被使用，不能重复");
            }
            isNeedUpdateUser = true;
        }
        if(StringUtils.isNotBlank(member.getCode()) && StringUtils.equals(member.getPhone(),model.getCode())){
                // éªŒè¯å·¥å·
            SystemUser queryUserDto = new SystemUser();
            queryUserDto = new SystemUser();
            queryUserDto.setDeleted(Boolean.FALSE);
            queryUserDto.setEmpNo(member.getCode());
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
                    .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
            if (user != null) {
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "工号【"+member.getCode()+"】已存在");
            }
            isNeedUpdateUser = true;
        }
        if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
            //如果组织发生变化
            Company company = companyMapper.selectById(member.getCompanyId());
            if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
            }
            if(StringUtils.isBlank(company.getHkId())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！");
            }
            member.setHkOrgId(company.getHkId());
            isNeedUpdateUser = true;
        }
        if(isNeedUpdateUser){
            //更新系统用户账号信息
            systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
                            .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
                            .set(SystemUser::getUpdateTime,new Date())
                            .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())
                    .eq(SystemUser::getMemberId,model.getId()));
        }
        member.setHkId(model.getHkId());
        member.setFaceId(model.getFaceId());//人脸编码
        return model;
    }

    @Transactional
    @Override
    public Integer laborMemberCreate(LaborMemberDTO member) {

        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        if (PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
@@ -139,8 +435,6 @@
        //脱敏操作
        String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
        //转换日期
        DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");

        Member insert = new Member();
        insert.setCreator(loginUserInfo.getId());
        insert.setCreateDate(new Date());
@@ -152,7 +446,7 @@
        insert.setImgurl(member.getImgurl());
        insert.setType(Constants.ZERO);
        insert.setName(member.getName());
        insert.setBirthday(yyyyMMdd);
        insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
        insert.setPhone(member.getPhone());
        insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
        IdcardUtil.isValidCard(member.getIdcardNo());
@@ -177,7 +471,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id,LoginUserInfo user) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        Member member=new Member();
@@ -185,7 +479,10 @@
        member.setIsdeleted(Constants.ZERO);
        member.setEditor(loginUserInfo.getId());
        member.setEditDate(new Date());
        member.setHkStatus(Constants.ZERO);
        member.setRemark("人员已删除，等待删除门禁权限");
        memberMapper.updateById(member);
        saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
    }


@@ -220,83 +517,153 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo loginUserInfo) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member member=new Member();
        ids.stream().forEach(s ->{
            member.setId(s);
            member.setIsdeleted(Constants.ONE);
            member.setHkStatus(Constants.ZERO);
            member.setRemark("人员已删除，等待删除门禁权限");
            member.setEditor(loginUserInfo.getId());
            member.setEditDate(new Date());
            memberMapper.updateById(member);

            UserAction userAction=new UserAction();
            userAction.setIsdeleted(Constants.ZERO);
            userAction.setCreateDate(new Date());
            userAction.setCreator(loginUserInfo.getId());
            userAction.setType(9);
            userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【删除】");
            userAction.setMemberId(s+"");
            userActionJoinMapper.insert(userAction);

            saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
        });





      /*  memberMapper.deleteBatchIds(ids);*/
    }

    /**
     * æ‹‰é»‘或者冻结员工信息
     * @param ids
     * @param type
     * @param loginUserInfo
     */
    @Override
    public void batchBlock(List<Integer> ids,Integer type) {
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void batchBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member member=new Member();
        for (Integer id:ids) {
            member = memberMapper.selectById(id);
            Member member = memberMapper.selectById(id);
            if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
                UserAction userAction=new UserAction();
//                userAction.setBeforeStatus(member.getStatus());
                member.setStatus(Constants.TWO);
                member.setEditor(loginUserInfo.getId());
                member.setEditDate(new Date());
                member.setAuthStatus(Constants.ZERO);//未授权
                memberMapper.updateById(member);
                Date date = new Date();
                member.setEditDate(date);
                member.setEditor(loginUserInfo.getId());
                //删除员工门禁权限
                cancelAllMemberEmpower(member);

                userAction.setIsdeleted(Constants.ZERO);
                userAction.setCreateDate(new Date());
                userAction.setCreator(loginUserInfo.getId());
                if(Constants.equalsInteger(type,Constants.ONE)){
                    userAction.setType(Constants.ONE);
                    userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper);
                }
                if(Constants.equalsInteger(type,Constants.TWO)){
                    userAction.setType(Constants.TWO);
                    userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【拉黑】");

                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.BLACKLIST,userActionJoinMapper);
                }
                userAction.setMemberId(id+"");

                userActionJoinMapper.insert(userAction);
            }
        }
        /*  memberMapper.deleteBatchIds(ids);*/
    }
    /**
     * æ‹‰é»‘或者冻结员工信息
     * @param ids
     * @param type
     * @param loginUserInfo
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void batchRemoveBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        for (Integer id:ids) {
            Member member = memberMapper.selectById(id);
            if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
                member.setStatus(Constants.ONE);//恢复正常状态
                member.setEditor(loginUserInfo.getId());
                member.setEditDate(new Date());
                member.setAuthStatus(Constants.ZERO);//未授权
                memberMapper.updateById(member);
                Date date = new Date();
                member.setEditDate(date);
                member.setEditor(loginUserInfo.getId());
                if(Constants.equalsInteger(type,Constants.ONE)){
                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_FREEZE,userActionJoinMapper);
                }
                if(Constants.equalsInteger(type,Constants.TWO)){
                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_BLACKLIST,userActionJoinMapper);
                }
            }
        }
    }




    @Override
    public void updateById(Member member) {
        memberMapper.updateById(member);
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateById(Member updateMember) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = updateMember.getLoginUserInfo();
        }
        //校验参数 å¹¶ä¸”æ›´æ–°systemuser æ‰‹æœºå·å’Œå·¥å·ä¿¡æ¯ï¼ˆå¦‚果需要修改的话）
         Member model =   isMemberUpdateParamValid(updateMember);
        updateMember.setEditor(loginUserInfo.getId());
        updateMember.setEditDate(new Date());
        //海康人员新增业务
        if(dealHkUserForUpdateBiz(updateMember)){
            updateMember.setHkId(null);
            updateMember.setAuthStatus(Constants.ZERO);
            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                    .set(Member::getStartTime,null)
                    .set(Member::getEndTime,null)
                    .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
                    .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
                    .set(Member::getEditDate,updateMember.getEditDate())
                    .set(Member::getEditor,updateMember.getEditor())
                    .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
                    .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
                    .set(updateMember.getAuthStatus()!=null,Member::getAuthStatus,updateMember.getAuthStatus())
                    .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
                    .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
                    .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
                    .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
                    .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
                    .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
                    .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
                    .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .eq(Member::getId,updateMember.getId()));
            cancelAllMemberEmpower(updateMember);
            //记录操作日志
            saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper);
        }else{
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
        }
    }

    private void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper) {
        UserAction userAction=new UserAction();
        userAction.setIsdeleted(Constants.ZERO);
        userAction.setCreateDate(updateMember.getEditDate());
        userAction.setCreator(updateMember.getEditor());
        userAction.setType(type.getKey());
        String info = type.getInfo();
        userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
        userAction.setMemberId(updateMember.getId()+"");
        userActionMapper.insert(userAction);
    }

    @Override
    public void updateFace(Member member) {
    public boolean updateFace(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        wrapper.lambda().ne(Member::getRemark,"人脸已同步最新");
        List<Member> list =memberMapper.selectList(wrapper);
@@ -312,9 +679,11 @@
                 update.setRemark("人脸已同步最新");
                 update.setFaceStatus(Constants.ONE);
                 memberMapper.updateById(update);
                 return true;
             }
           }
       }
       return false;
    }
    @Override
    public void delHkForce(Member member) {
@@ -333,95 +702,95 @@
       }
        HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper);
    }
    @Override
    public void updateHead(Member member) {
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
       if(model.getCompanyId()!=null) {
           if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
               //如果是取消主管
               companyMapper.update(null,new UpdateWrapper<Company>().lambda()
                       .eq(Company::getId,model.getCompanyId())
                       .set(Company::getHeadId,member.getId()));
           }else{
               //如果是设为主管
               companyMapper.update(null,new UpdateWrapper<Company>().lambda()
                       .eq(Company::getId,model.getCompanyId())
                       .set(Company::getHeadId,null)
               );
           }
       }
    }

    @Override
    public void updateStatusById(Member member) {
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = member.getLoginUserInfo();
        }
        Member update = new Member();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(member.getStatus());
        memberMapper.updateById(update);
    }


    @Override
    public void updateVisitsStatusById(Member member) {
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateWorkStatus(Member member) {
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member result=memberMapper.selectById(member.getId());
        Integer status=result.getStatus();
        if(loginUserInfo == null){
            loginUserInfo = member.getLoginUserInfo();
        }
        Member update = new Member();
        update.setId(member.getId());
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(Constants.Status.FREEZE.getValue());
        update.setId(member.getId());
        update.setWorkStatus(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
        if(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)){
            //如果是离职
            cancelAllMemberEmpower(update);
        }
        update.setAuthStatus(Constants.ZERO);
        memberMapper.updateById(update);

        UserAction userAction=new UserAction();
        userAction.setIsdeleted(Constants.ZERO);
        userAction.setCreateDate(new Date());
        userAction.setCreator(loginUserInfo.getId());
        if(Constants.equalsInteger(result.getType(),Constants.TWO)){
            userAction.setType(Constants.ONE);
            userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
        }
        if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
            userAction.setType(Constants.TWO);
            userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【拉黑】");

        }
        userAction.setMemberId(result.getId()+"");
        userAction.setBeforeStatus(status);
        userActionJoinMapper.insert(userAction);
    }


    @Override
    public void updateRemoveStatusById(List<Member> members) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        Date date=new Date();
        members.stream().forEach(s ->{
            Member result=memberMapper.selectById(s.getId());
            Integer status=result.getStatus();
            Member update = new Member();
            update.setEditDate(date);
            update.setEditor(loginUserInfo.getId());
            update.setStatus(Constants.Status.ENABLE.getValue());
            update.setId(s.getId());
            memberMapper.updateById(update);

            //解冻业务 å¤„理用户授权导入记录
            this.thawMember(result);

            UserAction userAction=new UserAction();
            userAction.setIsdeleted(Constants.ZERO);
            userAction.setCreateDate(new Date());
            userAction.setCreator(loginUserInfo.getId());
            if(Constants.equalsInteger(result.getType(),Constants.TWO)){
                userAction.setType(Constants.ZERO);
                userAction.setBeforeStatus(Constants.ONE);
            }
            if(Constants.equalsInteger(result.getType(),Constants.ONE)){
                userAction.setBeforeStatus(status);
                userAction.setType(Constants.TWO);
            }
            userAction.setMemberId(result.getId()+"");
            userActionJoinMapper.insert(userAction);
        });
        //记录操作日志
        saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.UserActionType.WORK_OFF:Constants.UserActionType.WORK_ON,userActionJoinMapper);
    }




    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateCanVisitById(Member member) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = member.getLoginUserInfo();
        }
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
        if(Constants.equalsInteger(member.getCanVisit(),model.getCanVisit())){
            //如果没有发生变化，直接返回
            return;
        }
        Member update = new Member();
        update.setEditDate(new Date());
        update.setId(member.getId());
        update.setEditor(loginUserInfo.getId());
        update.setCanVisit(member.getCanVisit());
        memberMapper.updateById(update);
        //记录操作日志
        saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper);
    }

    @Override
@@ -450,8 +819,7 @@
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
                .selectAs(Company::getName,Member::getCompanyName) ;

        if(null != member.getType()) {
            queryWrapper.eq(Member::getType,member.getType());
@@ -460,7 +828,6 @@
            queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);

        List<Member> list =  memberJoinMapper.selectJoinList(Member.class,queryWrapper);
        if(list!=null){
            for(Member m : list){
@@ -630,36 +997,6 @@
    }

    @Override
    public PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        MemberInfoDTO model = pageWrap.getModel();
        Utils.MP.blankToNull(model);
        Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
              /*  .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
                .leftJoin(Empower.class,Empower::getMemberId,Member::getId);*/

        queryWrapper.selectAll(Member.class)
                    .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                    .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
                /*.select(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")*/
                .select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");

        queryWrapper.eq(Member::getType,Constants.ZERO);
        queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
                    .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
                    .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
                    .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
                    .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
        }
        return PageData.from(memberIPage);
    }

    @Override
    public long count(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
        wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
@@ -684,14 +1021,22 @@
    }

    @Override
    public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
    public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(Member.class);
        queryWrapper.selectAs(Company::getName,Member::getCompanyName);
        queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
        queryWrapper.selectAs(Company::getType,Member::getCompanyType);
        queryWrapper.selectAs(Company::getHeadId,Member::getHeadId);
        queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
        queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
        queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and  mc.member_id = t.id ) as  memberCardCount ");
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
//        queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
        queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
                        Member::getCompanyId,pageWrap.getModel().getCompanyIds())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
@@ -707,16 +1052,26 @@
                .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
//                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
                .eq(Member::getType,Constants.memberType.internal)
//                .eq(Member::getType,Constants.memberType.internal)
                .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
                .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
            queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
        }else{
            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
//            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
        }
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if(pageWrap.getModel().getCompanyId()!=null){
            if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
                //如果包含下级组织
                Company company = companyMapper.selectById(pageWrap.getModel().getCompanyId());//查询组织信息
                queryWrapper.likeRight(Company::getCompanyPath,company.getCompanyPath());
            }else{
                //不包含下级组织
                queryWrapper.eq(Company::getId,pageWrap.getModel().getCompanyId());
            }
        }
        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);

        if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
            //FTP文件访问前缀
@@ -726,15 +1081,18 @@
            List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                            .select(DeviceRole::getId,DeviceRole::getName)
                    .eq(DeviceRole::getIsdeleted,Constants.ZERO));
            for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
            for (Member memberInfoDTO:memberIPage.getRecords()) {
                //获得门禁组名称数组
                memberInfoDTO.setCanVisit(Constants.formatIntegerNum(memberInfoDTO.getCanVisit()));
                memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
                memberInfoDTO.setHeadStatus(Constants.equalsInteger(memberInfoDTO.getHeadId(),memberInfoDTO.getId())?Constants.ONE:Constants.ZERO);
                memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
                //拼接前缀
                if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
                    memberInfoDTO.setFaceImg(prefixUrl + memberInfoDTO.getFaceImg());
                    memberInfoDTO.setFaceImgFull(prefixUrl + memberInfoDTO.getFaceImg());
                }
                if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
                    memberInfoDTO.setImgurl(prefixUrl + memberInfoDTO.getImgurl());
                    memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
                }
            }
        }
@@ -768,13 +1126,13 @@
    }

    @Override
    public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
    public PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
                .selectAs(Company::getName,Member::getCompanyName)
                .selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitsCount");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
@@ -791,21 +1149,21 @@
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
            queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
        }else{
            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
            queryWrapper.eq((pageWrap.getModel().getCompanyId())!=null,Member::getCompanyId,pageWrap.getModel().getCompanyId());
        }
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
        return PageData.from(memberIPage);

    }


    @Override
    public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
    public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .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")
@@ -820,12 +1178,12 @@
                        .or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
                .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
                .eq(Member::getStatus,Constants.Status.FREEZE.getValue())
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId())
                .eq((pageWrap.getModel().getCompanyId())!=null,Company::getId,pageWrap.getModel().getCompanyId())
                .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
                .orderByDesc(Member::getCreateDate);


        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
        return PageData.from(memberIPage);

    }
@@ -916,15 +1274,12 @@
           return;
        }
        List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());

        Date date = new Date();
        for (Integer id:memberIds) {
            UserAction userAction=new UserAction();
            userAction.setIsdeleted(Constants.ZERO);
            userAction.setCreateDate(new Date());
            userAction.setType(1);
            userAction.setRemark("由定时任务于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
            userAction.setMemberId(id+"");
            userActionJoinMapper.insert(userAction);
            Member updateMember = new Member();
            updateMember.setId(id);
            updateMember.setEditDate(date);
            saveUserActionBiz(updateMember,null,Constants.UserActionType.FREEZE,userActionJoinMapper);
        }



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

@@ -3,11 +3,8 @@
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.admin.response.MemberInfoDTO;
import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.join.ParksJoinMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Parks;
import com.doumee.service.business.ParksService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -7,9 +7,9 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.ProblemLogJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;

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

@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.TrainTimeJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.TrainTime;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TrainTimeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -2,13 +2,11 @@

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.UserActionMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.ParkBook;
import com.doumee.dao.business.model.UserAction;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.UserActionService;

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

@@ -1,22 +1,16 @@
package com.doumee.service.business.impl;

import cn.hutool.core.date.DateUnit;
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.erp.ErpConstants;
import com.doumee.core.erp.ErpTool;
import com.doumee.core.erp.model.openapi.request.VisitListRequest;
import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
import com.doumee.core.erp.model.openapi.request.erp.UserInfoRequest;
import com.doumee.core.erp.model.openapi.response.VisitEventListResponse;
import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.HKTools;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
@@ -28,20 +22,17 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.DeviceJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.AuditApproveDTO;
import com.doumee.dao.web.reqeust.ErpVisitDTO;
import com.doumee.dao.web.reqeust.ErpWithVisitDTO;
import com.doumee.dao.web.reqeust.VisitRecordDTO;
import com.doumee.dao.web.response.InternalHomeVO;
import com.doumee.dao.web.response.VisitDetailVO;
import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.VisitsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,16 +41,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;

import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;


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

@@ -30,6 +30,7 @@
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -16,6 +16,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ext.ERPSyncService;
@@ -855,10 +856,11 @@
       }
    }

    private UserAddRequest getUserAddModel(Member c,String path,int type) {
    public static UserAddRequest getUserAddModel(Member c,String path,int type) {
        UserAddRequest model = new UserAddRequest();
        model.setOrgIndexCode(c.getHkOrgId());
        model.setJobNo(c.getCode());
        model.setPhoneNo(c.getPhone());
        model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
        model.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
        model.setPersonId(type == 0 ?UUID.randomUUID().toString().replace("-", ""):c.getHkId());
@@ -874,7 +876,6 @@
            }
            face.setFaceData(imageBase);
            model.getFaces().add(face);

        }
        return  model;
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java

@@ -17,6 +17,7 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java

@@ -21,6 +21,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Visits;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVisitFromHKServiceImpl.java

@@ -16,9 +16,9 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Visits;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;