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

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/model/FaceResultDto.java

@@ -11,6 +11,6 @@ public class FaceResultDto {
    private int isMatch;
    private int[] faceBox;
    private int[] box;
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/model/IdenResultDto.java

@@ -8,6 +8,6 @@ public class IdenResultDto {
    private String alarmType;
    private String alarmMemo;
    private String alarmEmployeeRoleId;
    private int[] alarmBox;
    private int[] box;
}

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

@@ -1,6 +1,7 @@
package com.ai.bss.monitorManage.service.impl;
import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -409,17 +410,17 @@ public class KafkaProcessImpl implements KafkaProcess {
			JSONObject jsonObject = JSONObject.parseObject(aiResponseData);
			log.info("AI人脸识别结果： " + aiResponseData);
			if (!"OK".equals(jsonObject.getString("Des")) || !"OK".equals(jsonObject.getString("Status"))) {
			if (!"OK".equals(jsonObject.getString("Des")) || !"Ok".equals(jsonObject.getString("Status"))) {
				log.info("人脸识别返回错误，不推送KAFKA消息");
				return aiIdenLogDto;
			}
			if (jsonObject.get("result")==null){
			if (jsonObject.get("Result")==null){
				log.info("人脸识别没有识别到人，不推送KAFKA消息");
				return aiIdenLogDto;
			}
			List<Map> resultList = JSONArray.parseArray(jsonObject.getString("result"),Map.class);
			List<Map> resultList = JSONArray.parseArray(jsonObject.getString("Result"),Map.class);
			FaceResultDto resultDto=null;
			for (Map resultMap:resultList) {
@@ -428,16 +429,33 @@ public class KafkaProcessImpl implements KafkaProcess {
				if ("null".equals(faceId)||"Unknow".equals(faceId)){
					resultDto.setUserId(MonitorManageConsts.alarmEmployeeRoleId);
					resultDto.setSimi((float)resultMap.get("score"));
					BigDecimal score=(BigDecimal)resultMap.get("score");
					resultDto.setSimi(score.setScale(4,BigDecimal.ROUND_HALF_UP).floatValue());
					resultDto.setIsMatch(0);
					resultDto.setFaceBox((int[]) resultMap.get("box"));
					JSONArray boxJSONArray = (JSONArray) resultMap.get("box");
					int[] boxIntArr=new int[boxJSONArray.size()];
					for(int i = 0;i<boxJSONArray.size();i++){
						BigDecimal boxValue=(BigDecimal) boxJSONArray.get(i);
						boxIntArr[i] =boxValue.intValue();
					}
					resultDto.setBox(boxIntArr);
					aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT);
				}else {
					resultDto.setUserId(faceId);
					resultDto.setSimi((float)resultMap.get("score"));
					BigDecimal score=(BigDecimal)resultMap.get("score");
					resultDto.setSimi(score.setScale(4,BigDecimal.ROUND_HALF_UP).floatValue());
					resultDto.setIsMatch(1);
					resultDto.setFaceBox((int[]) resultMap.get("box"));
					JSONArray boxJSONArray = (JSONArray) resultMap.get("box");
					int[] boxIntArr=new int[boxJSONArray.size()];
					for(int i = 0;i<boxJSONArray.size();i++){
						BigDecimal boxValue=(BigDecimal) boxJSONArray.get(i);
						boxIntArr[i] =boxValue.intValue();
					}
					resultDto.setBox(boxIntArr);
					aiIdenLogDto.setRelateEmployeeRoleId(faceId);
					aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT_ATTENDANCE);
@@ -493,7 +511,15 @@ public class KafkaProcessImpl implements KafkaProcess {
					idenResultDto.setAlarmEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
					idenResultDto.setAlarmType(MonitorManageConsts.AI_ALARM_TYPE_STA);
					idenResultDto.setAlarmMemo("陌生人");
					idenResultDto.setAlarmBox((int[]) resultMap.get("box"));
					JSONArray boxJSONArray = (JSONArray) resultMap.get("box");
					int[] boxIntArr=new int[boxJSONArray.size()];
					for(int i = 0;i<boxJSONArray.size();i++){
						BigDecimal boxValue=(BigDecimal) boxJSONArray.get(i);
						boxIntArr[i] =boxValue.intValue();
					}
					idenResultDto.setBox(boxIntArr);
					idenResultDtoList.add(idenResultDto);
				}
			}

security-protection-platform/.aid/aid.js

@@ -1,15 +1,15 @@
const { join } = require('path')
const { name } = require('../package.json')
function resolve(dir) {
function resolve (dir) {
  return join(__dirname, dir)
}
const subappURL = 'http://localhost:5000/'
function rules(config) {
function rules (config) {
  let rules = config.module.rules.map(v => {
    if(v.test.toString() === '/\\.css/') {
    if (v.test.toString() === '/\\.css/') {
      return {
        test: /\.css/,
        use: [require.resolve('style-loader'), require.resolve('css-loader')]
@@ -42,10 +42,10 @@ module.exports = {
  cssExt: ".scss", //入口css文件后缀名
  autocheck: ['aid-elements-desktop', 'aid-font', 'aid-desktop'],
  strict: false,
  beforeDev(config) {
  beforeDev (config) {
    return rules(config)
  },
  beforeBuild(config) {
  beforeBuild (config) {
    let result = rules(config)
    result.output = {
      publicPath: '/'
@@ -55,5 +55,17 @@ module.exports = {
  //hmrPath: subappURL, // 作为子应用必须启用
  //imagePrefix: url => `${subappURL}/asset/image/${url}`, // 作为子应用必须启用
  //fontPrefix: url => `${subappURL}/asset/font/${url}`, // 作为子应用必须启用
  outputPrefix: '/' // 构建后index.html中资源路径的前缀
  outputPrefix: '/',// 构建后index.html中资源路径的前缀
  proxy: [
    {
      url: '/sp',
      options: {
        target: 'http://10.19.90.34:8018',
        changeOrigin: true,
        pathRewrite: {
          '^/sp': '/'
        }
      }
    },
  ]
}

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

@@ -8,6 +8,12 @@ const api = {
    return $default.post('/sp/login/login', data).then(resp => {
      return resp.data
    })
  },
  // 获取用户菜单权限
  findMenus (data) {
    return $default.post('/sp/login/findMenus', data).then(resp => {
      return resp.data
    })
  }
}
export default api

security-protection-platform/src/conf/axios.config.js

@@ -39,9 +39,9 @@ const conf = {
  },
  root: {
    default: {
      baseURL: 'http://10.19.90.34:8018'
      // baseURL: 'http://10.19.90.34:8018'
      // baseURL: 'http://localhost:8018'
      // baseURL: '/'
      baseURL: '/sp'
    },
    picurl: {
      baseURL: 'http://10.19.90.34:19000/tool-image/'

security-protection-platform/src/http.js

@@ -17,7 +17,6 @@ import { TMessage, GLoading } from 'aid-desktop'
import config from './conf/axios.config.js'
/* eslint no-useless-escape: "off" */
/* eslint no-prototype-builtins: "off" */
/**
 * 深度合并多个对象，返回合并后的新对象
 * @private

security-protection-platform/src/main.js

@@ -26,6 +26,9 @@ Vue.use(VideoPlayer)
// const hls = require('videojs-contrib-hls')
// Vue.use(hls)
import axios from 'axios'
axios.defaults.withCredentials = true
// 安装组件库插件
Vue.use(aid, {
  local: i18nManager.language,

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

@@ -8,28 +8,20 @@
        <h3 class="welcome">欢迎登录 <span class="system-name">AISI安防一体化管理平台</span></h3>
        <t-form ref="loginForm" :model="loginForm" :rules="loginFormRules">
          <t-form-item prop="userName">
            <t-input v-model="loginForm.userName" placeholder="admin" icon="user-outline" >
            <t-input v-model="loginForm.userName" placeholder="admin" icon="user-outline">
            </t-input>
          </t-form-item>
          <t-form-item prop="password">
            <t-input v-model="loginForm.password" placeholder="Abc@1234" type="password" icon="lock-outline" >
            <t-input v-model="loginForm.password" placeholder="Abc@1234" type="password" icon="lock-outline">
            </t-input>
          </t-form-item>
          <t-form-item prop="verifyCode">
            <t-input v-model="loginForm.verifyCode"
                     placeholder="请输入验证码" >
              <img slot="append"
                   :src="verifiyCode"
                   title="点击以刷新验证码"
                   style="height:30px; margin: 0 -12px;cursor:pointer"
                   @click="onVerifiyCodeClick"/>
            <t-input v-model="loginForm.verifyCode" placeholder="请输入验证码">
              <img slot="append" :src="verifiyCode" title="点击以刷新验证码" style="height:30px; margin: 0 -12px;cursor:pointer" @click="onVerifiyCodeClick" />
            </t-input>
          </t-form-item>
          <t-form-item class="mb-0">
            <t-button :loading="loging"
                      color="primary"
                      block
                      @click="onLoginButtonClick">
            <t-button :loading="loging" color="primary" block @click="onLoginButtonClick">
              <span v-if="!loging">登录</span>
              <span v-else>正在登录...</span>
            </t-button>
@@ -44,13 +36,14 @@
import loginbg from '@/assets/images/loginbg.png'
import verifiyCode from '@/assets/images/verifiyCode.jpg'
import loginapi from '@/api/login'
import store from '@/store'
export default {
  filters: {
  },
  components: {
  },
  data() {
  data () {
    return {
      loginbg: loginbg,
      loging: false,
@@ -77,9 +70,14 @@ export default {
  computed: {
  },
  mounted () {
    let userName = localStorage.getItem('userName')
    if (userName) {
      this.loginForm.userName = userName
      this.rememberMe = true
    }
  },
  methods: {
    onVerifiyCodeClick() {
    onVerifiyCodeClick () {
    },
    onLoginButtonClick () {
      if (this.loging) {
@@ -88,13 +86,38 @@ export default {
      this.loging = true
      this.$refs.loginForm.validate((valid) => {
        if (valid) {
          loginapi.doLogin({userCode: this.loginForm.userName, passWord: this.loginForm.password}).then((data) => {
          loginapi.doLogin({ userCode: this.loginForm.userName, passWord: this.loginForm.password }).then(async (data) => {
            this.$store.commit('setLogged', true)
            if (this.rememberMe) {
              localStorage.setItem('userName', data.userName)
              localStorage.setItem('userName', data.RESULT.CODE)
            } else {
              localStorage.removeItem('userName')
            }
            const res = await loginapi.findMenus({ userCode: data.RESULT.CODE })
            var map = new Map()
            res.RESULT.forEach(e => {
              if (e.ROOT_MENU) {
                map.set(e.ROOT_MENU[0].VIEWNAME, e.ROOT_MENU[0].ID)
              }
              // 第六个考勤报表没有 menu_list
              if (e.menu_list) {
                map.set(e.menu_list[0].VIEWNAME, e.ID)
              }
              if (e.child_list) {
                const str = e.child_list[0].menu_list[0].VIEWNAME
                map.set(str.substr(0, str.indexOf('/', 1)), parseInt(Math.random() * 1000000))
                e.child_list.forEach(m => {
                  map.set(m.menu_list[0].VIEWNAME, m.ID)
                  if (m.child_list) {
                    m.child_list.forEach(mn => {
                      map.set(mn.menu_list[0].VIEWNAME, mn.ID)
                    })
                  }
                })
              }
            })
            localStorage.setItem('menus', JSON.stringify(map))
            sessionStorage.setItem('isLogged', true)
            this.$router.push({ name: 'dashboard' })
          }).catch((e) => {
            this.loging = false
@@ -111,42 +134,42 @@ export default {
</script>
<style lang="scss">
.index{
  height:100vh;
  -moz-background-size:100% 100%;
  background-size:100% 100%;
  .user-form-box{
.index {
  height: 100vh;
  -moz-background-size: 100% 100%;
  background-size: 100% 100%;
  .user-form-box {
    padding: 20px 40px 20px 40px;
    background-color: #003561;
    position:fixed;
    left:70%;
    top:20%;
    position: fixed;
    left: 70%;
    top: 20%;
    width: 25%;
    height: 65%;
    .from{
    .from {
      width: 100%;
      height: 100%;
      .hello {
        height:36px;
        font-size:26px;
        font-weight:500;
        height: 36px;
        font-size: 26px;
        font-weight: 500;
        color: white;
        line-height:36px;
        line-height: 36px;
        margin-bottom: 4px;
      }
      .welcome {
        height:36px;
        font-size:14px;
        font-weight:500;
        color:rgba(0,0,0,1);
        line-height:36px;
        height: 36px;
        font-size: 14px;
        font-weight: 500;
        color: rgba(0, 0, 0, 1);
        line-height: 36px;
        margin-bottom: 24px;
        color: white;
      }
      .system-name {
        font-size: 14px;
        font-weight: 500;
        color: #0079BE;
        color: #0079be;
      }
    }
  }

security-protection-platform/src/router.js

@@ -27,7 +27,33 @@ export default () => {
  router.beforeEach(async (to, from, next) => {
    // TGlobalLoading.start()
    // const accessRoutes = await store.dispatch('permission/generateRoutes', 'user')
    next()
    /*
     * 在每次视图切换时检查当前用户是否处于登
     * 录状态，如果没有登录则跳转到登录视图
     * 注意此时是调用getter中的isLogged获
     * 取客户端缓存的登录状态。
     * 真实登录状态仅在应用初始化和每次服务
     * 调用时检查即可，在视图（路由）切换时，
     * 为了提升视图切换性能（少请求一次服务），
     * 只需要调用getter中的isLogged进行简
     * 单客户端判断。
     * 参见src/frame.vue和src/store.js文件中的逻辑。
     */
    let isLogged = router.app.$options.store.getters.getLogged || sessionStorage.getItem('isLogged')
    console.log(isLogged)
    if (to.meta.ignoreAuth === true) {
      if (isLogged === true && to.path === '/login') {
        router.replace({ name: 'dashboard' })
      } else {
        next()
      }
    } else {
      if (isLogged === false) {
        router.replace({ name: 'login' })
      } else {
        next()
      }
    }
  })
  router.afterEach(() => {

security-protection-platform/src/routes.js

@@ -21,7 +21,7 @@ export const constantRoutes = [
    name: 'login',
    path: '/login',
    component: () => import('./modules/login'),
    meta: { title: '登录页', icon: 'home', ignoreAuth: true},
    meta: { title: '登录页', icon: 'home', ignoreAuth: true },
    hidden: true
  },
  {
@@ -37,7 +37,16 @@ export const constantRoutes = [
        meta: { title: '首页', icon: 'home' }
      }
    ]
  },
  }
]
/**
 * asyncRoutes
 * the routes that need to be dynamically loaded based on user roles
 */
// 异步挂载的路由
// 动态需要根据权限加载的路由表
export const asyncRoutes = [
  {
    path: '/videoSurveillance',
    component: Layout,
@@ -60,7 +69,7 @@ export const constantRoutes = [
  {
    path: '/access',
    component: Layout,
    meta: { icon: 'file-solution-outline' },
    meta: { title: '识别记录', icon: 'file-solution-outline' },
    children: [
      {
        name: 'access',
@@ -73,7 +82,7 @@ export const constantRoutes = [
  {
    path: '/alarm',
    component: Layout,
    meta: { icon: 'bell' },
    meta: { title: '智能报警', icon: 'bell' },
    children: [
      {
        name: 'ai_alarm',
@@ -85,7 +94,7 @@ export const constantRoutes = [
  }, {
    path: '/workorder',
    component: Layout,
    meta: { icon: 'calendar-outline' },
    meta: { title: '假勤管理', icon: 'calendar-outline' },
    children: [
      {
        name: 'workorder',
@@ -103,17 +112,18 @@ export const constantRoutes = [
    children: [
      {
        name: 'report',
        path: 'report',
        path: '/attendance/report',
        component: () => import(/* webpackChunkName: "report" */ './modules/attendance/report'),
        meta: { title: '考勤报表' }
      }, {
        name: 'abnormal',
        path: 'abnormal',
        path: '/attendance/abnormal',
        component: () => import(/* webpackChunkName: "abnormal" */ './modules/attendance/abnormal'),
        meta: { title: '异常考勤' }
      }
    ]
  }, {
  },
  {
    path: '/system',
    component: Layout,
    meta: { title: '系统管理', icon: 'setting' },
@@ -122,33 +132,40 @@ export const constantRoutes = [
    children: [
      {
        name: 'sys_devicemana',
        path: 'devicemana',
        path: '/system/devicemana',
        component: () => import(/* webpackChunkName: "sys_devicemana" */ './modules/system/devicemana'),
        meta: { title: '设备管理' }
      },
      {
        name: 'sys_task',
        path: 'assignment',
        path: '/system/assignment',
        component: () => import(/* webpackChunkName: "sys__task" */ './modules/system/assignment'),
        meta: { title: '任务管理' }
      },
      {
        name: 'sys_monitor',
        path: 'monitor',
        path: '/system/monitor',
        component: () => import(/* webpackChunkName: "sys_monitor" */ './modules/system/monitor'),
        meta: { title: '监控布局' }
      },
      {
        name: 'sys_attendance',
        path: 'attendance',
        path: '/system/attendance',
        component: () => import(/* webpackChunkName: "sys_attendance" */ './modules/system/attendance'),
        meta: { title: '考勤配置' }
      },
      }
    ]
  },
  {
    path: '/usermana',
    component: Layout,
    meta: { title: '用户管理', icon: 'user-outline' },
    children: [
      {
        name: 'usermana',
        path: 'usermana',
        path: '/usermana',
        component: () => import(/* webpackChunkName: "user_rights" */ './modules/usermana'),
        meta: { title: '用户管理'}
        meta: { title: '用户管理', icon: 'user-outline' }
      }
    ]
  },
@@ -161,10 +178,4 @@ export const constantRoutes = [
  }
]
/**
 * asyncRoutes
 * the routes that need to be dynamically loaded based on user roles
 */
export const asyncRoutes = []
export default constantRoutes.concat(asyncRoutes)

security-protection-platform/src/store/index.js

@@ -35,8 +35,9 @@ export default () => {
      isLogged: false
    },
    mutations: {
      setLogged(state, token) {
      setLogged (state, token) {
        state.isLogged = token
        console.log(token)
      }
    }
  })

security-protection-platform/src/store/modules/permission.js

@@ -1,16 +1,22 @@
import { asyncRoutes, constantRoutes } from '@/routes'
/*
 * Use meta.role to determine if the current user has permission
 * @param roles
 * @param route
 */
function hasPermission(roles, route) {
  if (route.meta && route.meta.roles) {
    return roles.some(role => route.meta.roles.includes(role))
  } else {
    return true
  }
function hasPermission (permission, route) {
  // if (route.meta && route.meta.roles) {
  //   return roles.some(role => route.meta.roles.includes(role))
  // } else {
  //   return true
  // }
  var x = false
  permission.forEach(e => {
    if (e[0] === route.path) {
      x = true
    }
  })
  return x
}
/**
@@ -18,20 +24,33 @@ function hasPermission(roles, route) {
 * @param routes asyncRoutes
 * @param roles
 */
export function filterAsyncRoutes(routes, roles) {
  const res = []
// export function filterAsyncRoutes (routes, roles) {
//   const res = []
  routes.forEach(route => {
    const tmp = { ...route }
    if (hasPermission(roles, tmp)) {
      if (tmp.children) {
        tmp.children = filterAsyncRoutes(tmp.children, roles)
//   routes.forEach(route => {
//     const tmp = { ...route }
//     if (hasPermission(roles, tmp)) {
//       if (tmp.children) {
//         tmp.children = filterAsyncRoutes(tmp.children, roles)
//       }
//       res.push(tmp)
//     }
//   })
//   return res
// }
function filterAsyncRoutes (routerMap, roles, map) {
  const accessedRouters = routerMap.filter(route => {
    // if (hasPermission(roles.permissionList, route) && map[route.path] || route.path === '/') {
    if (hasPermission(map, route) || route.path === '/') {
      if (route.children && route.children.length) {
        route.children = filterAsyncRoutes(route.children, roles, map)
      }
      res.push(tmp)
      return true
    }
    return false
  })
  return res
  return accessedRouters
}
const state = {
@@ -47,16 +66,25 @@ const mutations = {
}
const actions = {
  generateRoutes({ commit }, roles) {
  // generateRoutes ({ commit }, roles) {
  //   return new Promise(resolve => {
  //     let accessedRoutes
  //     if (roles.includes('admin')) {
  //       accessedRoutes = asyncRoutes || []
  //     } else {
  //       accessedRoutes = filterAsyncRoutes(asyncRoutes, roles,menus)
  //     }
  //     commit('SET_ROUTES', accessedRoutes)
  //     resolve(accessedRoutes)
  //   })
  // }
  generateRoutes ({ commit }, roles) {
    var menus = JSON.parse(localStorage.getItem('menus'))
    return new Promise(resolve => {
      let accessedRoutes
      if (roles.includes('admin')) {
        accessedRoutes = asyncRoutes || []
      } else {
        accessedRoutes = filterAsyncRoutes(asyncRoutes, roles)
      }
      commit('SET_ROUTES', accessedRoutes)
      resolve(accessedRoutes)
      let accessedRouters
      accessedRouters = filterAsyncRoutes(asyncRoutes, roles, menus)
      commit('SET_ROUTES', accessedRouters)
      resolve()
    })
  }
}