s-code"> 
import accessapi from '@/api/access'
129 
import formatDateTime from '@/utils/formatDateTime.js'
130 136
131 137 
export default {
138
132 139 
  data () {
133 140 
    return {
134 141 
      // 进出类型

@ -140,14 +147,19 @@ export default {
140 147 
      // 模态框显示
141 148 
      detail_modal: false,
142 149 
      // 当前行数据
143 
      rowdata: {},
150 
      rowdata: {
151 
        alarmInfo: {},
152 
        pictureInfo: {}
153 
      },
154 
      // 公司列表
155 
      companyTypesList: [],
144 156
145 157 
      // 查询的参数
146 158 
      searchdata: {
147 159
148 
        relateEmployeeNameAsLike: '',
149 
        beginTime: '',
150 
        endTime: ''
160 
        nameAsLike: '',
161 
        beginDay: '',
162 
        endDay: ''
151 163 
      },
152 164 
      // 一页的数据
153 165 
      data: [

@ -162,18 +174,42 @@ export default {
162 174
163 175 
  mounted () {
164 176 
    // this.gettype()
165 
    this.search()
177 
    this.getcompanyTypesList()
178 
    // this.search()
166 179 
  },
167 180 
  methods: {
168 181 
    // 表格中的选择数据
169 182 
    handleSelectionChange (val) {
170 183 
      this.selectdata = val
171 184 
    },
185 
    // 获取公司
186 
    async getcompanyTypesList () {
187 
      var res = await accessapi.getcompanyTypesList()
188 
      // console.log('公司信息是', res)
189 
      if (res.status === 200) {
190 
        this.companyTypesList = res.data.data
191 
        this.search()
192 
      } else {
193 
        this.$Message.danger('获取数据失败')
194 
      }
195 
    },
172 196 
    // 点击详情
173 
    handleClick (scope) {
174 
      this.detail_modal = true
175 
      this.rowdata = scope.row
176 
      console.log(this.rowdata)
197 
    async handleClick (scope) {
198 
      // this.rowdata = scope.row
199 
      // console.log(this.rowdata)
200 
      // console.log('id是', scope.row.aiIdenLogId)
201 
      var res = await accessapi.getOneInAndOutRecord({ params: { aiIdenLogId: scope.row.aiIdenLogId } })
202
203 
      if (res.data.success) {
204 
        this.detail_modal = true
205 
        // this.rowdata = res.data.data
206 
        this.rowdata.pictureInfo = res.data.data.pictureInfo
207 
        this.rowdata.alarmInfo = res.data.data.alarmInfo
208 
        // console.log(res.data.data)
209 
        // console.log('详情数据是', this.rowdata)
210 
      } else {
211 
        this.$Message.danger('获取数据失败')
212 
      }
177 213 
    },
178 214 
    // 分页
179 215 
    onChange (val) {

@ -199,7 +235,7 @@ export default {
199 235 
    // 查询数据
200 236 
    async search () {
201 237 
      // 检验数据
202 
      var flag = this.startreend(this.searchdata.beginTime, this.searchdata.endTime)
238 
      var flag = this.startreend(this.searchdata.beginDay, this.searchdata.endDay)
203 239 
      if (flag) {
204 240 
        // console.log(this.page)
205 241 
        // console.log(this.searchdata)

@ -211,17 +247,45 @@ export default {
211 247 
        var res = await accessapi.getaccesslist({ params: params })
212 248 
        // console.log(res)
213 249 
        if (res.status === 200) {
214 
          console.log(res)
250 
          // console.log(res)
215 251 
          this.data = res.data.data.data
216 
          this.data = this.data.map((item) => { item.taskExecuteTime = formatDateTime(item.taskExecuteTime); return item })
217 
          console.log(this.data)
218 
          this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
252 
          this.data = this.data.map((item) => {
253 
            // 处理进出时间
254 
            // item.taskExecuteTime = formatDateTime(item.taskExecuteTime)
255 
            // 处理相似度
256 
            // item.simi = this.percentagedata(item.simi)
257 
            // console.log('公司的数据是', this.companyTypesList)
258 
            // console.log('公司id', item)
259 
            // console.log('公司名字是', this.companyTypesList.filter((item1) => { return item1.id === 10000 }))
260 
            item.companyinfo = this.companyTypesList.filter((item1) => { return item1.id === item.companyId })
261 
            if (item.companyinfo.length > 0) {
262 
              item.companyname = item.companyinfo[0].name
263 
            } else {
264 
              item.companyname = ''
265 
            }
266
267 
            return item
268 
          })
269
270 
          // this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
271 
          // console.log(this.total)
272 
          this.total = res.data.data.total
273 
          // console.log('数据是', this.data)
219 274 
        }
220 275 
      } else {
221 276 
        this.$Message.danger('开始时间不能在结束时间的后面')
222 277 
      }
223 278 
    },
224 279
280 
    percentagedata (point) {
281 
      if (point === 0) {
282 
        return 0
283 
      }
284 
      var str = Number(point * 100).toFixed(1)
285 
      str += '%'
286 
      return str
287 
    },
288
225 289 
    // 重置数据
226 290 
    reset () {
227 291 
      for (var index in this.searchdata) {

+ 4 - 3
security-protection-platform/src/modules/aialarm/index.vue
Просмотреть файл 

@ -82,7 +82,7 @@
82 82 
    </t-table>
83 83
84 84 
    <!-- 分页 -->
85 
    <t-pager :total="total" :current="page" show-elevator class="pager" @on-change="onChange"></t-pager>
85 
    <t-pager :total="total" :current="page" :page-size="limit" show-elevator class="pager" @on-change="onChange"></t-pager>
86 86
87 87 
    <!-- 模态框-->
88 88 
    <t-modal :visibled.sync="details_modal" :title="clickdetail==0?'报警详情':'报警处理'" width="732px">

@ -390,8 +390,9 @@ export default {
390 390 
          this.data = res.data.data.data
391 391 
          this.data = this.data.map((item) => { item.aiIdenTime = formatDateTime(item.aiIdenTime); return item })
392 392 
          console.log(this.data)
393
394 
          this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
393 
          console.log('数据是', res)
394 
          // this.total = Math.ceil(res.data.data.total / res.data.data.size) * 5
395 
          this.total = res.data.data.total
395 396 
        } else {
396 397 
          this.$Message.danger('数据获取失败')
397 398 
        }

+ 64 - 13
security-protection-platform/src/modules/dashboard/index.vue
Просмотреть файл 

@ -70,17 +70,16 @@
70 70 
          <span class="title-span">人员进出识别</span>
71 71 
        </div>
72 72 
        <div v-for="(item,index) in distinguishData" :style="`background-image: url(${border})`" class="distinguish">
73 
          <div class="distinguish-title"> {{ item.name }} </div>
73 
          <div class="distinguish-title"> {{ item.monitorSceneName }} </div>
74 74 
          <div class="distinguish-row">
75 75 
            <div class="similarity">
76 
              <p style="opacity: 1;font-size: 12px">70%</p>
76 
              <p class="p">{{ item.simi }}</p>
77 77 
            </div>
78 
            <img src="@/assets/images/indexT1.png" class="distinguish-col">
79 
            <img src="@/assets/images/indexT1.png" class="distinguish-col">
78 
            <img :src="item.newImg" alt="" class="distinguish-col">
79 
            <img :src="item.headerImage" class="distinguish-col">
80 80 
            <div style="width: 40%;margin-top: 4%;height: 79%;">
81 
              <div class="distinguish-col-row">王小明(00220)</div>
82 
              <div class="distinguish-col-row">已佩戴口罩</div>
83 
              <div class="distinguish-col-row">2021.01.05 12:11:00</div>
81 
              <div class="distinguish-col-row">{{ item.employeeName }}({{ item.employeeCode }})</div>
82 
              <div class="distinguish-col-row">{{ item.taskExecuteTime }}</div>
84 83 
            </div>
85 84 
          </div>
86 85 
        </div>
 
@ -92,6 +91,7 @@
92 91
93 92 
<script>
94 93 
import imgBg from '@/assets/images/indexTop.png'
94 
import avatar from '@/assets/images/avatar.png'
95 95 
import titleImgBg from '@/assets/images/indexTitle.png'
96 96 
import polygon from '@/assets/images/polygon.png'
97 97 
import border from '@/assets/images/border.png'
 
@ -159,7 +159,7 @@ export default {
159 159 
        sources: [{
160 160 
          withCredentials: false,
161 161 
          type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
162 
          src: 'http://10.19.90.34:1080/live/1.m3u8' // url地址
162 
          src: 'http://10.19.90.34:1080/live/01.m3u8' // url地址
163 163 
        }],
164 164 
        flash: { hls: { withCredentials: false } },
165 165 
        html5: { hls: { withCredentials: false } },
 
@ -174,6 +174,7 @@ export default {
174 174 
      videoOptionsList: [],
175 175 
      imgBg: imgBg,
176 176 
      titleImgBg: titleImgBg,
177 
      avatar: avatar,
177 178 
      polygon: polygon,
178 179 
      border: border,
179 180 
      attendanceData: [],
 
@ -182,10 +183,7 @@ export default {
182 183 
      alarmDataY: [],
183 184 
      topData: [],
184 185 
      topData1: [],
185 
      distinguishData: [{name: '1风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'},
186 
        {name: '2风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'},
187 
        {name: '3风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'},
188 
        {name: '2风场', url: '@/assets/images/indexT1.png', url2: '@/assets/images/indexT1.png'}]
186 
      distinguishData: []
189 187 
    }
190 188 
  },
191 189 
  computed: {
 
@ -195,9 +193,13 @@ export default {
195 193 
    setInterval(() => { // 当前时间
196 194 
      this.nowDate = new Date()
197 195 
    }, 1000)
196 
    this.initRecognition()
198 197 
    this.initAttendance()
199 198 
    this.initAlarm()
200 199 
    this.init24Top()
200 
    setInterval(() => { // 识别记录
201 
      this.initRecognition()
202 
    }, 10000)
201 203 
  },
202 204 
  methods: {
203 205 
    initVideo() {
 
@ -292,6 +294,46 @@ export default {
292 294 
        }
293 295 
      })
294 296 
    },
297 
    initRecognition() {
298 
      dasapi.queryHomeLastInAndOutRecord({monitorSceneId: 3}).then(res => {
299 
        var data = res.data.data
300 
        if (data.length > 4){
301 
          data = data.slice(0,4)
302 
        }
303 
        data.forEach(e => {
304 
          e.simi = e.simi.split('.')[0] + '%'
305 
          e.newImg = e.idenPictureUrl
306 
          var loadTimer;
307 
          var imgObject = new Image();
308 
          imgObject.setAttribute('crossOrigin', 'anonymous');
309 
          imgObject.src = e.idenPictureUrl;
310 
          imgObject.onLoad = onImgLoaded();
311 
          function onImgLoaded() {
312 
            if (loadTimer != null) clearTimeout(loadTimer);
313 
            if (!imgObject.complete) {
314 
              loadTimer = setTimeout(function() {
315 
                onImgLoaded();
316 
              }, 3);
317 
            } else {
318 
              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]);
319 
            }
320 
          }
321 
          function getImagePortion(imgObj, newWidth, newHeight, startX, startY){
322 
            var tnCanvas = document.createElement('canvas');
323 
            var tnCanvasContext = tnCanvas.getContext('2d');
324 
            tnCanvas.width = newWidth; tnCanvas.height = newHeight;
325 
            var bufferCanvas = document.createElement('canvas');
326 
            var bufferContext = bufferCanvas.getContext('2d');
327 
            bufferCanvas.width = imgObj.width;
328 
            bufferCanvas.height = imgObj.height;
329 
            bufferContext.drawImage(imgObj, 0, 0);
330 
            tnCanvasContext.drawImage(bufferCanvas, startX,startY,newWidth, newHeight,0,0,newWidth,newHeight);
331 
            return tnCanvas.toDataURL();
332 
          }
333 
        })
334 
        this.distinguishData = data
335 
      })
336 
    },
295 337 
    initAttendanceData() {
296 338 
      var dom = document.getElementById('doughnut')
297 339 
      var myChart = echarts.init(dom)
 
@ -602,6 +644,14 @@ export default {
602 644 
            opacity: 0.5;
603 645 
            border-radius: 50%;
604 646 
            padding-top: 1%;
647 
            filter:alpha(opacity=50); /*支持IE */
648 
            -moz-opacity:0.5; /*支持FF */
649 
            //opacity:0.5;
650 
            .p{
651 
              position:relative;
652 
              color: #00d8f3;
653 
              font-size: 10px
654 
            }
605 655 
          }
606 656 
          .distinguish-col{
607 657 
            width: 27%;
 
@ -610,7 +660,8 @@ export default {
610 660 
          }
611 661 
          .distinguish-col-row{
612 662 
            padding-left: 5%;
613 
            height: 30%;
663 
            padding-top: 5%;
664 
            height: 40%;
614 665 
            width: 130%;
615 666 
            color: white;
616 667 
            font-size: 14px;

+ 223 - 40
security-protection-platform/src/modules/usermana/components/modal/addUser.vue
Просмотреть файл 

@ -1,9 +1,9 @@
1 1 
<template>
2 
  <t-modal :visibled.sync="visibled" :mask-closable="false">
2 
  <t-modal :visibled.sync="isVisibled" :mask-closable="false">
3 3 
    <template slot="header">
4 4 
      <div class="device-modal-title">{{ isEdit?'用户编辑':'新增用户' }}</div>
5 5 
    </template>
6 
    <t-form :model="addUserModal" :rules="addUserModalRules" label-position="right">
6 
    <t-form ref="addUserModal" :model="addUserModal" :rules="addUserModalRules" label-position="right">
7 7 
      <t-form-item label="姓名：" prop="name">
8 8 
        <t-input v-model="addUserModal.name" placeholder="请输入姓名"></t-input>
9 9 
      </t-form-item>
 
@ -16,11 +16,11 @@
16 16 
        </t-select>
17 17 
      </t-form-item>
18 18 
      <t-form-item v-if="addUserModal.apartments!==''" label="部门：" prop="organizeCode">
19 
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" width="200px" node-key="id"></t-select-tree>
19 
        <t-select-tree v-model="addUserModal.organizeCode" :node-data="departmentTypesList" node-key="id"></t-select-tree>
20 20 
      </t-form-item>
21 21 
      <t-form-item label="职务：" prop="mainJobPosition">
22 22 
        <t-select v-model="addUserModal.mainJobPosition" placeholder="请选择职务" clearable>
23 
          <t-option v-for="(item,index) in dataList" :value="item.value" :key="index">{{ item.name }}</t-option>
23 
          <t-option v-for="(item,index) in jobPoisitonList" :value="item.code" :key="index">{{ item.value }}</t-option>
24 24 
        </t-select>
25 25 
      </t-form-item>
26 26 
      <t-form-item label="年龄：" prop="birthday">
 
@ -30,18 +30,37 @@
30 30 
        <t-input v-model="addUserModal.mainWirelessCall" placeholder="请输入11位手机号"></t-input>
31 31 
      </t-form-item>
32 32 
      <t-form-item label="人脸图片：" prop="facePicture">
33 
        <t-input v-model="addUserModal.facePicture" placeholder="请输入手机号"></t-input>
33 
        <t-upload
34 
          ref="uploader"
35 
          :show-uploaded="true"
36 
          :allowed-ext="['jpg','jpeg','png']"
37 
          :max-size="2048"
38 
          :before-upload="$_onUploadBeforeUpload"
39 
          :data="{picture:'11d'}"
40 
          multiple
41 
          style="width:120px;height:160px;background-color:#FFFFFF;"
42 
          type="drag"
43 
          action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
44 
          class="demo-upload-list"
45 
        >
46 
          <div class="picture-upload">
47 
            <t-icon class="upload-icon" icon="plus-outline"></t-icon>
48 
            <span style="color:rgba(0, 0, 0, 0.45)">上传照片</span>
49 
          </div>
50 
        </t-upload>
51 
        <span style="color:rgba(0, 0, 0, 0.45);font-size:12px">照片格式：jpg、png或bmp文件，且不超过2M</span>
34 52 
      </t-form-item>
35 53 
    </t-form>
36 54 
    <template slot="footer">
37 55 
      <t-button @click="resetModalData">取消</t-button>
38 56 
      <t-button v-if="isEdit" :loading="loadingSubmit" color="primary" @click="submitModalData">修改</t-button>
39 
      <t-button v-else :loading="loadingSubmit" color="primary" @click="submitModalData">提交</t-button>
57 
      <t-button v-else color="primary" @click="submitModalData">提交</t-button>
40 58 
    </template>
41 59 
  </t-modal>
42 60 
</template>
43 61
44 62 
<script>
63 
import sysapi from '@/api/usermana'
45 64 
export default {
46 65 
  props: {
47 66 
    visible: {
 
@ -52,31 +71,27 @@ export default {
52 71 
    companyList: {
53 72 
      type: Array,
54 73 
      default: () => []
55 
    },
56 
    // 公司对应部门列表
57 
    departmentTypesList: {
58 
      type: Array,
59 
      default: () => []
60 74 
    }
61 75 
  },
62 76 
  data() {
77 
    // 手机号验证
78 
    // const VALIDATEPASSCHECK = (rule, value, callback) => {
79 
    //   if (value === '') {
80 
    //     callback(new Error('请输入11位手机号'))
81 
    //   } else if (value.length > 0 & value.length !== 11) {
82 
    //     callback(new Error('手机号格式不正确'))
83 
    //   } else {
84 
    //     callback()
85 
    //   }
86 
    // }
63 87 
    return {
64 88 
      // 是否为编辑状态
65 89 
      isEdit: false,
66 
      dataList: [
67 
        {
68 
          name: '数据一',
69 
          value: 1
70 
        },
71 
        {
72 
          name: '数据二',
73 
          value: 2
74 
        },
75 
        {
76 
          name: '数据三',
77 
          value: 3
78 
        }
79 
      ],
90 
      // 部门列表
91 
      departmentTypesList: [],
92 
      // 职务列表
93 
      uploadList: [],
94 
      jobPoisitonList: [],
80 95 
      // 新增用户表单
81 96 
      addUserModal: {
82 97 
        name: '',
 
@ -86,7 +101,7 @@ export default {
86 101 
        mainJobPosition: '',
87 102 
        birthday: '',
88 103 
        mainWirelessCall: '',
89 
        facePicture: ''
104 
        facePicture: '123'
90 105 
      },
91 106 
      // 新增用户表单规则
92 107 
      addUserModalRules: {
 
@ -96,7 +111,7 @@ export default {
96 111 
        code: [
97 112 
          { required: true, message: '员工编号不能为空', trigger: 'blur' }
98 113 
        ],
99 
        field4: [
114 
        apartments: [
100 115 
          { required: true, message: '公司不能为空' }
101 116 
        ],
102 117 
        organizeCode: [
 
@ -109,7 +124,7 @@ export default {
109 124 
          { required: true, message: '年龄不能为空', trigger: 'blur' }
110 125 
        ],
111 126 
        mainWirelessCall: [
112 
          { required: true, message: '手机不能为空', trigger: 'blur' }
127 
          { required: true, message: '请输入11位手机号', trigger: 'blur' }
113 128 
        ],
114 129 
        facePicture: [
115 130 
          { required: true, message: '图片不能为空', trigger: 'blur' }
 
@ -118,33 +133,201 @@ export default {
118 133 
    }
119 134 
  },
120 135 
  computed: {
121 
    // 显示/隐藏对话框
122 
    visibled: {
123 
      set(val) {
124 
        this.$emit('visibled', val)
136 
    isVisibled: {
137 
      set (val) {
138 
        this.$emit('update:visible', val)
125 139 
      },
126 
      get() {
140 
      get () {
141 
        this.getJobPositionList()
127 142 
        return this.visible
128 143 
      }
129 144 
    }
130 145 
  },
146 
  watch: {
147 
    'addUserModal.apartments' (val) {
148 
      // 重置部门回显
149 
      this.addUserModal.organizeCode = ''
150 
      // 查询部门列表
151 
      this.queryCycleChildOrg(val)
152 
    }
153 
  },
154 
  mounted() {
155 
    this.getJobPositionList()
156 
  },
131 157 
  methods: {
132 158 
    // 确认新增用户
133 159 
    submitModalData() {
134 
      this.visible = false
135 
      console.log(this.visibled)
136 
      console.log(this.visible);
160 
      this.$refs['addUserModal'].validate((valid) => {
161 
        if (valid) {
162 
          this.isVisibled = false
163 
          let obj = {
164 
            name: this.addUserModal.name, // 员工姓名
165 
            code: this.addUserModal.code, // 员工编号
166 
            organizeCode: this.addUserModal.organizeCode, // 部门CODE
167 
            mainWirelessCall: this.addUserModal.mainWirelessCall, // 手机号码
168 
            mainJobPosition: this.addUserModal.mainJobPosition, // 职务
169 
            field1: this.addUserModal.facePicture, // 照片标识
170 
            field4: this.addUserModal.apartments, // 公司ID
171 
            birthday: Math.round(new Date() / 1000) // 生日(时间戳)
172 
          }
173 
          sysapi.creteEmployee({params: obj}).then(res => {
174 
            console.log(res)
175 
            if (res.data.success === true) {
176 
              this.$Message.success('新增成功')
177 
            } else {
178 
              console.log(res.data.fail.message)
179 
              this.$Message.success(res.data.fail.message)
180 
            }
181 
          })
182 
        }
183 
      })
137 184 
    },
138 185 
    // 重置表单数据
139 186 
    resetModalData () {
140 
      // this.$refs['activityForm'].resetFields()
187 
      this.$refs['addUserModal'].resetFields()
141 188 
      this.imgUrl = ''
142 
      this.visibled = false
189 
      this.isVisibled = false
190 
    },
191 
    // 查询职务列表
192 
    async getJobPositionList() {
193 
      const res = await sysapi.getJobPositionList()
194 
      if (res.status === 200) {
195 
        this.jobPoisitonList = res.data.data
196 
      } else {
197 
        this.$Message.danger('职务类型列表数据获取失败！')
198 
      }
199 
    },
200 
    // 查询部门列表
201 
    async queryCycleChildOrg (id) {
202 
      const res = await sysapi.queryCycleChildOrg(id)
203 
      if (res.status === 200) {
204 
        const data = []
205 
        // 递归 实现tree组件所需部门数据结构
206 
        this.nextDepartment(res.data, data)
207 
        // 深拷贝data
208 
        const data1 = JSON.parse(JSON.stringify(data))
209 
        // 用部门id映射关系代替code与parentCode父子映射关系
210 
        data.forEach(item => {
211 
          // 删除pid为"-1"的的pid属性，否则tree渲染的时候没有根节点渲染不出来
212 
          if (item.pid === '-1') {
213 
            delete item.pid
214 
          }
215 
          item.id = item.orgId
216 
          data1.some((item1) => {
217 
            if (item.pid === item1.id) {
218 
              item.pid = item1.orgId
219 
            } else {
220 
              return false
221 
            }
222 
          })
223 
        })
224 
        // eslint-disable-next-line no-return-assign
225 
        this.departmentTypesList = data.filter(item => item.data = item.id)
226 
      } else {
227 
        this.$Message.danger('部门类型列表数据获取失败！')
228 
      }
229 
    },
230 
    startPickerDateChange() {
231 
    },
232 
    // 如果部门还有下级 递归
233 
    nextDepartment (data, arr) {
234 
      if (data.length > 0) {
235 
        data.forEach(item => {
236 
          arr.push({
237 
            orgId: item.id + '',
238 
            id: item.code,
239 
            label: item.name,
240 
            pid: item.parentCode
241 
          })
242 
          this.nextDepartment(item.departments, arr)
243 
        })
244 
      }
245 
    },
246 
    $_onDeleteIconClick (file) {
247 
      this.$refs.uploader.removeFile(file)
248 
    },
249 
    $_onUploadRemoveFlie (file, fileList) {
250 
      this.uploadList = fileList
251 
    },
252 
    $_onUploadPreviewFlie (file) {
253 
      console.log(file)
254 
    },
255 
    $_onUploadProgress (e, file) {
256 
      console.log(e)
257 
      console.log(file)
258 
    },
259 
    $_onUploadSuccess (res, file) {
260 
      this.imgUrl = res.data.data.toolPictureUrl
261 
      this.addDeviceModalForm.pictureUrl = res.data.data.pictureUrl
262 
      // 因为演示用的上传服务器返回数据格式的原因，这里模拟添加 url
263 
      console.log(file)
264 
      this.uploadList.push(file)
265 
    },
266 
    $_onUploadRemoveFile () { },
267 
    $_onUploadExceededSize () { },
268 
    $_onUploadError (errMsg, response, file) {
269 
      console.log(file)
270 
      console.log(errMsg.message)
271 
      this.$Notice.warning({
272 
        title: `文件${file.name}上传失败`,
273 
        desc:
274 
          '原因：' + errMsg
275 
      })
276 
    },
277 
    $_onUploadFileExtError (file, files) {
278 
      this.$Notice.warning({
279 
        title: '文件格式不正确',
280 
        desc:
281 
          '文件 ' + file.name + ' 格式不正确，请上传 jpg 或 png 格式的图片。'
282 
      })
283 
      console.log(files)
284 
    },
285 
    $_onUploadFileExceededSize (file) {
286 
      this.$Notice.warning({
287 
        title: '超出文件大小限制',
288 
        desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
289 
      })
290 
    },
291 
    $_onUploadFormatError () { },
292 
    $_onUploadBeforeUpload () {
293 
      const check = this.uploadList.length < 5
294 
      if (!check) {
295 
        this.$Notice.warning({
296 
          title: '最多只能上传 5 张图片。'
297 
        })
298 
      }
299 
      return check
143 300 
    }
144 301 
  }
145 302 
}
146 303 
</script>
147 304
148 
<style>
149
305 
<style lang="scss" scoped>
306 
.demo-upload-list{
307 
  .upload--drag{
308 
  background-color:#FFFFFF
309 
}
310 
}
311 
.picture-upload{
312 
  display:flex;
313 
  flex-direction:column;
314 
  width:100%;
315 
  height: 100%;
316 
  justify-content: center;
317 
  .upload-icon{
318 
    align-items:center;
319 
    justify-content:center;
320 
    color:white;
321 
    display: flex;
322 
  }
323 
  .aidicon.aidicon-plus-outline:before{
324 
    width: 32px;
325 
    height: 32px;
326 
    display: flex;
327 
    justify-content: center;
328 
    align-items: center;
329 
    background-color: #D0D0D0;
330 
    border-radius:45px;
331 
  }
332 
}
150 333 
</style>

+ 1 - 2
security-protection-platform/src/modules/usermana/index.vue
Просмотреть файл 

@ -64,7 +64,7 @@
64 64 
        </t-pager>
65 65 
      </div>
66 66 
    </t-card>
67 
    <add-user-modal :department-types-list="departmentTypesList" :company-list="companyTypesList" :visible.sync="addDeviceModal"></add-user-modal>
67 
    <add-user-modal :company-list="companyTypesList" :visible.sync="addDeviceModal"></add-user-modal>
68 68 
    <auditModal :auditshow.sync="auditshow" :auditid="auditid" :company-name="companyName" @refeshUserList="getUserList"></auditModal>
69 69 
  </div>
70 70 
</template>
 
@ -306,7 +306,6 @@ export default {
306 306 
    // 显示新增设备对话框
307 307 
    showAddDeviceModal () {
308 308 
      this.addDeviceModal = true
309 
      console.log(this.addDeviceModal)
310 309 
    },
311 310 
    async editDeviceData (id) {
312 311 
      const res = await sysapi.getDeviceInfo(id)

+ 154 - 81
security-protection-platform/src/modules/videoSurveillance/index.vue
Просмотреть файл 

@ -11,18 +11,21 @@
11 11 
        <t-option v-for="(item,index) in organizationList" :key="index" :value="item.id">{{ item.name }}</t-option>
12 12 
      </t-select>
13 13 
    </div>
14 
    <div class="page-bottom">
15 
      <div v-for="(item,index) in videoList" :key="index" :value="item.resourceToolId" style="width:400px;margin:24px 0px 0 24px;">
16 
        <videoPlayer
17 
          ref="videoPlayer"
18 
          :options="videoOptions"
19 
          :playsinline="true"
20 
          class="vjs-custom-skin videoPlayer"
21 
        />
22 
        <!-- <rtmp-video :list="getVideoPlayList(item)" @goDistinguishRecord="goDistinguishRecord(item.resourceToolId)" @videoReplay="handleReview"></rtmp-video> -->
23 
      </div>
14
15 
    <div class="page-bottom grid-demo">
16 
      <t-col v-for="(item,index) in videoList" :span="viewLayoutSpan" :key="index" :value="item.resourceToolId" style="margin-top:24px">
17 
        <video-player
18 
            :ref="'video'+index"
19 
            :options="videoOptions[index]"
20 
            :playsinline="false"
21 
            :events="events"
22 
            class="vjs-custom-skin videoPlayer"
23 
            @dblclick="handlefullscreenchange"
24 
        ></video-player>
25 
      </t-col>
26 
      <!-- <rtmp-video :list="getVideoPlayList(item)" @goDistinguishRecord="goDistinguishRecord(item.resourceToolId)" @videoReplay="handleReview"></rtmp-video> -->
24 27 
    </div>
25 
    <t-pager :page-size="videoPageSize" :current="videoCurrent" :total="videoTotal" :sizer-range="[ 5, 10, 20, 30 ]" class="pager" show-elevator @on-change="onChangeGate"></t-pager>
28 
    <t-pager :page-size="videoPageSize" :current="videoCurrent" :total="videoTotal" :sizer-range="[ 1, 4, 9, 16 ]" class="pager" show-elevator @on-change="onChangeGate"></t-pager>
26 29 
    <replay-dialog :list="replayList" :visibled.sync="showReplayDialog" @get-list="queryMonitorVideoLog" />
27 30 
  </div>
28 31 
</template>
 
@ -30,18 +33,15 @@
30 33 
import sysapi from '@/api/videoSurveillance'
31 34 
import RtmpVideo from './components/rtmpVideoPlay'
32 35 
import ReplayDialog from './components/ReplayDialog'
33 
import VideoPlayer from '@/components/VideoPlayer'
34 36 
import formatDateTime from '@/utils/formatDateTime.js'
35 37 
import videojs from 'video.js'
36 38 
window.videojs = videojs
37 39
38 
require('videojs-flash')
39 
require('videojs-playlist')
40 40 
require('video.js/dist/lang/zh-CN.js')
41 41 
require('video.js/dist/video-js.min.css')
42 42
43 43 
export default {
44 
  components: { ReplayDialog, VideoPlayer, RtmpVideo },
44 
  components: { ReplayDialog, RtmpVideo },
45 45 
  filters: {
46 46 
    handleText (value) {
47 47 
      if (!value) return ''
 
@ -53,36 +53,9 @@ export default {
53 53 
  },
54 54 
  data () {
55 55 
    return {
56 
      videoOptions: {
57 
        autoplay: true, // 如果true,浏览器准备好时开始回放。
58 
        muted: true, // 默认情况下将会消除任何音频。
59 
        loop: false, // 导致视频一结束就重新开始。
60 
        preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
61 
        language: 'zh-CN',
62 
        aspectRatio: '13:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
63 
        // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
64 
        // 是否流体自适应容器宽高
65 
        fluid: true,
66 
        // // 设置视频播放器的显示宽度（以像素为单位）
67 
        // width: '100px',
68 
        // // 设置视频播放器的显示高度（以像素为单位）
69 
        // height: '300px',
70 
        sources: [{
71 
          withCredentials: false,
72 
          type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
73 
          src: 'http://10.19.90.34:1080/live/1.m3u8' // url地址
74 
        }],
75 
        flash: { hls: { withCredentials: false } },
76 
        html5: { hls: { withCredentials: false } },
77 
        notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
78 
        controlBar: {
79 
          timeDivider: false,
80 
          // durationDisplay: true,
81 
          remainingTimeDisplay: false,
82 
          fullscreenToggle: true, // 全屏按钮,
83 
          pictureInPictureToggle: false
84 
        }
85 
      },
56 
      viewLayoutSpan: 3,
57 
      events: ['fullscreenchange'],
58 
      videoOptions: [],
86 59 
      videoCurrent: 1, // 大门分页数据
87 60 
      videoPageSize: 10, // 大门分页数据
88 61 
      videoTotal: 0, // 大门分页总数
 
@ -105,16 +78,61 @@ export default {
105 78 
      // endDay: '2020-12-19 20:14:00'
106 79 
    }
107 80 
  },
81 
  computed: {
82 
    player() {
83 
      return this.$refs.videoPlayer1.player
84 
    }
85 
  },
108 86 
  mounted () {
109 87 
    this.getWindFiledList() // 获取风场列表
110 88 
  },
111 89 
  methods: {
112 
    getVideoPlayList (item) {
113 
      return [{
114 
        fileId: item.videoUrl,
115 
        fileType: 'rtmp/flv',
116 
        id: item.resourceToolId
117 
      }]
90 
    // 修改视频组件控制栏的元素以及样式
91 
    async createMyButton () {
92 
      this.$nextTick(() => {
93 
        const bars = document.querySelectorAll('.vjs-control-bar')
94 
        let time = document.getElementsByClassName('vjs-current-time vjs-time-control vjs-control')
95 
        let start = document.getElementsByClassName('vjs-play-control vjs-control vjs-button')
96 
        let volume = document.getElementsByClassName('vjs-volume-panel vjs-control vjs-volume-panel-horizontal')
97 
        let text = document.getElementsByClassName('vjs-live-control vjs-control')
98 
        bars.forEach((item, index) => {
99 
          time.forEach(item => {
100 
            item.remove()
101 
          })
102 
          start.forEach(item => {
103 
            item.remove()
104 
          })
105 
          volume.forEach(item => {
106 
            item.remove()
107 
          })
108 
          text.forEach(item => {
109 
            item.remove()
110 
          })
111 
          let txt = document.createElement('span')
112 
          txt.innerHTML = '集控室（人脸识别）'
113 
          txt.style.marginLeft = '12px'
114 
          let btn = document.createElement('button')
115 
          btn.style.color = 'white'
116 
          btn.style.cursor = 'pointer'
117 
          btn.style.marginLeft = 'auto'
118 
          btn.className = 'aidicon aidicon-image-outline'
119 
          btn.setAttribute('title', '识别记录')
120 
          btn.addEventListener('click', () => {
121 
            this.goDistinguishRecord()
122 
          })
123 
          let btn1 = document.createElement('button')
124 
          btn1.style.color = 'white'
125 
          btn1.style.cursor = 'pointer'
126 
          btn1.className = 'aidicon aidicon-piechart-outline'
127 
          btn1.setAttribute('title', '视频回放')
128 
          btn1.addEventListener('click', () => {
129 
            this.handleReview(this.videoList[index].id)
130 
          })
131 
          item.appendChild(txt)
132 
          item.appendChild(btn)
133 
          item.appendChild(btn1)
134 
        })
135 
      })
118 136 
    },
119 137 
    // 获取场景列表
120 138 
    getSceneList () {
 
@ -124,6 +142,19 @@ export default {
124 142 
        if (element.id === this.gateFieldData) {
125 143 
          sysapi.getMonitorScene(this.organizationList[index].id).then((resp) => {
126 144 
            this.sceneList = resp.data.data || []
145 
            if (resp.data.data[0].monitorViewLayout === '1X1') {
146 
              this.viewLayoutSpan = 10
147 
              this.videoPageSize = 1
148 
            } else if (resp.data.data[0].monitorViewLayout === '2X2') {
149 
              this.viewLayoutSpan = 6
150 
              this.videoPageSize = 4
151 
            } else if (resp.data.data[0].monitorViewLayout === '3X3') {
152 
              this.viewLayoutSpan = 4
153 
              this.videoPageSize = 9
154 
            } else if (resp.data.data[0].monitorViewLayout === '4X4') {
155 
              this.viewLayoutSpan = 3
156 
              this.videoPageSize = 16
157 
            }
127 158 
            this.tabClick(this.sceneList[0].monitorSceneId)
128 159 
          })
129 160 
        }
 
@ -170,15 +201,51 @@ export default {
170 201 
        console.log(err)
171 202 
      })
172 203 
    },
204 
    handlefullscreenchange(val) {
205 
      // 因为我是又封装了一个组件，打印val会有相应所需的属性，全屏状态为：isFullscreen_
206 
      val.isFullscreen_ = !val.isFullscreen_
207 
      // this.$emit('fullscreenchange', val)
208 
    },
173 209 
    // 获得风场大门数据
174 210 
    getVideoSurveillanceData () {
175 211 
      var id = this.tabId
176 212 
      this.paramsObj.page = this.videoCurrent
177 
      sysapi.getVideoSurveillanceDataForPage({ params: { monitorSceneId: id, pageNumber: this.videoCurrent, pageSize: this.videoPageSize} })
178 
      .then(res => {
179 
        debugger
180 
        this.videoList = res.data.data.data
181 
        this.videoTotal = res.data.data.total
213 
      sysapi.getVideoSurveillanceData({ params: { monitorSceneId: id } }).then(res => {
214 
        this.videoList = res.data.data
215 
        for (let i in res.data.data) {
216 
          let obj = {
217 
            autoplay: true, // 如果true,浏览器准备好时开始回放。
218 
            muted: true, // 默认情况下将会消除任何音频。
219 
            loop: false, // 导致视频一结束就重新开始。
220 
            preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
221 
            language: 'zh-CN',
222 
            aspectRatio: '13:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
223 
            // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
224 
            // 是否流体自适应容器宽高
225 
            fluid: true,
226 
            // // 设置视频播放器的显示宽度（以像素为单位）
227 
            // width: '100px',
228 
            // // 设置视频播放器的显示高度（以像素为单位）
229 
            // height: '300px',
230 
            sources: [{
231 
              withCredentials: false,
232 
              type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
233 
              src: res.data.data[i].videoUrl // url地址
234 
            }],
235 
            flash: { hls: { withCredentials: false } },
236 
            html5: { hls: { withCredentials: false } },
237 
            notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
238 
            controlBar: {
239 
              timeDivider: false,
240 
              durationDisplay: false,
241 
              remainingTimeDisplay: false,
242 
              fullscreenToggle: true, // 全屏按钮,
243 
              pictureInPictureToggle: false
244 
            }
245 
          }
246 
          this.videoOptions.push(obj)
247 
        }
248 
        this.createMyButton()
182 249 
      })
183 250 
    },
184 251 
    // 进入识别记录界面
 
@ -247,37 +314,43 @@ export default {
247 314 
      }
248 315 
    }
249 316 
  }
250 
  .pager {
317 
.pager {
251 318 
    margin-right: auto;
252 319 
    margin: 21px 0px 24px 0;
253 320 
    float: right;
254 321 
  }
255 
  .btn-primary,
256 
  .radio-group-button .form-radio:checked,
257 
  .radio-group-button .form-radio[checked] {
258 
    color: #0089d4;
259 
    background-color: #fff;
260 
    border: 1px solid #0089d4;
261 
  }
262 
  .btn-secondary,
263 
  .radio-group-button .form-radio,
264 
  .checkbox-group--button .form-checkbox .form-checkbox__inner,
265 
  .btn-dashed-secondary,
266 
  .btn-outline-secondary {
267 
    background: none;
268 
  }
269 
  .video-js .vjs-control:focus, .video-js .vjs-control:focus:before, .video-js .vjs-control:hover:before{
270 
    color:#0089d4;
271 
    text-shadow: none;
272 
  }
273 
  .vjs-control-bar{
274 
    justify-content: flex-end;
275 
  }
276 
  .video-js .vjs-control{
322 
.vjs-custom-skin > .video-js .vjs-control-bar .vjs-fullscreen-control{
323 
  height:38px !important;
324 
}
325 
.video-js .vjs-control{
277 326 
    cursor: pointer;
327 
    width: 28px;
328 
    margin-right:12px;
278 329 
  }
279 
.video-js .vjs-fullscreen-control{
280 
  order:2;
330 
.vjs-control-bar{
331 
    display: flex;
332 
    justify-content: center;
333 
    align-items: center;
334 
}
335 
.video-js button{
336 
  font-size:16px;
337 
}
338 
.aidicon-image-outline:hover{
339 
  color: #0089d4 !important;
340 
}
341 
.aidicon-piechart-outline:hover{
342 
  color: #0089d4 !important;
343 
}
344 
.vjs-icon-placeholder:hover{
345 
  color: #0089d4 !important;
346 
}.vjs-icon-placeholder{
347 
  font-size: 13px;
348 
  display: flex;
349 
  justify-content: center;
350 
  align-items: center;
351 
}
352 
.vjs-tech {
353 
  pointer-events: none;
281 354 
}
282 355 
}
283 356 
</style>

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/EmployeeManagementController.java
Просмотреть файл 

@ -133,7 +133,7 @@ public class EmployeeManagementController {
133 133 
	@ResponseBody
134 134 
	@RequestMapping("/uploadEmployeePicture")
135 135 
	public CommonResponse<Map<String, String>> uploadEmployeePicture(
136 
			@RequestParam(value = "picture") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
136 
			@RequestParam(value = "file") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
137 137 
			throws Exception {
138 138 
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
139 139 
			return CommonResponse.fail("500", "上传失败");

+ 16 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/InAndOutRecordController.java
Просмотреть файл 

@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
19 19 
import org.springframework.web.bind.annotation.ResponseBody;
20 20
21 21 
import java.util.HashMap;
22 
import java.util.List;
22 23 
import java.util.Map;
23 24
24 25 
/**
 
@ -72,5 +73,19 @@ public class InAndOutRecordController {
72 73
73 74 
		return aiIdenLogManageService.queryOneAiIdenLog(aiIdenLogId);
74 75 
	}
75
76
77 
	/**
78 
	 * 首页查询进出记录
79 
	 * @return
80 
	 * @throws Exception
81 
	 */
82 
	@ResponseBody
83 
	@RequestMapping("/queryHomeLastInAndOutRecord")
84 
	public CommonResponse<List<Map<String, Object>>> queryHomeLastInAndOutRecord(@RequestParam String monitorSceneId) throws Exception {
85 
		Map<String, String> params=new HashMap<String, String>();
86 
		params.put("sceneId", monitorSceneId);
87 
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
88
89 
		return aiIdenLogManageService.selectLastAiIdenLog(params);
90 
	}
76 91 
}

+ 2 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/ResourceToolManageController.java
Просмотреть файл 

@ -154,7 +154,7 @@ public class ResourceToolManageController {
154 154 
	@ResponseBody
155 155 
	@RequestMapping("/uploadResourceToolPicture")
156 156 
	public CommonResponse<Map<String, String>> uploadResourceToolPicture(
157 
			@RequestParam(value = "picture") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
157 
			@RequestParam(value = "file") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
158 158 
			throws Exception {
159 159 
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
160 160 
			return CommonResponse.fail("500", "上传失败");
 
@ -166,7 +166,7 @@ public class ResourceToolManageController {
166 166 
	}
167 167
168 168 
	/**
169 
	 * 根据设备CODE获取场景、AI任务等相关信息
169 
	 * 根据设备CODE获取AI任务等相关信息
170 170 
	 * @param meFile
171 171 
	 * @return
172 172 
	 * @throws Exception

+ 122 - 12
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiIdenLogManageServiceImpl.java
Просмотреть файл 

@ -1,5 +1,6 @@
1 1 
package com.ai.bss.security.protection.service.impl;
2 2
3 
import java.math.BigDecimal;
3 4 
import java.util.ArrayList;
4 5 
import java.util.HashMap;
5 6 
import java.util.List;
 
@ -13,6 +14,7 @@ import org.springframework.util.CollectionUtils;
13 14 
import com.ai.abc.api.model.CommonRequest;
14 15 
import com.ai.abc.api.model.CommonResponse;
15 16 
import com.ai.bss.components.common.model.PageBean;
17 
import com.ai.bss.components.minio.config.MinioConfig;
16 18 
import com.ai.bss.security.protection.model.EbcMonitorVideoLog;
17 19 
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
18 20 
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
 
@ -27,6 +29,7 @@ import com.ai.bss.work.safety.service.api.AiTaskCommand;
27 29 
import com.ai.bss.work.safety.service.api.AiTaskQuery;
28 30 
import com.alibaba.fastjson.JSON;
29 31 
import com.alibaba.fastjson.JSONArray;
32 
import com.alibaba.fastjson.JSONObject;
30 33 
import com.alibaba.fastjson.TypeReference;
31 34
32 35 
@Service
 
@ -50,6 +53,9 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
50 53 
	@Autowired
51 54 
	private MonitorVideoLogManageService monitorVideoLogManageService;
52 55
56 
	@Autowired
57 
	private MinioConfig minioConfig;
58
53 59 
	@Override
54 60 
	public CommonResponse<PageBean<Map<String, Object>>> queryPageAiIdenLog(Map<String, Object> params, int pageNumber,
55 61 
			int pageSize) throws Exception {
 
@ -68,14 +74,29 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
68 74 
		for (Map<String, Object> dataMap : response.getData().getData()) {
69 75 
			dataMap.put("taskExecuteTime", DateUtil.formatObjectToDate(dataMap.get("taskExecuteTime")));
70 76 
			dataMap.put("idenPictureSnapDate", DateUtil.formatObjectToDate(dataMap.get("idenPictureSnapDate")));
71
77
72 78 
			// 结果详情
73 
			String idenResultArr = dataMap.get("idenResult") == null ? "" : String.valueOf(dataMap.get("idenResult"));
74 
			if (StringUtils.isNotEmpty(idenResultArr)) {
75 
				List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultArr, List.class);
76 
				if (!CollectionUtils.isEmpty(idenResultList)) {
77 
					dataMap.put("idenResult", idenResultList.get(0));
78 
					//dataMap.putAll(idenResultList.get(0));
79 
			String idenResultString = dataMap.get("idenResult") == null ? ""
80 
					: String.valueOf(dataMap.get("idenResult"));
81 
			if (StringUtils.isNotEmpty(idenResultString)) {
82 
				Object idenResultObject = JSON.parse(idenResultString);
83 
				if (idenResultObject instanceof JSONObject) {
84 
					Map<String, String> idenResultMap = JSON.parseObject(idenResultString, Map.class);
85 
					dataMap.putAll(idenResultMap);
86
87 
					if (idenResultMap.get("simi") != null) {
88 
						Object simiObject = idenResultMap.get("simi");
89 
						BigDecimal simiBigDecimal = new BigDecimal(String.valueOf(simiObject));
90 
						float simi = simiBigDecimal.multiply(new BigDecimal("100"))
91 
								.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
92 
						dataMap.put("simi", simi + "%");
93 
					}
94
95 
				} else if (idenResultObject instanceof JSONArray) {
96 
					List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultString, List.class);
97 
					if (!CollectionUtils.isEmpty(idenResultList)) {
98 
						dataMap.putAll(idenResultList.get(0));
99 
					}
79 100 
				}
80 101 
			}
81 102 
@ -92,7 +113,7 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
92 113 
					dataMap.put("employeeName", employeeResponse.getData().getName());
93 114 
					dataMap.put("employeeCode", employeeResponse.getData().getCode());
94 115
95 
					dataMap.put("companyName", employeeResponse.getData().getField4());
116 
					dataMap.put("companyId", employeeResponse.getData().getField4());
96 117 
					dataMap.put("organizationCode", employeeResponse.getData().getOrganizeCode());
97 118 
					dataMap.put("organizationName", employeeResponse.getData().getOrgName());
98 119 
@ -133,7 +154,7 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
133 154 
			String pictureUrl = String.valueOf(dataMap.get("idenPictureUrl"));
134 155 
			if (pictureUrl.length() > 20 && pictureUrl.lastIndexOf(".") > 18
135 156 
					&& pictureUrl.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE) > 0) {
136
157
137 158 
				int picturePrefixIndex = pictureUrl.lastIndexOf(EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE)
138 159 
						+ EbcConstant.AI_MONITOR_FILE_PREFIX_PICTURE.length();
139 160 
				String fileName = pictureUrl.substring(picturePrefixIndex, picturePrefixIndex + 4) + "-"
 
@ -165,11 +186,29 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
165 186 
				new TypeReference<Map<String, String>>() {
166 187 
				});
167 188
189 
		aiIdenLogInfoMap.put("taskExecuteTime",
190 
				DateUtil.formatDate(Long.valueOf(aiIdenLogInfoMap.get("taskExecuteTime"))));
191
168 192 
		// 结果详情
169 193 
		if (StringUtils.isNotEmpty(aiIdenLog.getIdenResult())) {
170 
			List<Map<String, String>> idenResultList = JSONArray.parseObject(aiIdenLog.getIdenResult(), List.class);
171 
			if (!CollectionUtils.isEmpty(idenResultList)) {
172 
				aiIdenLogInfoMap.putAll(idenResultList.get(0));
194 
			Object idenResultObject = JSON.parse(aiIdenLog.getIdenResult());
195 
			if (idenResultObject instanceof JSONObject) {
196 
				Map<String, String> idenResultMap = JSON.parseObject(aiIdenLog.getIdenResult(), Map.class);
197 
				aiIdenLogInfoMap.putAll(idenResultMap);
198
199 
				if (idenResultMap.get("simi") != null) {
200 
					Object simiObject = idenResultMap.get("simi");
201 
					BigDecimal simiBigDecimal = new BigDecimal(String.valueOf(simiObject));
202 
					float simi = simiBigDecimal.multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP)
203 
							.floatValue();
204 
					aiIdenLogInfoMap.put("simi", simi + "%");
205 
				}
206
207 
			} else if (idenResultObject instanceof JSONArray) {
208 
				List<Map<String, String>> idenResultList = JSONArray.parseObject(aiIdenLog.getIdenResult(), List.class);
209 
				if (!CollectionUtils.isEmpty(idenResultList)) {
210 
					aiIdenLogInfoMap.putAll(idenResultList.get(0));
211 
				}
173 212 
			}
174 213 
		}
175 214 
@ -186,6 +225,10 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
186 225 
				aiIdenLogInfoMap.put("employeeName", employeeResponse.getData().getName());
187 226 
				aiIdenLogInfoMap.put("employeeCode", employeeResponse.getData().getCode());
188 227
228 
				String headerImageName = employeeResponse.getData().getField1();
229 
				String headerImage = uploadFileService.getFileUrl(headerImageName, minioConfig.getBucketHeaderImage());
230 
				aiIdenLogInfoMap.put("headerImage", headerImage);
231
189 232 
				/*
190 233 
				String employeePosition = employeeResponse.getData().getMainJobPosition();
191 234 
				aiIdenLogInfoMap.put("employeePosition", employeePosition);
 
@ -226,6 +269,73 @@ public class AiIdenLogManageServiceImpl implements AiIdenLogManageService {
226 269 
	}
227 270
228 271 
	@Override
272 
	public CommonResponse<List<Map<String, Object>>> selectLastAiIdenLog(Map<String, String> params) throws Exception {
273 
		CommonRequest<Map<String, String>> request = new CommonRequest<Map<String, String>>(params);
274 
		CommonResponse<List<Map<String, Object>>> response = aiTaskQuery
275 
				.selectAiIdenLogBySceneIdAndAiIdenModel(request);
276
277 
		if (response == null || response.getData() == null || CollectionUtils.isEmpty(response.getData())) {
278 
			return response;
279 
		}
280
281 
		for (Map<String, Object> dataMap : response.getData()) {
282 
			dataMap.put("taskExecuteTime", DateUtil.formatObjectToDate(dataMap.get("taskExecuteTime")));
283
284 
			String idenPictureName = String.valueOf(dataMap.get("idenPictureUrl"));
285 
			String idenPictureUrl = uploadFileService.getFileUrl(idenPictureName);
286 
			dataMap.put("idenPictureUrl", idenPictureUrl);
287
288 
			// 结果详情
289 
			String idenResultString = dataMap.get("idenResult") == null ? ""
290 
					: String.valueOf(dataMap.get("idenResult"));
291 
			if (StringUtils.isNotEmpty(idenResultString)) {
292 
				Object idenResultObject = JSON.parse(idenResultString);
293 
				if (idenResultObject instanceof JSONObject) {
294 
					Map<String, String> idenResultMap = JSON.parseObject(idenResultString, Map.class);
295 
					dataMap.putAll(idenResultMap);
296
297 
					if (idenResultMap.get("simi") != null) {
298 
						Object simiObject = idenResultMap.get("simi");
299 
						BigDecimal simiBigDecimal = new BigDecimal(String.valueOf(simiObject));
300 
						float simi = simiBigDecimal.multiply(new BigDecimal("100"))
301 
								.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
302 
						dataMap.put("simi", simi + "%");
303 
					}
304
305 
				} else if (idenResultObject instanceof JSONArray) {
306 
					List<Map<String, String>> idenResultList = JSONArray.parseObject(idenResultString, List.class);
307 
					if (!CollectionUtils.isEmpty(idenResultList)) {
308 
						dataMap.putAll(idenResultList.get(0));
309 
					}
310 
				}
311 
			}
312
313 
			// 员工信息
314 
			if (dataMap.get("relateEmployeeRoleId") != null) {
315 
				long relateEmployeeRoleId = Long.parseLong(String.valueOf(dataMap.get("relateEmployeeRoleId")));
316
317 
				EmployeeDto employeeDto = new EmployeeDto();
318 
				employeeDto.setId(relateEmployeeRoleId);
319 
				CommonRequest<EmployeeDto> requestEmployeeDto = CommonRequest.<EmployeeDto>builder().data(employeeDto)
320 
						.build();
321 
				CommonResponse<EmployeeDto> employeeResponse = employeeService.queryEmployee(requestEmployeeDto);
322
323 
				if (employeeResponse.getData() != null) {
324 
					dataMap.put("employeeName", employeeResponse.getData().getName());
325 
					dataMap.put("employeeCode", employeeResponse.getData().getCode());
326
327 
					String headerImageName = employeeResponse.getData().getField1();
328 
					String headerImage = uploadFileService.getFileUrl(headerImageName,
329 
							minioConfig.getBucketHeaderImage());
330 
					dataMap.put("headerImage", headerImage);
331 
				}
332 
			}
333 
		}
334
335 
		return response;
336 
	}
337
338 
	@Override
229 339 
	public CommonResponse<AiIdenLog> createAiIdenLog(AiIdenLog aiIdenLog) throws Exception {
230 340 
		CommonRequest<AiIdenLog> aiIdenLogRequest = new CommonRequest<AiIdenLog>(aiIdenLog);
231 341 
		return aiTaskCommand.createAiIdenLog(aiIdenLogRequest);

+ 8 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AiIdenLogManageService.java
Просмотреть файл 

@ -45,6 +45,14 @@ public interface AiIdenLogManageService {
45 45 
	CommonResponse<Map<String, Object>> queryOneAiIdenLog(Long aiIdenLogId) throws Exception;
46 46
47 47 
	/**
48 
	 * 查询所有设备最后一个识别记录
49 
	 * @param params
50 
	 * @return
51 
	 * @throws Exception
52 
	 */
53 
	CommonResponse<List<Map<String, Object>>> selectLastAiIdenLog(Map<String, String> params) throws Exception;
54
55 
	/**
48 56 
	 * 创建AI执行结果
49 57 
	 * @param aiIdenLog
50 58 
	 * @return

+ 1 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/ResourceToolManageService.java
Просмотреть файл 

@ -84,7 +84,7 @@ public interface ResourceToolManageService {
84 84 
	Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception;
85 85
86 86 
	/**
87 
	 * 根据设备CODE获取场景、AI任务等相关信息
87 
	 * 根据设备CODE获取AI任务等相关信息
88 88 
	 * @param resourceToolCode
89 89 
	 * @return
90 90 
	 */

+ 30 - 11
security-protection-service/src/main/java/com/ai/bss/security/protection/service/task/AiResultRecordKafkaTask.java
Просмотреть файл 

@ -14,8 +14,9 @@ import com.ai.abc.api.model.CommonRequest;
14 14 
import com.ai.abc.api.model.CommonResponse;
15 15 
import com.ai.abc.util.JsonUtils;
16 16 
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
17 
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
18 17 
import com.ai.bss.security.protection.utils.EbcConstant;
18 
import com.ai.bss.user.dto.EmployeeDto;
19 
import com.ai.bss.user.service.api.EmployeeService;
19 20 
import com.ai.bss.work.safety.model.AiIdenLog;
20 21 
import com.ai.bss.work.safety.service.api.AiTaskCommand;
21 22 
import com.ai.bss.work.safety.service.api.MonitorSceneQuery;
 
@ -38,14 +39,14 @@ public class AiResultRecordKafkaTask {
38 39 
	private AiTaskCommand aiTaskCommand;
39 40
40 41 
	@Autowired
41 
	private ResourceToolManageService resourceToolManageService;
42
43 
	@Autowired
44 42 
	private MonitorSceneQuery monitorSceneQuery;
45 43
46 44 
	@Autowired
47 45 
	private AiIdenLogManageService aiIdenLogManageService;
48 46
47 
	@Autowired
48 
	private EmployeeService employeeService;
49
49 50 
	@KafkaListener(containerFactory = "kafkaBatchListener6", topics = "${kafka.topic.aitask:topic_ai_task}", groupId = "ai_group")
50 51 
	public void AiResultRecordListener(ConsumerRecord<String, String> records, Acknowledgment ack) throws Throwable {
51 52 
		try {
 
@ -54,11 +55,15 @@ public class AiResultRecordKafkaTask {
54 55 
			String message = records.value();
55 56 
			log.info("已接AI任务执行结果消息，消息为：" + message);
56 57
58 
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
59 
			});
60
57 61 
			JSONObject messageJson = JSONObject.parseObject(message);
58 62 
			String resourceToolId = messageJson.getString("resourceToolId");
59 63 
			String idenResultType = messageJson.getString("idenResultType");
64 
			Long relateEmployeeRoleId = messageJson.getLong("relateEmployeeRoleId");
60 65
61 
			// 查询相关数据
66 
			// 关联场景信息
62 67 
			CommonResponse<List<Map<String, Object>>> sceneTerminalRelResponse = monitorSceneQuery
63 68 
					.selectSceneTerminalRel(new CommonRequest<Long>(Long.valueOf(resourceToolId)));
64 69 
			if (sceneTerminalRelResponse == null || CollectionUtils.isEmpty(sceneTerminalRelResponse.getData())) {
 
@ -68,9 +73,6 @@ public class AiResultRecordKafkaTask {
68 73
69 74 
			Map<String, Object> sceneTerminalRelMap = sceneTerminalRelResponse.getData().get(0);
70 75
71 
			// 封装数据
72 
			AiIdenLog aiIdenLog = JSON.parseObject(message, new TypeReference<AiIdenLog>() {
73 
			});
74 76 
			aiIdenLog.setMonitorSceneId(sceneTerminalRelMap.get("monitorSceneId") == null ? ""
75 77 
					: String.valueOf(sceneTerminalRelMap.get("monitorSceneId")));
76 78 
			aiIdenLog.setMonitorSceneName(sceneTerminalRelMap.get("monitorSceneName") == null ? ""
 
@ -82,9 +84,26 @@ public class AiResultRecordKafkaTask {
82 84 
			aiIdenLog.setOrganizationId(
83 85 
					sceneTerminalRelMap.get("orgId") == null ? "" : String.valueOf(sceneTerminalRelMap.get("orgId")));
84 86
85 
			// TODO 人员信息暂时默认
86 
			aiIdenLog.setRelateEmployeeRoleId("201613310867");
87 
			aiIdenLog.setRelateEmployeeRoleName("王浩");
87 
			// 关联员工信息
88 
			EmployeeDto employeeDto = null;
89 
			if (relateEmployeeRoleId != null) {
90 
				employeeDto = new EmployeeDto();
91 
				employeeDto.setId(relateEmployeeRoleId);
92 
				CommonRequest<EmployeeDto> employeeDtoRequest = new CommonRequest<EmployeeDto>(employeeDto);
93 
				CommonResponse<EmployeeDto> employeeDtoResponse = employeeService.queryEmployee(employeeDtoRequest);
94 
				if (employeeDtoResponse == null || employeeDtoResponse.getData() == null) {
95 
					employeeDto = null;
96 
				} else {
97 
					employeeDto = employeeDtoResponse.getData();
98 
				}
99 
			}
100 
			if (employeeDto != null) {
101 
				aiIdenLog.setRelateEmployeeRoleName(employeeDto.getName());
102 
				aiIdenLog.setOrganizationId(String.valueOf(employeeDto.getOrganizeId()));
103 
			} else {
104 
				aiIdenLog.setRelateEmployeeRoleId("-1");
105 
				aiIdenLog.setRelateEmployeeRoleName(null);
106 
			}
88 107
89 108 
			// 执行操作
90 109 
			CommonResponse<AiIdenLog> aiIdenLogRunningResult = aiIdenLogManageService.createAiIdenLog(aiIdenLog);

android-share - Nuosi Git Service
Home Explore Help
Sign In
ipu
/
android-share
Watch 6
Star 0
Fork 0
Code Issues 1 Pull Requests 1 Commits 1610 Releases 4 Wiki

ipu的trunk版的android工程和服务端工程。

Branch: master
Branches Tags
android-share
/
ipu-open-platform
/
res
leijie c8a7884b78 初始化ipu-open-platform（AL） 8 years ago
..
values c8a7884b78 初始化ipu-open-platform（AL） 8 years ago
values-v11 c8a7884b78 初始化ipu-open-platform（AL） 8 years ago
values-v14 c8a7884b78 初始化ipu-open-platform（AL） 8 years ago