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

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

@@ -70,27 +70,27 @@ const api = {
    })
  },
  // 获取ai任务下拉框列表
  getCharSpecList(code) {
  getCharSpecList (code) {
    return $default.post(`/sp/charSpec/getCharSpecList?charSpecCode=${code}`).then(resp => {
      return resp
    })
  },
  // 获取ai任务模型下拉框列表
  getAiTaskModelList() {
  getAiTaskModelList () {
    return $default.get('/sp/sysConfigAiTask/queryAiTaskModelList')
  },
  // 获取ai任务列表
  getAiTaskList(params) {
  getAiTaskList (params) {
    return $default.get('/sp/sysConfigAiTask/queryPageAiTask', params)
  },
  // 根据ID获取ai任务
  getAiTaskById(params) {
  getAiTaskById (params) {
    return $default.get('/sp/sysConfigAiTask/queryAiTask?', params)
  },
  deleteAiTaskData(params) {
  deleteAiTaskData (params) {
    return $default.post(`sp/sysConfigAiTask/deleteAiTask`, params)
  },
  createAiTask(params) {
  createAiTask (params) {
    return $default.post(`/sp/sysConfigAiTask/createAiTask`, params)
  },
  // 获取设备列表数据
@@ -139,17 +139,17 @@ const api = {
    return $default.post('/sp/resourceTool/modifyResourceTool', data).catch((err) => { return err })
  },
  // 监控终端列表查询
  getResourceTool(params) {
  getResourceTool (params) {
    params = keysMapping(params, mappingMonitor, false)
    return $default.get('/sp/resourceTool/queryPageResourceTool', {params})
    return $default.get('/sp/resourceTool/queryPageResourceTool', { params })
  },
  getMonitorScene(orgId) {
  getMonitorScene (orgId) {
    return $default.get(`/sp/monitorSceneManagement/queryPageMonitorScene?orgId=${orgId}`)
  },
  createMonitorScene(data) {
  createMonitorScene (data) {
    return $default.post('/sp/monitorSceneManagement/createMonitorScene', data)
  },
  modifyMonitorScene(data) {
  modifyMonitorScene (data) {
    return $default.post('/sp/monitorSceneManagement/modifyMonitorScene', data)
  },
  deleteMonitorScene (data) {
@@ -159,13 +159,13 @@ const api = {
      return $default.delete(`/sp/monitorSceneManagement/deleteMonitorScene?monitorSceneId=${data.monitorSceneId}`)
    }
  },
  getTerminalRel(monitorSceneId) {
  getTerminalRel (monitorSceneId) {
    return $default.get(`/sp/monitorSceneTerminal/queryMonitorSceneTerminalRel?monitorSceneId=${monitorSceneId}`)
  },
  createTerminalRel(data) {
  createTerminalRel (data) {
    return $default.post('/sp/monitorSceneTerminal/createMonitorSceneTerminalRel', data)
  },
  modifyTerminalRel(data) {
  modifyTerminalRel (data) {
    return $default.post('/sp/monitorSceneTerminal/modifyMonitorSceneTerminalRel', data)
  },
  deleteTerminalRel (data) {
@@ -175,21 +175,25 @@ const api = {
      return $default.delete(`/sp/monitorSceneTerminal/deleteMonitorSceneTerminalRelByRelId?monitorSceneTerminalRelId=${data.monitorSceneTerminalRelId}`)
    }
  },
  moveTerminalRelIndex(params) {
  moveTerminalRelIndex (params) {
    // params = keysMapping(params, mappingMonitor, false)
    return $default.put('/sp/monitorSceneTerminal/moveMonitorSceneTerminalRelIndex', params)
  },
  getOneMonitorScene(monitorSceneId) {
  getOneMonitorScene (monitorSceneId) {
    return $default.get(`/sp/monitorSceneManagement/queryOneMonitorScene?monitorSceneId=${monitorSceneId}`)
  },
  getqueryMonitorSceneLayoutList() {
  getqueryMonitorSceneLayoutList () {
    return $default.get(`/sp/monitorSceneManagement/queryMonitorSceneLayoutList`)
  },
  getDepartments() {
  getDepartments () {
    return $default.get('/sp/workEmployee/queryAllOrganize')
  },
  getListFileUrl(data) {
    return $default.get(`/sp/uploadFile/getListFileUrl?fileNameList=${data.join(',')}`)
  getListFileUrl (data) {
    // eslint-disable-next-line no-return-assign
    // data.forEach(item => item = item === '#' ? '1' : item)
    const query = data.join(',')
    console.log(query)
    return $default.get(`/sp/uploadFile/getListFileUrl?fileNameList=${query}`)
  }
}

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: '/'
    },
    picurl: {
      baseURL: 'http://10.19.90.34:19000/tool-image/'
@@ -51,7 +51,7 @@ const conf = {
}
// 将优先的静态配置覆盖本配置
function overrideConf() {
function overrideConf () {
  let urls = (appConf || appConf.baseURL)
  let root = conf.root
  if (urls) {

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

@@ -83,9 +83,9 @@ export default {
        deviceName: [
          { required: true, message: '设备名称不能为空', trigger: 'blur' }
        ],
        videoUrl: [
          { required: true, message: '视频地址不能为空', trigger: 'blur' }
        ],
        // videoUrl: [
        //   { required: true, message: '视频地址不能为空', trigger: 'blur' }
        // ],
        deviceTypeId: [
          { required: true, message: '设备类型不能为空' }
        ]

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

@@ -64,7 +64,7 @@ export default {
      return this.itemWidth * 0.9 - 20 - 6 - 32 + 'px'
    },
    name: function () {
      return this.data.place || 123
      return this.data.place
    }
  },
  mounted () {

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

@@ -108,6 +108,7 @@ export default {
    },
    async getListFileUrl (res, data) {
      const resp = await sysapi.getListFileUrl(data)
      console.log(resp)
      res.filter((item, index) => {
        item.imageUrl = resp.data.data[index]
      })

security-protection-platform/src/router.js

@@ -16,7 +16,7 @@ export default () => {
    // base: '/todo' // 作为子应用必须启用, todo 改为子应用名字
    mode: 'history',
    routes,
    scrollBehavior(to, from, savedPosition) {
    scrollBehavior (to, from, savedPosition) {
      if (savedPosition) {
        return savedPosition
      }
@@ -24,35 +24,10 @@ export default () => {
    }
  })
  router.beforeEach(async(to, from, next) => {
  router.beforeEach(async (to, from, next) => {
    // TGlobalLoading.start()
    // const accessRoutes = await store.dispatch('permission/generateRoutes', 'user')
    /*
     * 在每次视图切换时检查当前用户是否处于登
     * 录状态，如果没有登录则跳转到登录视图
     * 注意此时是调用getter中的isLogged获
     * 取客户端缓存的登录状态。
     * 真实登录状态仅在应用初始化和每次服务
     * 调用时检查即可，在视图（路由）切换时，
     * 为了提升视图切换性能（少请求一次服务），
     * 只需要调用getter中的isLogged进行简
     * 单客户端判断。
     * 参见src/frame.vue和src/store.js文件中的逻辑。
     */
    let isLogged = router.app.$options.store.getters.getLogged
    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()
      }
    }
    next()
  })
  router.afterEach(() => {

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

@@ -42,11 +42,17 @@ public class AiIdenLogManageController {
				: attendanceReport.getPageSize();
		Map<String, Object> params = new HashMap<String, Object>();
		params.put("beginTime", attendanceReport.getBeginDay());
		params.put("endTime", attendanceReport.getEndDay());
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
		params.put("aiIdenModel", EbcConstant.AI_MODEL_FACE);
		params.put("idenResultType", EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
		params.put("workOrgRoleId", attendanceReport.getOrgId());// 组织标识（部门ID）
		params.put("relateEmployeeRoleId", attendanceReport.getId());// 员工ID
		params.put("relateEmployeeName", attendanceReport.getName());// 员工名称（精确匹配）
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());// 员工名称（模糊匹配）
		params.put("resourceToolId", attendanceReport.getResourceToolId()); // 设备ID
		params.put("aiIdenModel", attendanceReport.getModelId()); // 匹配模型（如FACE）
		params.put("idenResultType", attendanceReport.getTypeId()); // 执行结果（如ATT）
		params.put("beginTime", attendanceReport.getBeginDay());// 执行时间（开始）
		params.put("endTime", attendanceReport.getEndDay());// 执行时间（结束）
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
	}

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

@@ -1,14 +1,10 @@
package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AiQuery;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.service.interfaces.InAndOutRecordService;
import com.ai.bss.security.protection.utils.EbcConstant;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,9 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.AiIdenLogManageService;
import com.ai.bss.security.protection.utils.EbcConstant;
/**
 * 进出记录
@@ -54,6 +52,7 @@ public class InAndOutRecordController {
		params.put("endTime", attendanceReport.getEndDay());
		params.put("relateEmployeeNameAsLike", attendanceReport.getNameAsLike());
		params.put("aiIdenModel",EbcConstant.AI_MODEL_FACE);
		params.put("idenResultType",EbcConstant.AI_IDENTIFY_RESULT_ATTENDANCE);
		return aiIdenLogManageService.queryPageAiIdenLog(params, pageNumber, pageSize);
	}

security-protection-service/src/main/java/com/ai/bss/security/protection/model/AttendanceReport.java

@@ -25,6 +25,8 @@ public class AttendanceReport implements Serializable {
    
    private String typeId; //类型
    
    private String modelId; //模型
    
    private String workDay; //当前日期
    private String month; //月份
@@ -35,6 +37,8 @@ public class AttendanceReport implements Serializable {
    
    private String monitorSceneType; //场景大类
    
    private String resourceToolId; //设备ID
    
    int pageNumber = 0; // 当前页数
    int pageSize = 0; // 每页条数