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

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

@@ -83,6 +83,7 @@ s<template>
            <div>抓拍图片</div>
            <div>
              <img :src="rowdata.pictureInfo.fileUrl" alt="" srcset="" style="width:100%;height:100%">
            </div>
          </div>
          <div class="detail_item2">
@@ -90,12 +91,19 @@ s<template>
            <div>
              <div>
                <!-- 修改-->
                <img src="" alt="" srcset="" style="width:120px;height:160px;border-radius: 5px; ">
                <img :src="newimage" alt="" srcset="" style="width:120px;height:160px;border-radius: 5px; ">
                <!-- <div class="scaleimg">
                  <div :style="{backgroundImage:style.bgimg,backgroundPosition:style.bgposition,
                                transform:style.scale,
                                width:style.width,
                                height:style.height}" class="imgcontant"></div>
                </div> -->
                <div class="bottomimg">抓拍图片</div>
              </div>
              <div>
                <!-- 修改-->
                <img src="http://img95.699pic.com/photo/50028/0321.jpg_wh300.jpg" alt="" srcset="">
                <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;">
@@ -167,7 +175,17 @@ export default {
      ],
      // 当前页
      page: 1,
      limit: 10
      limit: 10,
      // style: {
      //   bgimg: '',
      //   bgposition: '',
      //   scale: '',
      //   width: '',
      //   height: ''
      // }
      // 截取后的图片
      newimage: ''
    }
  },
@@ -175,7 +193,6 @@ export default {
  mounted () {
    // this.gettype()
    this.getcompanyTypesList()
    // this.search()
  },
  methods: {
    // 表格中的选择数据
@@ -201,12 +218,43 @@ export default {
      var res = await accessapi.getOneInAndOutRecord({ params: { aiIdenLogId: scope.row.aiIdenLogId } })
      if (res.data.success) {
        this.detail_modal = true
        // 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(res.data.data)
        // console.log('详情数据是', this.rowdata)
        console.log('数据', this.rowdata.alarmInfo)
        // this.rowdata.alarmInfo.newImg = this.rowdata.pictureInfo.fileUrl
        this.getImage()
        // var loadTimer
        // var imgObject = new Image()
        // imgObject.setAttribute('crossOrigin', 'anonymous')
        // imgObject.src = this.rowdata.pictureInfo.fileUrl
        // console.log(this)
        // imgObject.onload = this.onImgLoaded(loadTimer, imgObject, this.rowdata.alarmInfo)
        // console.log(this.rowdata.alarmInfo.newImg)
        // this.style.width = res.data.data.alarmInfo.face_box[2] - res.data.data.alarmInfo.face_box[0] + 'px'
        // // console.log('width是', this.style.width)
        // this.style.height = res.data.data.alarmInfo.face_box[3] - res.data.data.alarmInfo.face_box[1] + 'px'
        // // console.log('height是', this.style.height)
        // this.style.bgimg = 'url(' + res.data.data.pictureInfo.fileUrl + ')'
        // // console.log('bgimg是', this.style.bgimg)
        // this.style.bgposition = '' + -res.data.data.alarmInfo.face_box[0] + 'px ' + -res.data.data.alarmInfo.face_box[1] + 'px'
        // console.log('bgposition是', this.style.bgposition)
        // // transform: scale(0.33, 0.33);
        // var width = res.data.data.alarmInfo.face_box[2] - res.data.data.alarmInfo.face_box[0]
        // var height = res.data.data.alarmInfo.face_box[3] - res.data.data.alarmInfo.face_box[1]
        // var scalex = 120 / width
        // var scaley = 160 / height
        // // console.log(scalex)
        // this.style.scale = 'scale(' + scalex + ',' + scaley + ')'
        // // console.log('scale是', this.style.scale)
        // // console.log(res.data.data)
        // console.log('详情数据是', this.rowdata.alarmInfo)
        this.detail_modal = true
      } else {
        this.$Message.danger('获取数据失败')
      }
@@ -311,7 +359,41 @@ export default {
      } else {
        return true
      }
    },
    async getImage () {
      var loadTimer
      var imgObject = new Image()
      imgObject.setAttribute('crossOrigin', 'anonymous')
      imgObject.src = this.rowdata.pictureInfo.fileUrl
      var e = this.rowdata.alarmInfo
      var that = this
      imgObject.onload = onImgLoaded()
      // eslint-disable-next-line no-return-assign
      function onImgLoaded () {
        if (loadTimer != null) clearTimeout(loadTimer)
        if (!imgObject.complete) {
          loadTimer = setTimeout(() => {
            onImgLoaded()
          }, 3)
        } else {
          that.newimage = getImagePortion(imgObject, e.face_box[2] - e.face_box[0], e.face_box[3] - e.face_box[1], e.face_box[0], e.face_box[1])
        }
      }
      function getImagePortion (imgObj, newWidth, newHeight, startX, startY) {
        var tnCanvas = document.createElement('canvas')
        var tnCanvasContext = tnCanvas.getContext('2d')
        tnCanvas.width = newWidth; tnCanvas.height = newHeight
        var bufferCanvas = document.createElement('canvas')
        var bufferContext = bufferCanvas.getContext('2d')
        bufferCanvas.width = imgObj.width
        bufferCanvas.height = imgObj.height
        bufferContext.drawImage(imgObj, 0, 0)
        tnCanvasContext.drawImage(bufferCanvas, startX, startY, newWidth, newHeight, 0, 0, newWidth, newHeight)
        // console.log(tnCanvas.toDataURL())
        return tnCanvas.toDataURL()
      }
    }
  }
}
</script>
@@ -370,6 +452,7 @@ export default {
      border-radius: 5px;
      overflow: hidden;
      position: relative;
    }
  }
@@ -398,6 +481,21 @@ export default {
      > div:nth-child(1) {
        width: 120px;
        height: 100%;
        .scaleimg {
          width: 120px;
          height: 160px;
          position: relative;
          .imgcontant {
            border-radius: 10px;
            background-repeat: no-repeat;
            background-attachment: local;
            position: absolute;
            top: -160px;
            left: -120px;
          }
        }
      }
      > div:nth-child(2) {
        width: 117.76px;

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

@@ -1,5 +1,5 @@
<template>
  <div class="index">
  <div class="index" style="overflow:hidden">
    <div :style="`background-image: url(${imgBg})`" class="top" >
      <img src="@/assets/images/brand.png" class="top-logo">
    </div>
@@ -40,27 +40,30 @@
          <span class="title-span">重点区域监控</span>
        </div>
        <!--        <video-player ref="videoPlayer" :options="videoOptions" :playsinline="true" class="vjs-custom-skin videoPlayer"></video-player>-->
        <videoPlayer
        <video-player v-if="videoOptions !== {}"
          ref="videoPlayer"
          :options="videoOptions"
          :playsinline="true"
          class="vjs-custom-skin videoPlayer"
        />
        ></video-player>
        <div class="videoPlayers">
          <div v-for="(item,index) in videoOptionsList" class="videoPlayer-sm" @click="videoSwitchover(item)">
          <div v-for="(item,index) in videoOptionsList" class="videoPlayer-sm" @click="videoSwitchover(item,index)">
            <!--            <video-player ref="videoPlayer"-->
            <!--                          :options="item.options"-->
            <!--                          :playsinline="true"-->
            <!--                          :style="`padding: 0 2.5% 2.5% 2%;border-radius: 5px;border: ${1-index}px solid #009bf3;`"-->
            <!--                          class="vjs-custom-skin videoPlayer">-->
            <!--            </video-player>-->
            <videoPlayer
            <video-player
              ref="videoPlayer"
              :options="videoOptions"
              :playsinline="true"
              :style="`padding: 0 2.5% 2.5% 2%;border-radius: 5px;border: ${1-index}px solid #009bf3;`"
              :playsinline="false"
              :events="events"
              :options="item.options"
              :style="`padding: 0 2.5% 2.5% 2%;border-radius: 5px;`"
              :class="{ 'checkedIndex': index == checkedIndex }"
              class="vjs-custom-skin videoPlayer"
            />
              @dblclick="handlefullscreenchange"
            ></video-player>
            <div style="color: white;text-align: center;">{{ item.name }}</div>
          </div>
        </div>
@@ -100,9 +103,13 @@ import dasapi from '@/api/dashboard'
import sysapi from '@/api/system'
import 'video.js/dist/video-js.css'
import 'vue-video-player/src/custom-theme.css'
// import { videoPlayer } from 'vue-video-player'
import 'videojs-flash'
import VideoPlayer from '@/components/VideoPlayer'
import RtmpVideo from '../videoSurveillance/components/rtmpVideoPlay'
import videojs from 'video.js'
window.videojs = videojs
require('video.js/dist/lang/zh-CN.js')
require('video.js/dist/video-js.min.css')
export default {
  filters: {
@@ -137,40 +144,14 @@ export default {
    }
  },
  components: {
    VideoPlayer
    RtmpVideo
  },
  data() {
    return {
      checkedIndex: 0,
      events: ['fullscreenchange'],
      nowDate: new Date(),
      videoOptions: {
        autoplay: true, // 如果true,浏览器准备好时开始回放。
        muted: true, // 默认情况下将会消除任何音频。
        loop: false, // 导致视频一结束就重新开始。
        preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
        language: 'zh-CN',
        aspectRatio: '16:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
        // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
        // 是否流体自适应容器宽高
        fluid: true,
        // // 设置视频播放器的显示宽度（以像素为单位）
        // width: '100px',
        // // 设置视频播放器的显示高度（以像素为单位）
        // height: '400px',
        sources: [{
          withCredentials: false,
          type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
          src: 'http://10.19.90.34:1080/live/01.m3u8' // url地址
        }],
        flash: { hls: { withCredentials: false } },
        html5: { hls: { withCredentials: false } },
        notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
        controlBar: {
          timeDivider: false,
          durationDisplay: false,
          remainingTimeDisplay: false,
          fullscreenToggle: false // 全屏按钮
        }
      },
      videoOptions: {},
      videoOptionsList: [],
      imgBg: imgBg,
      titleImgBg: titleImgBg,
@@ -187,6 +168,9 @@ export default {
    }
  },
  computed: {
    player() {
      return this.$refs.videoPlayer1.player
    }
  },
  mounted () {
    this.initVideo()
@@ -202,57 +186,107 @@ export default {
    }, 10000)
  },
  methods: {
    async createMyButton () {
      this.$nextTick(() => {
        const bars = document.querySelectorAll('.vjs-control-bar')
        let time = document.getElementsByClassName('vjs-current-time vjs-time-control vjs-control')
        let start = document.getElementsByClassName('vjs-play-control vjs-control vjs-button')
        let volume = document.getElementsByClassName('vjs-volume-panel vjs-control vjs-volume-panel-horizontal')
        let text = document.getElementsByClassName('vjs-live-control vjs-control')
        bars.forEach((item, index) => {
          time.forEach(item => {
            item.remove()
          })
          start.forEach(item => {
            item.remove()
          })
          volume.forEach(item => {
            item.remove()
          })
          text.forEach(item => {
            item.remove()
          })
        })
      })
    },
    handlefullscreenchange(val) {
      // 因为我是又封装了一个组件，打印val会有相应所需的属性，全屏状态为：isFullscreen_
      val.isFullscreen_ = !val.isFullscreen_
      // this.$emit('fullscreenchange', val)
    },
    initVideo() {
      sysapi.getTerminalRel(2).then(res => {
        // this.videoOptions = {
        //   live: true,
        //   autoplay: true,
        //   fluid: false,
        //   height: document.documentElement.clientHeight * 0.60,
        //   notSupportedMessage: '暂时无法播放',
        //   controlBar: {
        //     timeDivider: false,
        //     durationDisplay: false,
        //     remainingTimeDisplay: false,
        //     fullscreenToggle: true // 全屏按钮
        //   },
        //   techOrder: ['flash'],
        //   flash: {
        //     hls: { withCredentials: false },
        //     swf: 'static/video-js.swf' // 引入静态文件swf
        //   },
        //   sources: [{ // 流配置，数组形式，会根据兼容顺序自动切换
        //     type: 'rtmp/mp4',
        //     src: res.data.data[0].videoUrl
        //   }]
        // }
        this.videoOptions = {
          autoplay: true, // 如果true,浏览器准备好时开始回放。
          muted: true, // 默认情况下将会消除任何音频。
          loop: false, // 导致视频一结束就重新开始。
          preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
          language: 'zh-CN',
          aspectRatio: '16:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
          // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
          // 是否流体自适应容器宽高
          fluid: true,
          // // 设置视频播放器的显示宽度（以像素为单位）
          // width: '100px',
          // // 设置视频播放器的显示高度（以像素为单位）
          // height: '300px',
          sources: [{
            withCredentials: false,
            type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
            src: res.data.data[0].videoUrl // url地址
          }],
          flash: { hls: { withCredentials: false } },
          html5: { hls: { withCredentials: false } },
          notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
          controlBar: {
            timeDivider: false,
            durationDisplay: false,
            remainingTimeDisplay: false,
            fullscreenToggle: true, // 全屏按钮,
            pictureInPictureToggle: false
          }
        }
        this.videoOptionsList = []
        res.data.data.forEach(e => {
          this.videoOptionsList.push({
            options: {
              live: true,
              autoplay: true,
              fluid: false,
              height: document.documentElement.clientHeight * 0.15,
              notSupportedMessage: '暂时无法播放',
              controls: false,
              techOrder: ['flash'],
              flash: {
                hls: { withCredentials: false },
                swf: 'static/video-js.swf' // 引入静态文件swf
              },
              sources: [{ // 流配置，数组形式，会根据兼容顺序自动切换
                type: 'rtmp/mp4',
                src: e.videoUrl
              }]
              autoplay: true, // 如果true,浏览器准备好时开始回放。
              muted: true, // 默认情况下将会消除任何音频。
              loop: false, // 导致视频一结束就重新开始。
              preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
              language: 'zh-CN',
              aspectRatio: '16:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
              // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
              // 是否流体自适应容器宽高
              fluid: true,
              // // 设置视频播放器的显示宽度（以像素为单位）
              // width: '100px',
              // // 设置视频播放器的显示高度（以像素为单位）
              // height: '400px',
              sources: [{
                withCredentials: false,
                type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
                src: e.videoUrl // url地址
              }],
              flash: { hls: { withCredentials: false } },
              html5: { hls: { withCredentials: false } },
              notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
              controlBar: {
                timeDivider: false,
                durationDisplay: false,
                remainingTimeDisplay: false,
                fullscreenToggle: false // 全屏按钮
              }
            },
            name: e.resourceToolName
          })
          this.createMyButton()
        })
      })
    },
    videoSwitchover(itme) {
    videoSwitchover(itme,index) {
      this.videoOptions.sources = itme.options.sources
      this.checkedIndex = index
    },
    gotoSystem() {
      this.$router.push({name: 'videoSurveillance'})
@@ -297,38 +331,38 @@ export default {
    initRecognition() {
      dasapi.queryHomeLastInAndOutRecord({monitorSceneId: 3}).then(res => {
        var data = res.data.data
        if (data.length > 4){
          data = data.slice(0,4)
        if (data.length > 4) {
          data = data.slice(0, 4)
        }
        data.forEach(e => {
          e.simi = e.simi.split('.')[0] + '%'
          e.newImg = e.idenPictureUrl
          var loadTimer;
          var imgObject = new Image();
          imgObject.setAttribute('crossOrigin', 'anonymous');
          imgObject.src = e.idenPictureUrl;
          imgObject.onLoad = onImgLoaded();
          var loadTimer
          var imgObject = new Image()
          imgObject.setAttribute('crossOrigin', 'anonymous')
          imgObject.src = e.idenPictureUrl
          imgObject.onLoad = onImgLoaded()
          function onImgLoaded() {
            if (loadTimer != null) clearTimeout(loadTimer);
            if (loadTimer != null) clearTimeout(loadTimer)
            if (!imgObject.complete) {
              loadTimer = setTimeout(function() {
                onImgLoaded();
              }, 3);
                onImgLoaded()
              }, 3)
            } else {
              e.newImg = getImagePortion(imgObject, e.face_box[2] - e.face_box[0], e.face_box[3] - e.face_box[1], e.face_box[0], e.face_box[1]);
              e.newImg = getImagePortion(imgObject, e.face_box[2] - e.face_box[0], e.face_box[3] - e.face_box[1], e.face_box[0], e.face_box[1])
            }
          }
          function getImagePortion(imgObj, newWidth, newHeight, startX, startY){
            var tnCanvas = document.createElement('canvas');
            var tnCanvasContext = tnCanvas.getContext('2d');
            tnCanvas.width = newWidth; tnCanvas.height = newHeight;
            var bufferCanvas = document.createElement('canvas');
            var bufferContext = bufferCanvas.getContext('2d');
            bufferCanvas.width = imgObj.width;
            bufferCanvas.height = imgObj.height;
            bufferContext.drawImage(imgObj, 0, 0);
            tnCanvasContext.drawImage(bufferCanvas, startX,startY,newWidth, newHeight,0,0,newWidth,newHeight);
            return tnCanvas.toDataURL();
          function getImagePortion(imgObj, newWidth, newHeight, startX, startY) {
            var tnCanvas = document.createElement('canvas')
            var tnCanvasContext = tnCanvas.getContext('2d')
            tnCanvas.width = newWidth; tnCanvas.height = newHeight
            var bufferCanvas = document.createElement('canvas')
            var bufferContext = bufferCanvas.getContext('2d')
            bufferCanvas.width = imgObj.width
            bufferCanvas.height = imgObj.height
            bufferContext.drawImage(imgObj, 0, 0)
            tnCanvasContext.drawImage(bufferCanvas, startX, startY, newWidth, newHeight, 0, 0, newWidth, newHeight)
            return tnCanvas.toDataURL()
          }
        })
        this.distinguishData = data
@@ -724,5 +758,8 @@ export default {
  .vjs-progress-control{
    visibility:hidden
  }
  .checkedIndex{
    border: 1px solid #009bf3;
  }
}
</style>

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

@@ -15,12 +15,12 @@
    <div class="page-bottom grid-demo">
      <t-col v-for="(item,index) in videoList" :span="viewLayoutSpan" :key="index" :value="item.resourceToolId" style="margin-top:24px">
        <video-player
            :ref="'video'+index"
            :options="videoOptions[index]"
            :playsinline="false"
            :events="events"
            class="vjs-custom-skin videoPlayer"
            @dblclick="handlefullscreenchange"
          :ref="'video'+index"
          :options="videoOptions[index]"
          :playsinline="false"
          :events="events"
          class="vjs-custom-skin videoPlayer"
          @dblclick="handlefullscreenchange"
        ></video-player>
      </t-col>
      <!-- <rtmp-video :list="getVideoPlayList(item)" @goDistinguishRecord="goDistinguishRecord(item.resourceToolId)" @videoReplay="handleReview"></rtmp-video> -->
@@ -95,19 +95,19 @@ export default {
        let start = document.getElementsByClassName('vjs-play-control vjs-control vjs-button')
        let volume = document.getElementsByClassName('vjs-volume-panel vjs-control vjs-volume-panel-horizontal')
        let text = document.getElementsByClassName('vjs-live-control vjs-control')
        time.forEach(item => {
          item.remove()
        })
        start.forEach(item => {
          item.remove()
        })
        volume.forEach(item => {
          item.remove()
        })
        text.forEach(item => {
          item.remove()
        })
        bars.forEach((item, index) => {
          time.forEach(item => {
            item.remove()
          })
          start.forEach(item => {
            item.remove()
          })
          volume.forEach(item => {
            item.remove()
          })
          text.forEach(item => {
            item.remove()
          })
          let txt = document.createElement('span')
          txt.innerHTML = '集控室（人脸识别）'
          txt.style.marginLeft = '12px'
@@ -116,10 +116,9 @@ export default {
          btn.style.cursor = 'pointer'
          btn.style.marginLeft = 'auto'
          btn.className = 'aidicon aidicon-image-outline'
          btn.setAttribute('resourceToolId', item.value)
          btn.setAttribute('title', '识别记录')
          btn.addEventListener('click', () => {
            this.goDistinguishRecord()
          })
          btn.addEventListener('click', this.goDistinguishRecord)
          let btn1 = document.createElement('button')
          btn1.style.color = 'white'
          btn1.style.cursor = 'pointer'
@@ -248,7 +247,8 @@ export default {
      })
    },
    // 进入识别记录界面
    goDistinguishRecord (id) {
    goDistinguishRecord (e) {
      var id = e.target.getAttribute('resourceToolId')
      this.$router.push({ path: '/videoSurveillance/distinguishRecord', query: { videoId: id } })
    },
    // 风场大门分页

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

@@ -44,8 +44,8 @@ public class EmployeeManagementController {
	 */
	@ResponseBody
	@RequestMapping("/queryEmployeeList")
	public CommonResponse<PageBean<Map<String, Object>>> queryEmployeeList(@ModelAttribute AttendanceReport attendanceReport)
			throws Exception {
	public CommonResponse<PageBean<Map<String, Object>>> queryEmployeeList(
			@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
@@ -84,8 +84,17 @@ public class EmployeeManagementController {
	@ResponseBody
	@RequestMapping("/createEmployee")
	public CommonResponse<Void> createEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		if (employeeDto == null || StringUtils.isEmpty(employeeDto.getName())||StringUtils.isEmpty(employeeDto.getOrganizeCode())) {
			return CommonResponse.fail("500", "新增失败");
		if (employeeDto == null) {
			return CommonResponse.fail("500", "员工信息新增失败，参数为空");
		}
		if (StringUtils.isEmpty(employeeDto.getName())) {
			return CommonResponse.fail("500", "员工信息新增失败，项目为空");
		}
		if (StringUtils.isEmpty(employeeDto.getCode())) {
			return CommonResponse.fail("500", "员工信息新增失败，编号为空");
		}
		if (StringUtils.isEmpty(employeeDto.getOrganizeCode())) {
			return CommonResponse.fail("500", "员工信息新增失败，部门为空");
		}
		return employeeManagementService.createEmployee(employeeDto);
@@ -100,8 +109,20 @@ public class EmployeeManagementController {
	@ResponseBody
	@RequestMapping("/modifyEmployee")
	public CommonResponse<Void> modifyEmployee(@RequestBody EmployeeDto employeeDto) throws Exception {
		if (employeeDto == null || employeeDto.getId() == null || StringUtils.isEmpty(employeeDto.getName())) {
			return CommonResponse.fail("500", "修改失败");
		if (employeeDto == null) {
			return CommonResponse.fail("500", "员工信息修改失败，参数为空");
		}
		if (employeeDto.getId() == null) {
			return CommonResponse.fail("500", "员工信息修改失败，主键为空");
		}
		if (StringUtils.isEmpty(employeeDto.getName())) {
			return CommonResponse.fail("500", "员工信息修改失败，项目为空");
		}
		if (StringUtils.isEmpty(employeeDto.getCode())) {
			return CommonResponse.fail("500", "员工信息修改失败，编号为空");
		}
		if (StringUtils.isEmpty(employeeDto.getOrganizeCode())) {
			return CommonResponse.fail("500", "员工信息修改失败，部门为空");
		}
		return employeeManagementService.modifyEmployee(employeeDto);
@@ -132,9 +153,8 @@ public class EmployeeManagementController {
	 */
	@ResponseBody
	@RequestMapping("/uploadEmployeePicture")
	public CommonResponse<Map<String, String>> uploadEmployeePicture(
			@RequestParam(value = "file") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
			throws Exception {
	public CommonResponse<Map<String, String>> uploadEmployeePicture(@RequestParam(value = "file") MultipartFile meFile,
			@RequestParam(required = false) String pictureUrl) throws Exception {
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
			return CommonResponse.fail("500", "上传失败");
		}
@@ -153,11 +173,12 @@ public class EmployeeManagementController {
	@ResponseBody
	@RequestMapping("/auditEmployeePicture")
	public CommonResponse<Void> auditEmployeePicture(@RequestBody EmployeeDto employeeDto) throws Exception {
		if (employeeDto.getId()==null||employeeDto.getId()<0||StringUtils.isEmpty(employeeDto.getField2())) {
		if (employeeDto.getId() == null || employeeDto.getId() < 0 || StringUtils.isEmpty(employeeDto.getField2())) {
			return CommonResponse.fail("500", "审核失败");
		}
		return employeeManagementService.auditEmployeePicture(employeeDto.getId(),employeeDto.getField2(),employeeDto.getField3());
		return employeeManagementService.auditEmployeePicture(employeeDto.getId(), employeeDto.getField2(),
				employeeDto.getField3());
	}
	/**

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

@@ -106,14 +106,20 @@ 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()); // 公司
		resultMap.put("pictureUrl",uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
		if (response.getData().getBirthday()!=null) {
			resultMap.put("birthday", String.valueOf(response.getData().getBirthday().getTime()));
		}
		
		resultMap.put("pictureUrl",
				uploadFileService.getFileUrl(response.getData().getField1(), minioConfig.getBucketHeaderImage()));
		String employeePosition = response.getData().getMainJobPosition();
		resultMap.put("employeePosition", employeePosition);
@@ -128,8 +134,46 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
		return CommonResponse.ok(resultMap);
	}
	/**
	 * 是否存在用户编码
	 * @param code
	 * @param id
	 * @return 
	 * @return true:存在，false:不存在
	 */
	private boolean isExistEmployeeCode(String code, String id) {
		if (StringUtils.isBlank(code)) {
			return false;
		}
		UserDto userDto = new UserDto();
		userDto.setCode(code);
		CommonRequest<UserDto> request = new CommonRequest<UserDto>(userDto);
		CommonResponse<List<Map<String, Object>>> response = userDtoQuery.queryWorkEmployeeByUserCode(request);
		boolean result = false;
		if (!CollectionUtils.isEmpty(response.getData())) {
			if (StringUtils.isNotBlank(id)) {
				for (Map<String, Object> map : response.getData()) {
					if (code.equals(String.valueOf(map.get("code"))) && !id.equals(String.valueOf(map.get("id")))) {
						result = true;
						break;
					}
				}
			} else {
				result = true;
			}
		}
		return result;
	}
	@Override
	public CommonResponse<Void> createEmployee(EmployeeDto employeeDto) throws Exception {
		if (isExistEmployeeCode(employeeDto.getCode(), null)) {
			return CommonResponse.fail("501", "编号已存在");
		}
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
		CommonRequest<EmployeeDto> request = new CommonRequest<EmployeeDto>(employeeDto);
		return employeeService.createWorkEmployee(request);
@@ -137,6 +181,10 @@ public class EmployeeManagementServiceImpl implements EmployeeManagementService
	@Override
	public CommonResponse<Void> modifyEmployee(EmployeeDto employeeDto) {
		if (isExistEmployeeCode(employeeDto.getCode(), String.valueOf(employeeDto.getId()))) {
			return CommonResponse.fail("501", "编号已存在");
		}
		employeeDto.setField2(EbcConstant.AUDIT_STATUS_INI);
		CommonRequest<EmployeeDto> request = CommonRequest.<EmployeeDto>builder().data(employeeDto).build();
		return employeeService.modifyEmployee(request);