最新版本

jiangping

2024-05-11 415bf078cb4f9615e9090663b7880e35817fd036

最新版本

 admin/src/api/business/member.js

@@ -28,6 +28,9 @@
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) {

 admin/src/components/business/OperaMemberWindow.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,154 @@
<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/>
            </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 v-if="form.id !=null">
                ï¼ˆæ³¨ï¼šå½“前身份证号为<span style="color: red">【{{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/internalMember.vue

@@ -44,10 +44,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 +61,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>
@@ -95,10 +99,10 @@
                <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>
@@ -114,7 +118,9 @@
                    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" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">删除</el-button>
                        <el-button type="text"  icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">重新授权</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -126,6 +132,7 @@
            </pagination>
            <!--    æŸ¥çœ‹äººå‘˜å¼€å¡è®°å½•    -->
            <cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
            <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
        </template>
    </TableLayout1>
</template>
@@ -136,12 +143,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'
export default {
  name: 'internalMember',
  extends: BaseTable,
  components: { TableLayout1, Pagination, Tree, cardOpeningRecord },
  components: { TableLayout1, Pagination, Tree, cardOpeningRecord,OperaMemberWindow },
  data () {
    return {
      TreeList: [],
@@ -158,7 +166,8 @@
        hasFace: ''
      },
      loading:false,
      companyTree: []
      companyTree: [],
      department:[]
    }
  },
  created () {
@@ -196,9 +205,27 @@
            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 => {
        let 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 () {
      this.$dialog.actionConfirm('该操作降触发全员信息更新和重新下发！请谨慎操作', '您确认全量同步内部人员信息吗？')

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

@@ -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/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

@@ -46,8 +46,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
@@ -117,7 +124,7 @@
    @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){
        memberService.updateStatusById(member);
        return ApiResponse.success(null);
    }
@@ -125,7 +132,7 @@
    @ApiOperation("人员移除/解冻")
    @PostMapping("/updateRemoveStatusById")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
    public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        if(list.size()>0){
            memberService.updateRemoveStatusById(list);
            return ApiResponse.success(null);
@@ -138,7 +145,8 @@
    @ApiOperation("人员拉黑/冻结")
    @PostMapping("/updateVisitsStatusById")
    @CloudRequiredPermission("business:member:update")
    public ApiResponse updateVisitsStatusById(@RequestBody Member member){
    public ApiResponse updateVisitsStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        member.setLoginUserInfo(this.getLoginUser(token));
        memberService.updateVisitsStatusById(member);
        return ApiResponse.success(null);
    }
@@ -175,7 +183,7 @@
    @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){
        memberService.updateCanVisitById(member);
        return ApiResponse.success(null);
    }
@@ -186,11 +194,17 @@
    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(memberService.findPage(pageWrap));
    }
    @ApiOperation("查询全部")
    @PostMapping("/list")
    @CloudRequiredPermission("business:member:query")
    public ApiResponse<List<Member>> findPage (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(memberService.findList(model));
    }

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

@@ -220,7 +234,7 @@
    @ApiOperation("分页查询内部人员信息")
    @PostMapping("/findMemberInfoPage")
    @CloudRequiredPermission("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
    public ApiResponse<PageData<MemberInfoDTO>> 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)){

 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/response/MemberInfoDTO.java

@@ -51,6 +51,11 @@

    @ApiModelProperty(value = "健康码")
    private String imgurl;
    @ApiModelProperty(value = "人脸照片完整")
    private String faceImgFull;

    @ApiModelProperty(value = "健康码完整")
    private String imgurlFull;

    @ApiModelProperty(value = "类型 0劳务访客 1普通访客  2内部人员")
    private Integer type;
@@ -128,4 +133,9 @@

    @ApiModelProperty(value = "门禁组名称")
    private List<String> roleNames;

    @ApiModelProperty(value = "组织编码路径")
    private String companyPath;
    @ApiModelProperty(value = "组织路径")
    private String companyNamePath;
}

 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")
@@ -209,6 +210,12 @@
    @ApiModelProperty(value = "组织名称")
    @TableField(exist = false)
    private String companyName;
    @ApiModelProperty(value = "组织编码路径")
    @TableField(exist = false)
    private String companyPath;
    @ApiModelProperty(value = "组织路径")
    @TableField(exist = false)
    private String companyNamePath;
    @ApiModelProperty(value = "组织海康编码")
    @TableField(exist = false)
    private String hkOrgId;
@@ -252,4 +259,8 @@
    @ExcelColumn(name="门禁有效期结束",index= 6,dateFormat = "yyyy-MM-dd")
    private Date endTime;


    @ApiModelProperty(value = "人脸照片完整地址")
    @TableField(exist = false)
    private String faceImgFull;
}

 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

@@ -29,7 +29,7 @@
     * @param member å®žä½“对象
     * @return Integer
     */
    Integer create(Member member);
    Member create(Member member);

    /**
     *
@@ -70,7 +70,7 @@
     * @param member å®žä½“对象
     */
    void updateById(Member member);
    void updateFace(Member member);
    boolean updateFace(Member member);


    /**

 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

@@ -14,7 +14,9 @@
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;
@@ -32,11 +34,16 @@
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.SystemDepartment;
import com.doumee.dao.system.model.SystemDepartmentUser;
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;
@@ -51,6 +58,7 @@
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;
@@ -111,20 +119,166 @@

    @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.setName(member.getName());
        insert.setHkStatus(Constants.ONE);
        insert.setSex(IdcardUtil.getGenderByIdCard(member.getIdcardNo()) ==1?Constants.TWO:Constants.ONE);//根据身份证号获取性别
        insert.setBirthday( DateUtil.parse(IdcardUtil.getBirthByIdCard(member.getIdcardNo()), "yyyyMMdd"));
        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 void isMemberParamValid(Member member) {
        if (!PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (!IdcardUtil.isValidCard(member.getIdcardNo())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
        }

        SystemUser systemUser = new SystemUser();
        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(), "手机号【"+systemUser.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()+"】已存在");
            }
        }
    }

    @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(),"电话号码格式有误");
        }
@@ -296,7 +450,7 @@
        memberMapper.updateById(member);
    }
    @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 +466,11 @@
                 update.setRemark("人脸已同步最新");
                 update.setFaceStatus(Constants.ONE);
                 memberMapper.updateById(update);
                 return true;
             }
           }
       }
       return false;
    }
    @Override
    public void delHkForce(Member member) {
@@ -460,7 +616,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){
@@ -654,7 +809,7 @@
                    .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())));
            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode()) ==1?Constants.TWO:Constants.ONE));
        }
        return PageData.from(memberIPage);
    }
@@ -690,6 +845,8 @@

        queryWrapper.selectAll(Member.class);
        queryWrapper.selectAs(Company::getName,Member::getCompanyName);
        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(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
@@ -731,10 +888,10 @@
                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());
                }
            }
        }

 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

@@ -30,6 +30,7 @@
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;

 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;