Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/constant/MonitorManageConsts.java

@@ -31,13 +31,19 @@ public class MonitorManageConsts {
    //着装违规识别(是否带头盔)
    public static String AI_MODEL_CLOTHING_CODE = "CLOTHING_CODE";
    //安全帽识别
    public static String AI_MODEL_SAFETY_HELMET = "SAFETY_HELMET";
    //人脸识别
    public static String AI_MODEL_FACE = "FACE";
    //陌生人识别
    public static String AI_MODEL_STRANGER = "STRANGER";
    //吸烟识别
    public static String AI_MODEL_SMOKE = "SMOKE";
    //工作服识别
    public static String AI_MODEL_CLOTHING_CODE = "CLOTHING_CODE"; 
    //仪表识别
    public static String AI_MODEL_INSTRUMENT = "INSTRUMENT";
    
    //AI识别结果:正常
    public static final String AI_IDENTIFY_RESULT= "NOM";

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/impl/KafkaProcessImpl.java

@@ -116,19 +116,21 @@ public class KafkaProcessImpl implements KafkaProcess {
				filePath.length());
		if (fileType.equals(MonitorManageConsts.FILE_TYPE_IMG)) {
			bucketName = minioConfig.getBucketAiImage();
			time = fileName.substring(3, 17);
			//dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIMEHHMM_PATTERN),
			//fileName:img202101121630016.png、img202101121630017.png、img202101121630018.png
			//time = fileName.substring(3, 17);
			//dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIME_PATTERN),
			//		DateUtils.NORM_DATETIME_PATTERN);
			// aiIdenLogDto.setTaskExecuteTime(DateUtils.getSysDateTime());
			dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIME_PATTERN),
			time = fileName.substring(3, 15);
			dateTime = DateUtils.formatDate(DateUtils.convertDate(time, DateUtils.PURE_DATETIMEHHMM_PATTERN),
					DateUtils.NORM_DATETIME_PATTERN);
			aiIdenLogDto.setTaskExecuteTime(StringUtils.isEmpty(dateTime) ? DateUtils.getSysDateTime() : dateTime);
			// aiIdenLogDto.setTaskExecuteTime(StringUtils.isEmpty(dateTime) ? DateUtils.getSysDateTime() : dateTime);
			aiIdenLogDto.setTaskExecuteTime(DateUtils.getSysDateTime());
			aiIdenLogDto.setIdenPictureSnapDate(dateTime);
		}
		// 文件上传到 minio文件服务器
		multipartFile = new CommonsMultipartFile(FileUtils.createFileItem(new File(filePath), fileName));
		log.info("保存图片文件");
		log.info("保存图片文件："+fileName);
		minioFileMap = fileManageService.uploadFile(multipartFile, bucketName, deviceCode, null);
		if (fileType.equals(MonitorManageConsts.FILE_TYPE_IMG)) {
@@ -157,15 +159,22 @@ public class KafkaProcessImpl implements KafkaProcess {
					if (MonitorManageConsts.AI_MODEL_FACE.equals(aiIdenModel)) {
						aiIdenLogDto = faceAiRecog(aiIdenLogDto, filePath);
					} else if (MonitorManageConsts.AI_MODEL_CLOTHING_CODE.equals(aiIdenModel)) {
					} else if (MonitorManageConsts.AI_MODEL_SAFETY_HELMET.equals(aiIdenModel)) {
						aiIdenLogDto = aiHelmetDetect(aiIdenLogDto, filePath);
					}
					/*else if (MonitorManageConsts.AI_MODEL_STRANGER.equals(aiIdenModel)) {
					}else if (MonitorManageConsts.AI_MODEL_SMOKE.equals(aiIdenModel)) {
						
						
					}else if (MonitorManageConsts.AI_MODEL_CLOTHING_CODE.equals(aiIdenModel)) {
						
						
					} else {
					}else if (MonitorManageConsts.AI_MODEL_INSTRUMENT.equals(aiIdenModel)) {
						
					}*/
						
					} else if (MonitorManageConsts.AI_MODEL_STRANGER.equals(aiIdenModel)){
						
						
					}
				}
			}
@@ -431,7 +440,7 @@ public class KafkaProcessImpl implements KafkaProcess {
			}
			resourceToolInfoList = JSON.parseArray(resultData.getString("data"), Map.class);
			log.info("getResourceToolAllInfo method return result: " + resultData.getString("data"));
			log.debug("getResourceToolAllInfo method return result: " + resultData.getString("data"));
		} catch (Exception e) {
			log.error("getResourceToolAllInfo is error");
		}

security-protection-platform/src/api/common/index.js

@@ -19,7 +19,29 @@ const api = {
      return resp
    })
  },
  // 获取公司类型列表
  getCompanyTypesList () {
    return $default.get('/sp/employeeManagement/queryCompanyList').then(resp => {
      return resp
    }).catch((err) => { return err })
  },
  // 获取部门类型列表
  queryCycleChildOrg (id) {
    return $default.get(`/sp/employeeManagement/queryCycleChildOrg?orgId=${id}`).then(resp => {
      const data = resp.data.data
      if (!Array.isArray(data)) return resp
      // 将平铺的数组变为树形数组
      resp.data = nest(data)
      return resp
    }).catch((err) => { return err })
  },
  // 获取员工列表
  getStaffTypesList (id) {
    return $default.get(`/sp/employeeManagement/queryEmployeeListByOrgId?orgId=${id}`).then(resp => {
      return resp
    }).catch((err) => { return err })
  },
  // 查询单个用户信息详情
  getEmployeeByOrgid (orgId) {
    return $default
      .get(`/sp/workEmployee/queryEmployeeByOrg?orgId=${orgId}`)

security-protection-platform/src/api/system/index.js

@@ -187,6 +187,9 @@ const api = {
  },
  getDepartments() {
    return $default.get('/sp/workEmployee/queryAllOrganize')
  },
  getListFileUrl(data) {
    return $default.get(`/sp/uploadFile/getListFileUrl?fileNameList=${data.join(',')}`)
  }
}

security-protection-platform/src/api/usermana/index.js

@@ -66,8 +66,11 @@ const api = {
  // 审核用户照片
  auditEmployeePicture (params) {
    return $default.post('/sp/employeeManagement/auditEmployeePicture', params)
  },
  // 编辑用户信息
  editUserDetail(params) {
    return $default.post('/sp/employeeManagement/modifyEmployee', params)
  }
}
function nest (items, code = '-1', link = 'parentCode') {
  return items.filter(item => item[link] === code).map(item => ({ ...item, departments: nest(items, item.code) }))

security-protection-platform/src/layout/components/Sidebar/SidebarItem.vue

@@ -89,10 +89,10 @@ export default {
      const icon = onlyOneChild.meta && onlyOneChild.meta.icon ? <t-icon icon={onlyOneChild.meta.icon} /> : ''
      if (item.path === '/alarm') {
        var confirmedCount = 0
        // var confirmedCount = 0
        var unconfirmedCount = 0
        if (AiAlarmCount.length > 0) {
          confirmedCount = AiAlarmCount[1].value
          // confirmedCount = AiAlarmCount[1].value
          unconfirmedCount = AiAlarmCount[0].value
        }
@@ -103,7 +103,7 @@ export default {
            <div class="badge-group">
              <t-badge color="danger" count={unconfirmedCount} max={99} ></t-badge>
              <t-badge color="danger" count={confirmedCount} max={99} ></t-badge>
            </div>
          </t-menu-item>

security-protection-platform/src/layout/components/Sidebar/index.vue

@@ -78,6 +78,7 @@ export default {
      let res = await aialarmapi.getAiAlarmCount()
      this.AiAlarmCount = res.data.data
      console.log('数据是', this.AiAlarmCount)
    }
  }
}

security-protection-platform/src/modules/access/index.vue

@@ -82,8 +82,9 @@ s<template>
          <div class="detail_item1">
            <div>抓拍图片</div>
            <div>
              <img :src="rowdata.pictureInfo.fileUrl" alt="" srcset="" style="width:100%;height:100%">
              <!-- <img :src="rowdata.pictureInfo.fileUrl" alt="" srcset="" style="width:100%;height:100%"> -->
              <!--处理图片里的方框-->
              <img :src="mainimage" alt="" srcset="" style="width:100%;height:100%">
            </div>
          </div>
          <div class="detail_item2">
@@ -104,6 +105,7 @@ s<template>
              <div>
                <!-- 修改-->
                <img src="@/assets/images/Identify_the_successful.png" alt="" srcset="">
              </div>
              <div>
                <img :src="rowdata.alarmInfo.headerImage" alt="" srcset="" style="width:100%;height:160px; border-radius: 5px;">
@@ -185,7 +187,9 @@ export default {
      // }
      // 截取后的图片
      newimage: ''
      newimage: '',
      // 详情的主图片
      mainimage: ''
    }
  },
@@ -205,6 +209,7 @@ export default {
      // console.log('公司信息是', res)
      if (res.status === 200) {
        this.companyTypesList = res.data.data
        console.log(this.companyTypesList)
        this.search()
      } else {
        this.$Message.danger('获取数据失败')
@@ -215,17 +220,22 @@ export default {
      // this.rowdata = scope.row
      // console.log(this.rowdata)
      // console.log('id是', scope.row.aiIdenLogId)
      this.newimage = ''
      this.mainimage = ''
      var res = await accessapi.getOneInAndOutRecord({ params: { aiIdenLogId: scope.row.aiIdenLogId } })
      if (res.data.success) {
        // this.rowdata = res.data.data
        this.rowdata.pictureInfo = res.data.data.pictureInfo
        console.log('数据', this.rowdata.pictureInfo)
        this.rowdata.alarmInfo = res.data.data.alarmInfo
        console.log('数据', this.rowdata.alarmInfo)
        console.log('相似度数据', this.rowdata.alarmInfo.simi, typeof this.rowdata.alarmInfo.simi)
        // this.rowdata.alarmInfo.newImg = this.rowdata.pictureInfo.fileUrl
        this.getImage()
        this.getmainimage()
        // var loadTimer
        // var imgObject = new Image()
        // imgObject.setAttribute('crossOrigin', 'anonymous')
@@ -291,21 +301,23 @@ export default {
        var params = this.searchdata
        params.pageNumber = this.page
        params.pageSize = this.limit
        console.log(params)
        // console.log(params)
        var res = await accessapi.getaccesslist({ params: params })
        // console.log(res)
        if (res.status === 200) {
          // console.log(res)
          this.data = res.data.data.data
          // console.log(this.data)
          // console.log(this.companyTypesList)
          this.data = this.data.map((item) => {
            // 处理进出时间
            // item.taskExecuteTime = formatDateTime(item.taskExecuteTime)
            // 处理相似度
            // item.simi = this.percentagedata(item.simi)
            // console.log('公司的数据是', this.companyTypesList)
            // console.log('公司id', item)
            // console.log('公司id', item.companyId, typeof item.companyId)
            // console.log('公司名字是', this.companyTypesList.filter((item1) => { return item1.id === 10000 }))
            item.companyinfo = this.companyTypesList.filter((item1) => { return item1.id === item.companyId })
            item.companyinfo = this.companyTypesList.filter((item1) => { return String(item1.id) === item.companyId })
            if (item.companyinfo.length > 0) {
              item.companyname = item.companyinfo[0].name
            } else {
@@ -360,6 +372,7 @@ export default {
        return true
      }
    },
    // 处理截图图片
    async getImage () {
      var loadTimer
      var imgObject = new Image()
@@ -392,7 +405,57 @@ export default {
        // console.log(tnCanvas.toDataURL())
        return tnCanvas.toDataURL()
      }
    },
    // 处理主图片
    async getmainimage () {
      var that = this
      var x = this.rowdata.alarmInfo.face_box[0]
      var y = this.rowdata.alarmInfo.face_box[1]
      var width = this.rowdata.alarmInfo.face_box[2] - this.rowdata.alarmInfo.face_box[0]
      var height = this.rowdata.alarmInfo.face_box[3] - this.rowdata.alarmInfo.face_box[1]
      function getBase64Image (img) {
        var canvas = document.createElement('canvas')
        canvas.width = img.width
        canvas.height = img.height
        var ctx = canvas.getContext('2d')
        ctx.drawImage(img, 0, 0, img.width, img.height)
        ctx.beginPath()
        ctx.moveTo(x, y)
        ctx.lineTo(x + width, y)
        ctx.lineTo(x + width, y + height)
        ctx.lineTo(x, y + height)
        ctx.lineTo(x, y) // 绘制最后一笔使图像闭合
        ctx.lineWidth = 5
        ctx.strokeStyle = 'red'
        ctx.stroke()
        var dataURL = canvas.toDataURL('image/png') // 可选其他值 image/jpeg
        return dataURL
      }
      function main (src, cb) {
        var image = new Image()
        image.src = src + '?v=' + Math.random() // 处理缓存
        image.crossOrigin = '*' // 支持跨域图片
        image.onload = function () {
          var base64 = getBase64Image(image)
          cb && cb(base64)
        }
      }
      main(this.rowdata.pictureInfo.fileUrl, function (base64) {
        // console.log(base64, '是否成功打印base64')
        that.mainimage = base64
      })
    }
    // //将分数转换为小数
    // toPoint (percent) {
    //   var str = percent.replace('%', '')
    //   str = str / 100
    //   return str
    // }
  }
}

security-protection-platform/src/modules/aialarm/index.vue

@@ -75,8 +75,10 @@
        <template slot-scope="scope">
          <a href="javascript:void(0)" size="sm" style="color:#0089D4" @click="handleClick(scope,0)">详情</a>
          <a v-if="scope.row.status=='RUN'||scope.row.status=='FAL'" style="color:#0089D4" @click="handleClick(scope,1)">关闭</a>
          <a v-if="scope.row.status=='INI'" style="color:#0089D4" @click="handleClick(scope,1)">处理</a>
          <div class="caozuo">
            <a v-if="scope.row.status=='RUN'||scope.row.status=='FAL'" style="color:#0089D4" @click="handleClick(scope,1)">关闭</a>
            <a v-if="scope.row.status=='INI'" style="color:#0089D4" @click="handleClick(scope,1)">处理</a>
          </div>
        </template>
      </t-table-column>
    </t-table>
@@ -441,6 +443,9 @@ export default {
    font-size: 14px;
    line-height: 22px;
  }
  .caozuo {
    display: inline;
  }
  .table th,
  .table td {
    padding: 0 0 0 21px;

security-protection-platform/src/modules/attendance/abnormal/index.vue

@@ -8,7 +8,7 @@
        </div>
        <div class="keep-row">
          <span>部门/员工：</span>
          <dept-staff-cascader v-model="form" @inited="handleInited" />
          <dept-staff-cascader v-model="form" @inited="handleInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
        </div>
        <div class="search-btn">
          <t-button color="primary" @click="handSearchAttendance">查询</t-button>
@@ -84,11 +84,14 @@ export default {
    const now = new Date()
    return {
      form: {
        month: formatDateTime(new Date().setMonth(now.getMonth() - 1), 'yyyy-MM'),
        userid: null,
        depId: '',
        orgId: '',
        current: 1,
        pageSize: 10,
        month: formatDateTime(now.setMonth(now.getMonth() - 1), 'yyyy-MM')
        pageSize: 10
      },
      total: 40,
      total: 0,
      attendanceModal: false,
      agreement: '',
      tableData: [],
@@ -98,6 +101,15 @@ export default {
    }
  },
  methods: {
    getDailyOrgId(id) {
      this.form.orgId = id
    },
    getDailyDepId(id) {
      this.form.depId = id
    },
    getDailyStaffId(id) {
      this.form.userid = id
    },
    handleInited() {
      this.getTableData()
    },

security-protection-platform/src/modules/attendance/components/DeptStaffCascader/index.vue

@@ -1,9 +1,28 @@
<template>
  <t-cascader v-model="staff" :data-source="source" :loader="loadStuffData" :change-on-select="true" />
  <div class="row">
    <div class="col-3">
      <t-select v-model="companyTypeId" width="200px" @change="getOrgId">
        <t-option v-for="item in companyTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
      </t-select>
    </div>
    <div class="col-3" style="margin-left:35px">
      <!-- <t-select v-model="departmentTypeId" width="200px">
            <t-option v-for="item in departmentTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
          </t-select> -->
      <template>
        <t-select-tree v-model="departmentTypeId" :node-data="departmentTypesList" width="200px" node-key="id" @change="getDepId"></t-select-tree>
      </template>
    </div>
    <div class="col-3" style="margin-left:35px">
      <t-select v-model="staffTypeId" width="200px" @change="getStaffId">
        <t-option v-for="item in staffTypesList" :key="item.id" :value="item.id">{{ item.name }}</t-option>
      </t-select>
    </div>
  </div>
</template>
<script>
import commonapi from '@/api/common'
import commonApi from '@/api/common'
export default {
  props: {
    value: {
@@ -15,7 +34,14 @@ export default {
  },
  data() {
    return {
      source: []
      source: [],
      // 公司、部门、员工、列表
      companyTypesList: [],
      departmentTypesList: [],
      staffTypesList: [],
      companyTypeId: '',
      departmentTypeId: '',
      staffTypeId: ''
    }
  },
  computed: {
@@ -30,54 +56,103 @@ export default {
      }
    }
  },
  watch: {
    companyTypeId (val) {
      // 重置部门回显
      this.departmentTypeId = ''
      // 查询部门列表
      this.queryCycleChildOrg(val)
    },
    departmentTypeId (val) {
      // 重置人员回显
      this.staffTypeId = ''
      // 重置人员列表
      this.staffTypesList = []
      // 减少查询请求
      if (val !== '') {
        this.getStaffTypesList(val)
      }
    }
  },
  created() {
    this.getDepartments()
    this.getCompanyTypesList()
  },
  methods: {
    getDepartments() {
      commonapi.getDepartments().then(resp => {
        this.staff = []
        this.source = resp.data.map(item => {
          const children = item.departments.map(dept => {
            return {
              label: dept.name,
              value: dept.id,
              children: [],
              loading: false
    getOrgId() {
      console.log(123);
      this.$emit('getOrgId', this.companyTypeId)
    },
    getDepId() {
      this.$emit('getDepId', this.departmentTypeId)
    },
    getStaffId() {
      this.$emit('getStaffId', this.staffTypeId)
    },
    // 向服务器发送请求获取公司类型列表数据
    async getCompanyTypesList () {
      const res = await commonApi.getCompanyTypesList()
      if (res.status === 200) {
        this.companyTypesList = res.data.data
      } else {
        this.$Message.danger('公司类型列表数据获取失败！')
      }
    },
    // 获取部门列表
    async queryCycleChildOrg (id) {
      const res = await commonApi.queryCycleChildOrg(id)
      if (res.status === 200) {
        const data = []
        // 递归 实现tree组件所需部门数据结构
        this.nextDepartment(res.data, data)
        // 深拷贝data
        const data1 = JSON.parse(JSON.stringify(data))
        // 用部门id映射关系代替code与parentCode父子映射关系
        data.forEach(item => {
          // 删除pid为"-1"的的pid属性，否则tree渲染的时候没有根节点渲染不出来
          if (item.pid === '-1') {
            delete item.pid
          }
          item.id = item.orgId
          data1.some((item1) => {
            if (item.pid === item1.id) {
              item.pid = item1.orgId
            } else {
              return false
            }
          })
          children.unshift({
            label: '全部',
            value: item.id,
            children: [],
            loading: false
          })
          return {
        })
        // eslint-disable-next-line no-return-assign
        this.departmentTypesList = data.filter(item => item.data = item.id)
      } else {
        this.$Message.danger('部门类型列表数据获取失败！')
      }
    },
    // 向服务器发送请求获取用户类型列表数据
    async getStaffTypesList (id) {
      const res = await commonApi.getStaffTypesList(id)
      if (res.status === 200) {
        this.staffTypesList = res.data.data
      } else {
        this.$Message.danger('用户类型列表数据获取失败！')
      }
    },
    // 如果部门还有下级 递归
    nextDepartment (data, arr) {
      if (data.length > 0) {
        data.forEach(item => {
          arr.push({
            orgId: item.id + '',
            id: item.code,
            label: item.name,
            value: item.id,
            children
          }
            pid: item.parentCode
          })
          this.nextDepartment(item.departments, arr)
        })
        // if (this.source.length > 0) {
        //   const orgId = this.source[0].value
        //   // const depId = this.source[0].children[0].value
        //   this.staff = [orgId]
        // }
        this.$emit('inited')
      }, err => {
        this.$Message.danger('获取部门列表失败！')
        console.log(err)
      })
      }
    },
    loadStuffData(item, callback) {
      item.loading = true
      commonapi.getEmployeeByOrgid(item.value).then(res => {
      commonApi.getEmployeeByOrgid(item.value).then(res => {
        console.log(res)
        let arr = []

security-protection-platform/src/modules/attendance/report/index.vue

@@ -11,7 +11,7 @@
            </div>
            <div class="keep-row">
              <span>部门/员工：</span>
              <dept-staff-cascader v-model="dailyForm" @inited="handleDailyInited" />
              <dept-staff-cascader v-model="dailyForm" @inited="handleDailyInited" @getOrgId="getDailyOrgId" @getDepId="getDailyDepId" @getStaffId="getDailyStaffId" />
            </div>
            <div class="search-btn">
              <t-button color="primary" @click="handSearchDay">查询</t-button>
@@ -41,7 +41,7 @@
            </div>
            <div class="keep-row">
              <span>部门/员工：</span>
              <dept-staff-cascader v-model="monthlyForm" />
              <dept-staff-cascader v-model="monthlyForm" @getOrgId="getMonthOrgId" @getDepId="getMonthDepId" @getStaffId="getMonthStaffId" />
            </div>
            <div class="search-btn">
              <t-button color="primary" @click="handSearchMonth">查询</t-button>
@@ -113,7 +113,6 @@ import atdapi from '@/api/attendance'
import formatDateTime from '@/utils/formatDateTime.js'
import AttendanceDialog from '../components/AttendanceDialog'
import DeptStaffCascader from '../components/DeptStaffCascader'
export default {
  components: { AttendanceDialog, DeptStaffCascader },
  data () {
@@ -128,7 +127,10 @@ export default {
      loadDetail: false,
      loadDailyTable: false,
      loadMonthTable: false,
      // 公司、部门、员工、列表
      companyTypesList: [],
      departmentTypesList: [],
      getStaffTypesList: [],
      monthlyTotal: 0,
      dailyTotal: 0,
      monthlyForm: {
@@ -150,6 +152,24 @@ export default {
    }
  },
  methods: {
    getDailyOrgId(id) {
      this.dailyForm.orgId = id
    },
    getDailyDepId(id) {
      this.dailyForm.depId = id
    },
    getDailyStaffId(id) {
      this.dailyForm.userid = id
    },
    getMonthOrgId(id) {
      this.monthlyForm.orgId = id
    },
    getMonthDepId(id) {
      this.monthlyForm.depId = id
    },
    getMonthStaffId(id) {
      this.monthlyForm.userid = id
    },
    handleDailyInited () {
      // this.getDailyTable()
    },
@@ -178,6 +198,68 @@ export default {
      this.monthlyForm.current = val
      this.getMonthTable()
    },
    // // 向服务器发送请求获取公司类型列表数据
    // async getCompanyTypesList () {
    //   const res = await commonApi.getCompanyTypesList()
    //   if (res.status === 200) {
    //     this.companyTypesList = res.data.data
    //   } else {
    //     this.$Message.danger('公司类型列表数据获取失败！')
    //   }
    // },
    // // 获取部门列表
    // async queryCycleChildOrg (id) {
    //   const res = await commonApi.queryCycleChildOrg(id)
    //   if (res.status === 200) {
    //     const data = []
    //     // 递归 实现tree组件所需部门数据结构
    //     this.nextDepartment(res.data, data)
    //     // 深拷贝data
    //     const data1 = JSON.parse(JSON.stringify(data))
    //     // 用部门id映射关系代替code与parentCode父子映射关系
    //     data.forEach(item => {
    //       // 删除pid为"-1"的的pid属性，否则tree渲染的时候没有根节点渲染不出来
    //       if (item.pid === '-1') {
    //         delete item.pid
    //       }
    //       item.id = item.orgId
    //       data1.some((item1) => {
    //         if (item.pid === item1.id) {
    //           item.pid = item1.orgId
    //         } else {
    //           return false
    //         }
    //       })
    //     })
    //     // eslint-disable-next-line no-return-assign
    //     this.departmentTypesList = data.filter(item => item.data = item.id)
    //   } else {
    //     this.$Message.danger('部门类型列表数据获取失败！')
    //   }
    // },
    // // 向服务器发送请求获取用户类型列表数据
    // async getStaffTypesList (id) {
    //   const res = await commonApi.getStaffTypesList(id)
    //   if (res.status === 200) {
    //     this.staffTypesList = res.data.data
    //   } else {
    //     this.$Message.danger('用户类型列表数据获取失败！')
    //   }
    // },
    // // 如果部门还有下级 递归
    // nextDepartment (data, arr) {
    //   if (data.length > 0) {
    //     data.forEach(item => {
    //       arr.push({
    //         orgId: item.id + '',
    //         id: item.code,
    //         label: item.name,
    //         pid: item.parentCode
    //       })
    //       this.nextDepartment(item.departments, arr)
    //     })
    //   }
    // },
    // 重置日报数据
    resetDailyData() {
      this.$nextTick(() => {

security-protection-platform/src/modules/system/devicemana/components/modal/addDeviceModal.vue

@@ -1,6 +1,6 @@
<template>
  <!-- 请假对话框 -->
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="500px">
  <t-modal :visibled.sync="visibled" :mask-closable="false" width="600px" height="560px">
    <template slot="header">
      <div class="device-modal-title">{{ isEdit?'设备编辑':'设备新增' }}</div>
    </template>
@@ -21,9 +21,12 @@
          <t-option v-for="item in types" :value="item.id" :key="item.id">{{ item.name }}</t-option>
        </t-select>
      </t-form-item>
      <t-form-item label="视频地址：" prop="videoUrl">
        <t-input v-model="addDeviceModalForm.videoUrl" placeholder="请输入视频地址"></t-input>
      </t-form-item>
      <t-form-item label="图片上传：">
        <div style="display:flex;flex-direction:row">
          <t-upload ref="uploader" :format="['jpg','jpeg','png']" :show-uploaded="false" :before-upload="$_onUploadBeforeUpload" :action="action" :data="{pictureUrl:addDeviceModalForm.pictureUrl}" name="picture" multiple type="drag" style="width:180px;height:180px" @success="$_onUploadSuccess" @remove-file="$_onUploadRemoveFile" @error="$_onUploadError" @file-ext-error="$_onUploadFormatError" @file-exceeded-size="$_onUploadExceededSize">
          <t-upload ref="uploader" :format="['jpg','jpeg','png']" :show-uploaded="false" :before-upload="$_onUploadBeforeUpload" :action="action" :data="{pictureUrl:addDeviceModalForm.pictureUrl}" multiple type="drag" style="width:180px;height:180px" @success="$_onUploadSuccess" @remove-file="$_onUploadRemoveFile" @error="$_onUploadError" @file-ext-error="$_onUploadFormatError" @file-exceeded-size="$_onUploadExceededSize">
            <div style="width: 180px;height:180px;line-height: 180px">
              <t-icon icon="plus-outline" size="40"></t-icon>
            </div>
@@ -46,6 +49,7 @@ const defaultAddDeviceModalForm = {
  deviceId: '', // 设备id
  deviceName: '', // 设备名称
  deviceTypeId: '', // 设备类型id
  videoUrl: '', // 视频地址
  pictureUrl: '' // 图片标识
}
export default {
@@ -79,6 +83,9 @@ export default {
        deviceName: [
          { required: true, message: '设备名称不能为空', trigger: 'blur' }
        ],
        videoUrl: [
          { required: true, message: '视频地址不能为空', trigger: 'blur' }
        ],
        deviceTypeId: [
          { required: true, message: '设备类型不能为空' }
        ]
@@ -187,10 +194,9 @@ export default {
      console.log(file)
    },
    $_onUploadSuccess (res, file) {
      this.imgUrl = res.data.data.toolPictureUrl
      this.addDeviceModalForm.pictureUrl = res.data.data.pictureUrl
      this.imgUrl = res.data.toolPictureUrl
      this.addDeviceModalForm.pictureUrl = res.data.pictureUrl
      // 因为演示用的上传服务器返回数据格式的原因，这里模拟添加 url
      console.log(file)
      this.uploadList.push(file)
    },
    $_onUploadRemoveFile () { },

security-protection-platform/src/modules/system/monitor/HomePageSettings/ShiftCameraDialog.vue

@@ -30,7 +30,7 @@
          <div>
            <img
              :class="item.resourceToolId == form.resourceToolId ? 'hover' : ''"
              :src="item.pictureUrl"
              :src="item.imageUrl"
              style="height: 120px; width: 158px"
              alt=""
            />
@@ -129,10 +129,20 @@ export default {
        nameAsLike: this.searchValue // 设备名称(模糊匹配)
      }
      sysapi.getResourceTool(params).then((resp) => {
        this.cameraList = resp.data.data.data || []
        const res = resp.data.data.data || []
        let data = []
        res.forEach(item => data.push(item.pictureUrl))
        this.getListFileUrl(res, data)
        this.total = resp.data.data.total
      })
    },
    async getListFileUrl(res, data) {
      const resp = await sysapi.getListFileUrl(data)
      res.filter((item, index) => {
        item.imageUrl = resp.data.data[index]
      })
      this.cameraList = res
    },
    groupClick(item) {
      // 选中更换摄像头
      this.form.resourceToolName = item.resourceToolName

security-protection-platform/src/modules/usermana/components/modal/addUser.vue

@@ -1,59 +1,80 @@
<template>
  <t-modal :visibled.sync="isVisibled" :mask-closable="false">
  <t-modal :visibled.sync="isVisibled" :mask-closable="false" width="600px">
    <template slot="header">
      <div class="device-modal-title">{{ isEdit?'用户编辑':'新增用户' }}</div>
    </template>
    <t-form ref="addUserModal" :model="addUserModal" :rules="addUserModalRules" label-position="right">
      <t-form-item label="姓名：" prop="name">
        <t-input v-model="addUserModal.name" placeholder="请输入姓名"></t-input>
        <t-input v-model="addUserModal.name" style="width:300px" placeholder="请输入姓名"></t-input>
      </t-form-item>
      <t-form-item label="员工编号：" prop="code">
        <t-input v-model="addUserModal.code" placeholder="请输入员工编号"></t-input>
        <t-input v-model="addUserModal.code" placeholder="请输入员工编号" style="width:300px"></t-input>
      </t-form-item>
      <t-form-item label="公司：" prop="apartments">
        <t-select v-model="addUserModal.apartments" placeholder="请选择公司" clearable>
        <t-select v-model="addUserModal.apartments" width="300px" placeholder="请选择公司" clearable>
          <t-option v-for="(item,index) in companyList" :value="item.id" :key="index">{{ item.name }}</t-option>
        </t-select>
      </t-form-item>
      <t-form-item v-if="addUserModal.apartments!==''" label="部门：" prop="organizeCode">
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" node-key="id"></t-select-tree>
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" width="300px" node-value="data" node-key="data"></t-select-tree>
      </t-form-item>
      <t-form-item label="职务：" prop="mainJobPosition">
        <t-select v-model="addUserModal.mainJobPosition" placeholder="请选择职务" clearable>
        <t-select v-model="addUserModal.mainJobPosition" width="300px" placeholder="请选择职务" clearable>
          <t-option v-for="(item,index) in jobPoisitonList" :value="item.code" :key="index">{{ item.value }}</t-option>
        </t-select>
      </t-form-item>
      <t-form-item label="年龄：" prop="birthday">
        <t-date-picker v-model="addUserModal.birthday" placeholder="请输入年龄" @date-change="startPickerDateChange"></t-date-picker>
        <t-date-picker v-model="addUserModal.birthday" style="width:300px" placeholder="请输入年龄" @date-change="startPickerDateChange"></t-date-picker>
      </t-form-item>
      <t-form-item label="手机：" prop="mainWirelessCall">
        <t-input v-model="addUserModal.mainWirelessCall" placeholder="请输入11位手机号"></t-input>
        <t-input v-model="addUserModal.mainWirelessCall" style="width:300px" placeholder="请输入11位手机号"></t-input>
      </t-form-item>
      <t-form-item label="人脸图片：" prop="facePicture">
        <t-upload
          ref="uploader"
          :show-uploaded="true"
          :allowed-ext="['jpg','jpeg','png']"
          :max-size="2048"
          :before-upload="$_onUploadBeforeUpload"
          :data="{picture:'11d'}"
          multiple
          style="width:120px;height:160px;background-color:#FFFFFF;"
          type="drag"
          action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
          class="demo-upload-list"
        >
          <div class="picture-upload">
            <t-icon class="upload-icon" icon="plus-outline"></t-icon>
            <span style="color:rgba(0, 0, 0, 0.45)">上传照片</span>
          </div>
        </t-upload>
      <t-form-item label="人脸图片：" style="display:flex" prop="facePicture">
        <div style="display:flex">
          <t-upload
            ref="uploader"
            :show-uploaded="false"
            :allowed-ext="['jpg','jpeg','png']"
            :max-size="2048"
            :before-upload="$_onUploadBeforeUpload"
            multiple
            style="width:120px;height:160px;background-color:#FFFFFF;"
            type="drag"
            action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
            class="demo-upload-list"
            @success = "$_onUploadSuccess"
          >
            <div class="picture-upload">
              <t-icon class="upload-icon" icon="plus-outline"></t-icon>
              <span style="color:rgba(0, 0, 0, 0.45)">上传照片</span>
            </div>
          </t-upload>
          <img v-show="showPicture" :src="showPicture" class="upload-img"/>
          <!-- <div v-show="showPicture" class="upload-edit">
            修改 </div> -->
          <t-upload
            v-show="showPicture"
            ref="uploader"
            :show-uploaded="false"
            :allowed-ext="['jpg','jpeg','png']"
            :max-size="2048"
            :before-upload="$_onUploadBeforeUpload"
            multiple
            type="drag"
            action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
            class="upload-edit"
            @success = "$_onUploadSuccess"
          >
            <div>上传</div>
          </t-upload>
          <img v-show="showPicture" :src="showPicture" class="upload-edit-img"/>
        </div>
        <span style="color:rgba(0, 0, 0, 0.45);font-size:12px">照片格式：jpg、png或bmp文件，且不超过2M</span>
      </t-form-item>
    </t-form>
    <template slot="footer">
      <t-button @click="resetModalData">取消</t-button>
      <t-button v-if="isEdit" :loading="loadingSubmit" color="primary" @click="submitModalData">修改</t-button>
      <t-button v-if="isEdit" :loading="loadingSubmit" color="primary" @click="editModalData">修改</t-button>
      <t-button v-else color="primary" @click="submitModalData">提交</t-button>
    </template>
  </t-modal>
@@ -61,6 +82,7 @@
<script>
import sysapi from '@/api/usermana'
import formatDateTime from '@/utils/formatDateTime.js'
export default {
  props: {
    visible: {
@@ -71,20 +93,27 @@ export default {
    companyList: {
      type: Array,
      default: () => []
    },
    // 回显数据列表
    editUserModal: {
      type: Object,
      default: () => []
    }
  },
  data() {
    // 手机号验证
    // const VALIDATEPASSCHECK = (rule, value, callback) => {
    //   if (value === '') {
    //     callback(new Error('请输入11位手机号'))
    //   } else if (value.length > 0 & value.length !== 11) {
    //     callback(new Error('手机号格式不正确'))
    //   } else {
    //     callback()
    //   }
    // }
    const VALIDATEPASSCHECK = (rule, value, callback) => {
      if (value === '') {
        callback(new Error('请输入11位手机号'))
      } else if (value.length > 0 & value.length !== 11) {
        callback(new Error('手机号需为11位'))
      } else {
        callback()
      }
    }
    return {
      // 按钮是否加载中
      loadingSubmit: false,
      // 是否为编辑状态
      isEdit: false,
      // 部门列表
@@ -92,6 +121,8 @@ export default {
      // 职务列表
      uploadList: [],
      jobPoisitonList: [],
      // 回显图片
      showPicture: '',
      // 新增用户表单
      addUserModal: {
        name: '',
@@ -121,10 +152,10 @@ export default {
          { required: true, message: '职务不能为空', trigger: 'change' }
        ],
        birthday: [
          { required: true, message: '年龄不能为空', trigger: 'blur' }
          { required: true, message: '年龄不能为空' }
        ],
        mainWirelessCall: [
          { required: true, message: '请输入11位手机号', trigger: 'blur' }
          { validator: VALIDATEPASSCHECK, required: true, trigger: 'blur' }
        ],
        facePicture: [
          { required: true, message: '图片不能为空', trigger: 'blur' }
@@ -149,6 +180,9 @@ export default {
      this.addUserModal.organizeCode = ''
      // 查询部门列表
      this.queryCycleChildOrg(val)
    },
    editUserModal () {
      this.getCompanyList()
    }
  },
  mounted() {
@@ -166,14 +200,14 @@ export default {
            organizeCode: this.addUserModal.organizeCode, // 部门CODE
            mainWirelessCall: this.addUserModal.mainWirelessCall, // 手机号码
            mainJobPosition: this.addUserModal.mainJobPosition, // 职务
            field1: this.addUserModal.facePicture, // 照片标识
            field1: this.addUserModal.field1, // 照片标识
            field4: this.addUserModal.apartments, // 公司ID
            birthday: Math.round(new Date() / 1000) // 生日(时间戳)
            birthday: this.addUserModal.birthday // 生日(时间戳)
          }
          sysapi.creteEmployee({params: obj}).then(res => {
            console.log(res)
          sysapi.creteEmployee(obj).then(res => {
            if (res.data.success === true) {
              this.$Message.success('新增成功')
              this.$Message.success('提交成功')
              this.$refs['addUserModal'].resetFields()
            } else {
              console.log(res.data.fail.message)
              this.$Message.success(res.data.fail.message)
@@ -182,11 +216,56 @@ export default {
        }
      })
    },
    // 修改用户个人信息
    editModalData() {
      this.loadingSubmit = true
      let obj = {
        id: this.editUserModal.employeeId, // 主键ID
        name: this.addUserModal.name, // 员工姓名
        code: this.addUserModal.code, // 员工编号
        organizeCode: this.addUserModal.organizeCode, // 部门CODE
        mainWirelessCall: this.addUserModal.mainWirelessCall, // 手机号码
        mainJobPosition: this.addUserModal.mainJobPosition, // 职务
        field1: this.addUserModal.field1, // 照片标识
        field4: this.addUserModal.apartments, // 公司ID
        birthday: +new Date(this.addUserModal.birthday) // 生日(时间戳)
      }
      sysapi.editUserDetail(obj).then(res => {
        if (res.status === 200) {
          this.$Message.success('修改成功!')
          this.isVisibled = false
          this.resetModalData()
          this.$emit('getUserList')
        } else {
          this.$Message.danger('修改失败!')
        }
        this.loadingSubmit = false
      })
    },
    // 重置表单数据
    resetModalData () {
      this.$refs['addUserModal'].resetFields()
      this.imgUrl = ''
      this.isEdit = false
      this.isVisibled = false
      this.showPicture = ''
    },
    // 获得编辑回显数据
    getCompanyList() {
      this.$nextTick(() => {
        this.addUserModal = {
          'name': this.editUserModal.employeeName, // 员工姓名
          'code': this.editUserModal.employeeCode, // 员工编号
          'organizeCode': this.editUserModal.organizationCode, // 部门CODE
          'mainWirelessCall': this.editUserModal.mainWirelessCall, // 手机号码
          'mainJobPosition': this.editUserModal.employeePosition, // 职务
          'apartments': '', // 公司ID
          'birthday': formatDateTime(new Date(this.editUserModal.birthday - 0)) // 生日(时间戳)
        }
        this.addUserModal.apartments = parseInt(this.editUserModal.field4)
        this.showPicture = this.editUserModal.pictureUrl// 照片标识
        this.isEdit = true
      })
    },
    // 查询职务列表
    async getJobPositionList() {
@@ -212,7 +291,7 @@ export default {
          if (item.pid === '-1') {
            delete item.pid
          }
          item.id = item.orgId
          // item.id = item.orgId
          data1.some((item1) => {
            if (item.pid === item1.id) {
              item.pid = item1.orgId
@@ -223,6 +302,9 @@ export default {
        })
        // eslint-disable-next-line no-return-assign
        this.departmentTypesList = data.filter(item => item.data = item.id)
        this.$nextTick(() => {
          this.addUserModal.organizeCode = this.editUserModal.organizationCode
        })
      } else {
        this.$Message.danger('部门类型列表数据获取失败！')
      }
@@ -237,7 +319,8 @@ export default {
            orgId: item.id + '',
            id: item.code,
            label: item.name,
            pid: item.parentCode
            pid: item.parentCode,
            data: item.code
          })
          this.nextDepartment(item.departments, arr)
        })
@@ -257,11 +340,9 @@ export default {
      console.log(file)
    },
    $_onUploadSuccess (res, file) {
      this.imgUrl = res.data.data.toolPictureUrl
      this.addDeviceModalForm.pictureUrl = res.data.data.pictureUrl
      // 因为演示用的上传服务器返回数据格式的原因，这里模拟添加 url
      console.log(file)
      this.uploadList.push(file)
      this.showPicture = res.data.headerPictureUrl
      this.addUserModal.field1 = res.data.pictureUrl
    },
    $_onUploadRemoveFile () { },
    $_onUploadExceededSize () { },
@@ -305,8 +386,33 @@ export default {
<style lang="scss" scoped>
.demo-upload-list{
  .upload--drag{
  background-color:#FFFFFF
  background-color:#FFFFFF;
  align-items: center;
  justify-content: center;
  display: flex
}
}
.upload-img{
  width:120px;
  height:160px;
  margin-left:12px
}
.upload-edit{
  width:120px;
  height:160px;
  margin-left:12px;
  background-color:rgba(0, 0, 0, 0.5);
  justify-content: center;
  align-items: center;
  color: white;
  display: flex;
  cursor: pointer;
  z-index: 2;
}
.upload-edit-img{
  margin-left:-120px;
  width:120px;
  height:160px;
}
.picture-upload{
  display:flex;

security-protection-platform/src/modules/usermana/index.vue

@@ -52,7 +52,7 @@
          </t-table-column>
          <t-table-column label="操作">
            <template v-slot="{row}">
              <a href="javascript:;" style="color:#0089D4;" @click="editDeviceData(row.resourceToolId)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="editDeviceData(row.id)">编辑</a>
              <a href="javascript:;" style="color:#0089D4;" @click="deleteUserData(row)">删除</a>
              <a v-if="row.field2!='5'" href="javascript:;" style="color:#0089D4;" @click="auditdata(row.id,row.companyName)">人脸审核</a>
            </template>
@@ -64,7 +64,7 @@
        </t-pager>
      </div>
    </t-card>
    <add-user-modal :company-list="companyTypesList" :visible.sync="addDeviceModal"></add-user-modal>
    <add-user-modal :edit-user-modal="currentEditDevice" :company-list="companyTypesList" :visible.sync="addDeviceModal" @getUserList="getUserList"></add-user-modal>
    <auditModal :auditshow.sync="auditshow" :auditid="auditid" :company-name="companyName" @refeshUserList="getUserList"></auditModal>
  </div>
</template>
@@ -112,7 +112,9 @@ export default {
      // 人脸审核选择id
      auditid: 0,
      // 人脸审核的公司名称
      companyName: ''
      companyName: '',
      // 判断页面是否是第一次渲染
      firstCreated: true
    }
  },
@@ -137,6 +139,8 @@ export default {
  created () {
    // this.getDeviceData()
    this.getCompanyTypesList()
    // 默认选中能源部
    this.companyTypeId = 10086
  },
  methods: {
    // 获取用户列表数据
@@ -211,6 +215,13 @@ export default {
        })
        // eslint-disable-next-line no-return-assign
        this.departmentTypesList = data.filter(item => item.data = item.id)
        // 进入页面默认选中ebc
        if (this.departmentTypeId === '' && this.firstCreated) {
          this.$nextTick(() => {
            this.departmentTypeId = '10087'
            this.firstCreated = false
          })
        }
      } else {
        this.$Message.danger('部门类型列表数据获取失败！')
      }
@@ -249,6 +260,7 @@ export default {
    },
    // 删除数据
    deleteUserData (row) {
      console.log(row)
      this.$Confirm.confirm({
        title: '正在准备删除...',
        content: '<p>确定要删除？</p><p>删除后将无法还原！</p>',
@@ -307,10 +319,12 @@ export default {
    showAddDeviceModal () {
      this.addDeviceModal = true
    },
    // 编辑新增用户信息
    async editDeviceData (id) {
      const res = await sysapi.getDeviceInfo(id)
      const res = await sysapi.getOneEmployee({ params: { employeeId: id } })
      if (res.status === 200) {
        this.currentEditDevice = res.data
        this.currentEditDevice = res.data.data
        console.log(this.currentEditDevice)
      } else {
        this.$Message.danger('设备数据获取失败！')
      }

security-protection-platform/src/modules/videoSurveillance/components/ReplayDialog/index.vue

@@ -70,10 +70,10 @@ export default {
      videoList: [],
      // 视频播放器对象
      $player: null,
      // 开始时间
      beginDay: '2020-12-19 20:14:00',
      // 结束时间
      endDay: '2020-12-19 20:14:59',
      //   开始时间
      beginDay: formatDateTime(new Date(+new Date() - 10 * 60 * 1000), 'yyyy-MM-dd hh:mm:ss'),
      //   结束时间
      endDay: formatDateTime(new Date(), 'yyyy-MM-dd hh:mm:ss'),
      isShow: true,
      playerOptions: {
        playbackRates: [0.7, 1.0, 1.5, 2.0], // 播放速度

security-protection-platform/src/modules/videoSurveillance/distinguishRecord/index.vue

@@ -44,10 +44,14 @@
        </div>
      </div>
      <div class="img-viewer">
        <div v-for="(item,index) in dataImg" :key="index" :src="item.idenPictureUrl" class="image-carousel">
          <img :src="'http://10.19.90.34:19000/ai-image/'+item.idenPictureUrl" class="img-viewer-size" @click="getParticularsData(item.aiIdenLogId,index)">
          <span :class="{'fileName' : index === fileNameIndex}" style="width: 132px;margin-right: 14px;text-align:center">{{ item.fileName }}</span>
        </div>
        <t-carousel dots="none" arrow="always" style="width: 100%">
          <t-carousel-item v-for="(item1,index1) in dataImgList" :key="index1" style="width: 100%;padding-left: 10%">
            <div v-for="(item, index) in item1" :key="index" :src="item.idenPictureUrl" class="image-carousel">
              <img :src="'http://10.19.90.34:19000/ai-image/'+item.idenPictureUrl" class="img-viewer-size" @click="getParticularsData(item.aiIdenLogId,index)">
              <span :class="{'fileName' : index === fileNameIndex}" style="width: 132px;margin-right: 14px;text-align:center">{{ item.fileName }}</span>
            </div>
          </t-carousel-item>
        </t-carousel>
      </div>
    </div>
  </div>
@@ -65,6 +69,7 @@ export default {
      devicePosition: '',
      distinguishUrl: '',
      dataImg: [],
      dataImgList: [],
      fileNameIndex: 0,
      playerOptions: {
        playbackRates: [0.7, 1.0, 1.5, 2.0], // 播放速度
@@ -116,12 +121,13 @@ export default {
      }
      var flag = this.startreend(this.startDate, this.endDate)
      if (flag) {
        var data = { params: { beginDay: this.startDate, endDay: this.endDate, id: this.videoId }}
        var data = { params: { beginDay: this.startDate, endDay: this.endDate, id: this.videoId, pageNumber: 1, pageSize: 10000 }}
        sysapi.getDistinguishData(data).then(res => {
          console.log(res.data)
          this.dataImg = res.data.data
          if (res.data.data.length > 0) {
            this.getParticularsData(res.data.data[0].aiIdenLogId, 0)
            this.dataImgList = this.arrayGroup(res.data.data, 10)
          } else {
            this.devicePosition = ''
            this.defineResult = ''
@@ -135,6 +141,14 @@ export default {
        this.$Message.danger('开始时间不能在结束时间的后面')
      }
    },
    arrayGroup(array, subGroupLength) {
      let index = 0
      let newArray = []
      while(index < array.length) {
        newArray.push(array.slice(index, index += subGroupLength))
      }
      return newArray
    },
    // 字符串更改为时间类型
    stringtodate (date) {
      date = date.substring(0, 19)
@@ -240,16 +254,22 @@ export default {
            display: flex;
            .image-carousel{
              display: flex;
              width: 9%;
              height: 80%;
              flex-direction: column;
              .img-viewer-size{
                cursor:pointer;
                width: 132px;
                height: 88px;
                width: 100%;
                height: 100%;
                margin-right: 14px;
                padding-left: 2%;
              }
            }
        }
    }
    .carousel-control-prev-icon{
      color: #009bf3;
    }
}
.fileName{
  color: #009bf3;

security-protection-platform/src/modules/videoSurveillance/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="page-main">
    <t-button-group class="top-btn">
      <t-button v-for="(item,index) in sceneList" :key="index" :value="item.monitorSceneId" :color="item.monitorSceneId === selectedMonitorScene ? 'primary' : 'secondary'" @click="tabClick(item.monitorSceneId)">
      <t-button v-for="(item,index) in sceneList" :key="index" :value="item.monitorSceneId" :color="item.monitorSceneId === selectedMonitorScene ? 'primary' : 'secondary'" @click="tabClick(item.monitorSceneId, item.monitorViewLayout)">
        {{ item.monitorSceneName }}
      </t-button>
    </t-button-group>
@@ -125,7 +125,7 @@ export default {
          btn1.className = 'aidicon aidicon-piechart-outline'
          btn1.setAttribute('title', '视频回放')
          btn1.addEventListener('click', () => {
            this.handleReview(this.videoList[index].id)
            this.handleReview(this.videoList[index].resourceToolId)
          })
          item.appendChild(txt)
          item.appendChild(btn)
@@ -141,20 +141,20 @@ export default {
        if (element.id === this.gateFieldData) {
          sysapi.getMonitorScene(this.organizationList[index].id).then((resp) => {
            this.sceneList = resp.data.data || []
            if (resp.data.data[0].monitorViewLayout === '1X1') {
              this.viewLayoutSpan = 10
              this.videoPageSize = 1
            } else if (resp.data.data[0].monitorViewLayout === '2X2') {
              this.viewLayoutSpan = 6
              this.videoPageSize = 4
            } else if (resp.data.data[0].monitorViewLayout === '3X3') {
              this.viewLayoutSpan = 4
              this.videoPageSize = 9
            } else if (resp.data.data[0].monitorViewLayout === '4X4') {
              this.viewLayoutSpan = 3
              this.videoPageSize = 16
            }
            this.tabClick(this.sceneList[0].monitorSceneId)
            // if (resp.data.data[0].monitorViewLayout === '1X1') {
            //   this.viewLayoutSpan = 10
            //   this.videoPageSize = 1
            // } else if (resp.data.data[0].monitorViewLayout === '2X2') {
            //   this.viewLayoutSpan = 6
            //   this.videoPageSize = 4
            // } else if (resp.data.data[0].monitorViewLayout === '3X3') {
            //   this.viewLayoutSpan = 4
            //   this.videoPageSize = 9
            // } else if (resp.data.data[0].monitorViewLayout === '4X4') {
            //   this.viewLayoutSpan = 3
            //   this.videoPageSize = 16
            // }
            this.tabClick(this.sceneList[0].monitorSceneId, resp.data.data[0].monitorViewLayout)
          })
        }
      })
@@ -169,7 +169,6 @@ export default {
      }
      if (res.status === 200) {
        this.replayList = res.data.data
        console.log(this.replayList)
      } else {
        this.$Message.danger('视频列表数据获取失败！')
      }
@@ -181,7 +180,20 @@ export default {
      this.showReplayDialog = true
    },
    // 切换场景
    async tabClick (id) {
    async tabClick (id, monitorViewLayout) {
      if (monitorViewLayout === '1X1') {
        this.viewLayoutSpan = 10
        this.videoPageSize = 1
      } else if (monitorViewLayout === '2X2') {
        this.viewLayoutSpan = 6
        this.videoPageSize = 4
      } else if (monitorViewLayout === '3X3') {
        this.viewLayoutSpan = 4
        this.videoPageSize = 9
      } else if (monitorViewLayout === '4X4') {
        this.viewLayoutSpan = 3
        this.videoPageSize = 16
      }
      this.selectedMonitorScene = id
      this.paramsObj.page = 0
      this.videoList = []
@@ -207,11 +219,14 @@ export default {
    },
    // 获得风场大门数据
    getVideoSurveillanceData () {
      this.videoList = []
      this.videoOptions = []
      var id = this.tabId
      this.paramsObj.page = this.videoCurrent
      sysapi.getVideoSurveillanceData({ params: { monitorSceneId: id } }).then(res => {
        this.videoList = res.data.data
        for (let i in res.data.data) {
      sysapi.getVideoSurveillanceDataForPage({ params: { monitorSceneId: id, pageNumber: this.videoCurrent, pageSize: this.videoPageSize } }).then(res => {
        this.videoList = res.data.data.data
        this.videoTotal = res.data.data.total
        for (let i in res.data.data.data) {
          let obj = {
            autoplay: true, // 如果true,浏览器准备好时开始回放。
            muted: true, // 默认情况下将会消除任何音频。
@@ -229,7 +244,7 @@ export default {
            sources: [{
              withCredentials: false,
              type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
              src: res.data.data[i].videoUrl // url地址
              src: res.data.data.data[i].videoUrl // url地址
            }],
            flash: { hls: { withCredentials: false } },
            html5: { hls: { withCredentials: false } },

security-protection-platform/src/routes.js

@@ -14,12 +14,13 @@ export const constantRoutes = [
  {
    path: '/',
    component: Layout,
    redirect: '/attendance/report',
    redirect: '/dashboard',
    hidden: true
  },
  {
    name: 'dashboard',
    path: '/dashboard',
    redirect: '/',
    component: () => import(/* webpackChunkName: "dashboard" */ './modules/dashboard'),
    meta: { title: '首页', icon: 'home' },
    children: [

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AiIdenLogManageController.java

@@ -46,6 +46,7 @@ public class AiIdenLogManageController {
		params.put("endTime", attendanceReport.getEndDay());
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
		params.put("idenResultType", EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
	}
@@ -73,7 +74,7 @@ public class AiIdenLogManageController {
		params.put("beginTime", attendanceReport.getBeginDay());
		params.put("endTime", attendanceReport.getEndDay());
		params.put("resourceToolId", attendanceReport.getId());
		params.put("aiIdenModel", EbcConstant.AI_MODEL_CLOTHING_CODE);
		params.put("idenResultType", EbcConstant.AI_IDENTIFY_RESULT_ALARM);
		return aiIdenLogManageService.queryAllAiIdenLogPicture(params, pageNumber, pageSize);
	}

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/InAndOutRecordController.java

@@ -75,7 +75,7 @@ public class InAndOutRecordController {
	}
	
	/**
	 * 首页查询进出记录
	 * 查询首页进出记录
	 * @return
	 * @throws Exception
	 */

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/MonitorVideoLogManageController.java

@@ -49,7 +49,6 @@ public class MonitorVideoLogManageController {
		return monitorVideoLogManageService.queryMonitorVideoLogByTime(monitorVideoLogCondition);
	}
	/**
	 * 查询监控视频日志(按时间段)
	 * @param attendanceReport
@@ -76,7 +75,7 @@ public class MonitorVideoLogManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneMonitorVideoLog")
	public CommonResponse<EbcMonitorVideoLog> queryOneMonitorVideoLog(@RequestParam String monitorVideoLogId)
	public CommonResponse<String> queryOneMonitorVideoLog(@RequestParam String monitorVideoLogId)
			throws Exception {
		if (StringUtils.isEmpty(monitorVideoLogId)) {
			return CommonResponse.fail("500", "操作失败");
@@ -94,7 +93,7 @@ public class MonitorVideoLogManageController {
	 */
	@ResponseBody
	@RequestMapping("/getMonitorVideoLogByPictureTime")
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(@RequestParam String imageTime,@RequestParam String resourceToolId)
	public CommonResponse<String> getMonitorVideoLogByPictureTime(@RequestParam String imageTime,@RequestParam String resourceToolId)
			throws Exception {
		if (StringUtils.isEmpty(imageTime)||StringUtils.isEmpty(resourceToolId)) {
			return CommonResponse.fail("500", "获取视频失败");

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiAlarmManageServiceImpl.java

@@ -164,17 +164,19 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
		Map<String, String> pictureMap= uploadFileService.getFileUrlToMap(workTaskSafetyAlarmMap.get("idenPictureUrl"));
		
		//视频信息
		List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
		/*List<EbcMonitorVideoLog> logsList=monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
		EbcMonitorVideoLog ebcMonitorVideoLog=null;
		if (!CollectionUtils.isEmpty(logsList)) {
			ebcMonitorVideoLog=logsList.get(0);
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
		}
		}*/
		String videoFileUrl =monitorVideoLogManageService.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), workTaskSafetyAlarmMap.get("resourceToolId")).getData();
		
		Map<String,Object> resultMap= new HashMap<String, Object>();
		resultMap.put("alarmInfo", workTaskSafetyAlarmMap);
		resultMap.put("pictureInfo", pictureMap);
		resultMap.put("videoInfo", ebcMonitorVideoLog);
		//resultMap.put("videoInfo", ebcMonitorVideoLog);
		resultMap.put("videoInfo", videoFileUrl);
		return CommonResponse.ok(resultMap);
	}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiIdenLogManageServiceImpl.java

@@ -252,19 +252,23 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
		Map<String, String> pictureMap = uploadFileService.getFileUrlToMap(aiIdenLog.getIdenPictureUrl());
		// 视频信息
		List<EbcMonitorVideoLog> logsList = monitorVideoLogManageService
		/*List<EbcMonitorVideoLog> logsList = monitorVideoLogManageService
				.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), aiIdenLog.getResourceToolId())
				.getData();
		EbcMonitorVideoLog ebcMonitorVideoLog = null;
		if (!CollectionUtils.isEmpty(logsList)) {
			ebcMonitorVideoLog = logsList.get(0);
			ebcMonitorVideoLog.setVideoFileUrl(uploadFileService.getFileUrl(ebcMonitorVideoLog.getVideoUrl()));
		}
		}*/
		String videoFileUrl =monitorVideoLogManageService
				.getMonitorVideoLogByPictureTime(pictureMap.get("fileDateTimeStr"), aiIdenLog.getResourceToolId())
				.getData();
		Map<String, Object> resultMap = new HashMap<String, Object>();
		resultMap.put("alarmInfo", aiIdenLogInfoMap);
		resultMap.put("pictureInfo", pictureMap);
		resultMap.put("videoInfo", ebcMonitorVideoLog);
		//resultMap.put("videoInfo", ebcMonitorVideoLog);
		resultMap.put("videoInfo", videoFileUrl);
		return CommonResponse.ok(resultMap);
	}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/EmployeeManagementServiceImpl.java

@@ -106,12 +106,17 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
		resultMap.put("organizationCode", response.getData().getOrganizeCode());
		resultMap.put("organizationName", response.getData().getOrgName());
		resultMap.put("age", response.getData().getAge());
		
		resultMap.put("mainWirelessCall", response.getData().getMainWirelessCall());
		resultMap.put("field1", response.getData().getField1()); // 头像标识
		resultMap.put("field2", response.getData().getField2()); // 审核结果
		resultMap.put("field3", response.getData().getField3()); // 审核意见
		resultMap.put("field4", response.getData().getField4()); // 公司
		if (response.getData().getBirthday()!=null) {
			resultMap.put("birthday", String.valueOf(response.getData().getBirthday().getTime()));
		}
		
		resultMap.put("pictureUrl",
				uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/MonitorVideoLogManageServiceImpl.java

@@ -46,6 +46,7 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
	private SecurityProtectionMinioConfig minioConfig;
	@Override
	@Deprecated
	public CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
			throws Exception {
		CommonRequest<MonitorVideoLog> request = new CommonRequest<MonitorVideoLog>(monitorVideoLogCondition);
@@ -103,38 +104,46 @@ public class MonitorVideoLogManageServiceImpl implements MonitorVideoLogManageSe
	}
	@Override
	public CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
	public CommonResponse<String> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception {
		CommonRequest<Long> request = new CommonRequest<Long>(monitorVideoLogId);
		CommonResponse<MonitorVideoLog> response = monitorSceneQuery.loadMonitorVideoLog(request);
		if (response == null || response.getData() == null) {
			return CommonResponse.fail("504", "监控视频不存在");
		}
		EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(response.getData());
		return CommonResponse.ok(ebcMonitorVideoLog);
		
		//EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(response.getData());
		//return CommonResponse.ok(ebcMonitorVideoLog);
		return queryMonitorVideoLogByTimeForM3u8(response.getData());
	}
	@Override
	public CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,
	public CommonResponse<String> getMonitorVideoLogByPictureTime(String imageTime,
			String resourceToolId) throws Exception {
		Map<String, Object> conditionMap = new HashMap<String, Object>();
		MonitorVideoLog monitorVideoLogCondition = new MonitorVideoLog();
		monitorVideoLogCondition.setResourceToolId(resourceToolId);
		monitorVideoLogCondition.setBeginTime(DateUtil.convertDate(imageTime));
		monitorVideoLogCondition.setEndTime(DateUtil.convertDate(imageTime));
		
		return queryMonitorVideoLogByTimeForM3u8(monitorVideoLogCondition);
		
		
		/*Map<String, Object> conditionMap = new HashMap<String, Object>();
		conditionMap.put("resourceToolId", resourceToolId);
		conditionMap.put("imageTime", imageTime);
		CommonRequest<Map<String, Object>> conditionMapRequest = new CommonRequest<Map<String, Object>>(conditionMap);
		CommonResponse<List<MonitorVideoLog>> response = monitorSceneQuery.selectMonitorVideoLog(conditionMapRequest);
		List<EbcMonitorVideoLog> list = new ArrayList<EbcMonitorVideoLog>();
		
		if (response == null || CollectionUtils.isEmpty(response.getData())) {
			return CommonResponse.ok(list);
			return CommonResponse.ok("");
		}
		
		for (MonitorVideoLog monitorVideoLog : response.getData()) {
			EbcMonitorVideoLog ebcMonitorVideoLog = getEbcMonitorVideoLog(monitorVideoLog);
			list.add(ebcMonitorVideoLog);
		}
		return CommonResponse.ok(list);
		
		return CommonResponse.ok(list);*/
	}
	/**

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AiIdenLogManageService.java

@@ -45,7 +45,7 @@ public interface AiIdenLogManageService {
	CommonResponse<Map<String, Object>> queryOneAiIdenLog(Long aiIdenLogId) throws Exception;
	/**
	 * 查询所有设备最后一个识别记录
	 * 根据场景ID查询最后一条进出记录
	 * @param params
	 * @return
	 * @throws Exception

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/MonitorVideoLogManageService.java

@@ -19,10 +19,16 @@ public interface MonitorVideoLogManageService {
	 * @return
	 * @throws Exception
	 */
	@Deprecated
	CommonResponse<List<EbcMonitorVideoLog>> queryMonitorVideoLogByTime(MonitorVideoLog monitorVideoLogCondition)
			throws Exception;
	/**
	 * 按时间段查询监控视频日志
	 * @param monitorVideoLogCondition
	 * @return
	 * @throws Exception
	 */
	CommonResponse<String> queryMonitorVideoLogByTimeForM3u8(MonitorVideoLog monitorVideoLogCondition) throws Exception;
	/**
@@ -31,7 +37,7 @@ public interface MonitorVideoLogManageService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<EbcMonitorVideoLog> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
	CommonResponse<String> queryMonitorVideoLogById(Long monitorVideoLogId) throws Exception;
	/**
	 * 根据设备图片时间查询视频日志
@@ -40,7 +46,7 @@ public interface MonitorVideoLogManageService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<List<EbcMonitorVideoLog>> getMonitorVideoLogByPictureTime(String imageTime,String resourceToolId) throws Exception;
	CommonResponse<String> getMonitorVideoLogByPictureTime(String imageTime,String resourceToolId) throws Exception;
	
	/**
	 * 创建监控视频日志

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/EbcConstant.java

@@ -75,6 +75,9 @@ public class EbcConstant {
	//AI识别结果：考勤
	public static final String AI_IDENTIFY_RESULT_ATTENDANCE= "ATT";
	
	//AI匹配模型：人脸识别
	public static final String AI_MODEL_FACE="FACE";
	
	//场景关联设备的作用类别：进门识别
	public static final String TERMINAL_EFFECT_TYPE_IN="IN";
	
@@ -93,15 +96,6 @@ public class EbcConstant {
	//审核状态：未生效(未审核通过)
	public static final String AUDIT_STATUS_DIS="3";
	
	//AI匹配模型：着装违规识别
	public static final String AI_MODEL_CLOTHING_CODE="CLOTHING_CODE";
	
	//AI匹配模型：人脸识别
	public static final String AI_MODEL_FACE="FACE";
	
	//AI匹配模型：陌生人识别
	public static final String AI_MODEL_STRANGER="STRANGER";
	
	
	// 当前登录者的STAFF_ID
	public static String USPA_USER_STAFF_ID = "201613310867";