From 910b277071a19503fb9355c98b64ab84ca056011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Fri, 29 Sep 2023 01:08:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/project/aiBoxProjectData/index.vue | 417 ------------------ .../aiBoxProjectConfig/index.vue | 0 ruoyi-ui/src/views/video/aiboxData/index.vue | 256 +++++++++++ .../SurProjectDeptWroksController.java | 4 - .../controller/SurProjectPlanController.java | 1 - .../SurProjectWorkAttendanceController.java | 1 - .../mapper/DevAiProjectConfigMapper.java | 2 +- .../mapper/DevAiProjectDataMapper.java | 2 +- .../yanzhu/jh/publics/AIBoxController.java | 19 +- .../DevAiProjectConfigController.java | 6 +- .../DevAiProjectDataController.java | 21 +- .../domain/DevAiProjectConfig.java | 2 +- .../domain/DevAiProjectData.java | 24 +- .../domain}/DevAiProjectDataVO.java | 2 +- .../service/IDevAiProjectConfigService.java | 4 +- .../service/IDevAiProjectDataService.java | 6 +- .../impl/DevAiProjectConfigServiceImpl.java | 6 +- .../impl/DevAiProjectDataServiceImpl.java | 13 +- .../DevAiProjectConfigMapper.xml | 0 .../DevAiProjectDataMapper.xml | 33 +- 20 files changed, 354 insertions(+), 465 deletions(-) delete mode 100644 ruoyi-ui/src/views/project/aiBoxProjectData/index.vue rename ruoyi-ui/src/views/{project => video}/aiBoxProjectConfig/index.vue (100%) create mode 100644 ruoyi-ui/src/views/video/aiboxData/index.vue rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/controller/DevAiProjectConfigController.java (95%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/controller/DevAiProjectDataController.java (81%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/domain/DevAiProjectConfig.java (99%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/domain/DevAiProjectData.java (95%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project/domain/vo => video/domain}/DevAiProjectDataVO.java (99%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/service/IDevAiProjectConfigService.java (93%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/service/IDevAiProjectDataService.java (90%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/service/impl/DevAiProjectConfigServiceImpl.java (94%) rename yanzhu-jh/src/main/java/com/yanzhu/jh/{project => video}/service/impl/DevAiProjectDataServiceImpl.java (94%) rename yanzhu-jh/src/main/resources/mapper/{project => video}/DevAiProjectConfigMapper.xml (100%) rename yanzhu-jh/src/main/resources/mapper/{project => video}/DevAiProjectDataMapper.xml (79%) diff --git a/ruoyi-ui/src/views/project/aiBoxProjectData/index.vue b/ruoyi-ui/src/views/project/aiBoxProjectData/index.vue deleted file mode 100644 index 3ac86848..00000000 --- a/ruoyi-ui/src/views/project/aiBoxProjectData/index.vue +++ /dev/null @@ -1,417 +0,0 @@ - - - diff --git a/ruoyi-ui/src/views/project/aiBoxProjectConfig/index.vue b/ruoyi-ui/src/views/video/aiBoxProjectConfig/index.vue similarity index 100% rename from ruoyi-ui/src/views/project/aiBoxProjectConfig/index.vue rename to ruoyi-ui/src/views/video/aiBoxProjectConfig/index.vue diff --git a/ruoyi-ui/src/views/video/aiboxData/index.vue b/ruoyi-ui/src/views/video/aiboxData/index.vue new file mode 100644 index 00000000..aa02b17a --- /dev/null +++ b/ruoyi-ui/src/views/video/aiboxData/index.vue @@ -0,0 +1,256 @@ + + + diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java index 70a5feb5..47fad29d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java @@ -3,11 +3,7 @@ package com.yanzhu.jh.project.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.SysRoleEnum; import com.ruoyi.system.service.ISysDeptService; -import com.yanzhu.jh.project.domain.SurProjectUnitInfo; -import com.yanzhu.jh.project.service.ISurProjectUnitInfoService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java index 934fd852..50596474 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectPlanController.java @@ -6,7 +6,6 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.yanzhu.jh.project.domain.vo.MajorPlanExport; -import com.yanzhu.jh.project.domain.vo.SurProjectBuildNodeDataExport; import com.yanzhu.jh.project.domain.vo.UrbanPlanExport; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java index 84174d2b..40f12886 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectWorkAttendanceController.java @@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.SysRoleEnum; -import com.ruoyi.common.utils.file.ImageUtils; import com.ruoyi.system.service.ISysDeptService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectConfigMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectConfigMapper.java index a02bf608..a36cd3f0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectConfigMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectConfigMapper.java @@ -1,7 +1,7 @@ package com.yanzhu.jh.project.mapper; import java.util.List; -import com.yanzhu.jh.project.domain.DevAiProjectConfig; +import com.yanzhu.jh.video.domain.DevAiProjectConfig; /** * 设备配置Mapper接口 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectDataMapper.java index 58d7d53a..015283ee 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/DevAiProjectDataMapper.java @@ -1,7 +1,7 @@ package com.yanzhu.jh.project.mapper; import java.util.List; -import com.yanzhu.jh.project.domain.DevAiProjectData; +import com.yanzhu.jh.video.domain.DevAiProjectData; /** * 设备数据Mapper接口 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java index d3cd5e17..e6bb4cf5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java @@ -1,10 +1,13 @@ package com.yanzhu.jh.publics; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.controller.BaseController; -import com.yanzhu.jh.project.domain.DevAiProjectData; -import com.yanzhu.jh.project.domain.vo.DevAiProjectDataVO; +import com.yanzhu.jh.video.domain.DevAiProjectDataVO; +import com.yanzhu.jh.video.service.IDevAiProjectDataService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -23,6 +26,9 @@ import java.util.Map; @RequestMapping("/publics/aiBox") public class AIBoxController extends BaseController { + @Autowired + private IDevAiProjectDataService devAiProjectDataService; + private static final Logger logger = LoggerFactory.getLogger("AIBoxController"); /** @@ -32,13 +38,12 @@ public class AIBoxController extends BaseController { public void list(@RequestBody Map dataMap) { try{ - List devAiProjectDataVOs = (List)dataMap.get("BehaviorResults"); - if(devAiProjectDataVOs!=null && devAiProjectDataVOs.size()>0){ - DevAiProjectDataVO devAiProjectDataVO = devAiProjectDataVOs.get(0); - - } + List> list = (List>)dataMap.get("BehaviorResults"); + DevAiProjectDataVO devAiProjectDataVO = JSON.parseObject(JSONObject.toJSONString(list.get(0)), DevAiProjectDataVO.class); + devAiProjectDataService.insertHttpDevAiProjectData(devAiProjectDataVO); }catch (Exception e){ logger.info("AiBox解析参数失败！！！"); + logger.info(dataMap.toString()); e.printStackTrace(); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/DevAiProjectConfigController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/DevAiProjectConfigController.java similarity index 95% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/DevAiProjectConfigController.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/DevAiProjectConfigController.java index b1d357c6..d6bea55c 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/DevAiProjectConfigController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/DevAiProjectConfigController.java @@ -1,4 +1,4 @@ -package com.yanzhu.jh.project.controller; +package com.yanzhu.jh.video.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -16,8 +16,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.yanzhu.jh.project.domain.DevAiProjectConfig; -import com.yanzhu.jh.project.service.IDevAiProjectConfigService; +import com.yanzhu.jh.video.domain.DevAiProjectConfig; +import com.yanzhu.jh.video.service.IDevAiProjectConfigService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/DevAiProjectDataController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/DevAiProjectDataController.java similarity index 81% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/DevAiProjectDataController.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/DevAiProjectDataController.java index b3fc3ad7..ee8bb0ae 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/DevAiProjectDataController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/DevAiProjectDataController.java @@ -1,7 +1,11 @@ -package com.yanzhu.jh.project.controller; +package com.yanzhu.jh.video.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.system.service.ISysDeptService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +20,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.yanzhu.jh.project.domain.DevAiProjectData; -import com.yanzhu.jh.project.service.IDevAiProjectDataService; +import com.yanzhu.jh.video.domain.DevAiProjectData; +import com.yanzhu.jh.video.service.IDevAiProjectDataService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; @@ -31,6 +35,9 @@ import com.ruoyi.common.core.page.TableDataInfo; @RequestMapping("/project/aiBoxProjectData") public class DevAiProjectDataController extends BaseController { + @Autowired + private ISysDeptService sysDeptService; + @Autowired private IDevAiProjectDataService devAiProjectDataService; @@ -42,6 +49,14 @@ public class DevAiProjectDataController extends BaseController public TableDataInfo list(DevAiProjectData devAiProjectData) { startPage(); + devAiProjectData.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(devAiProjectData.getNowRole())){ + devAiProjectData.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + devAiProjectData.setNowDept(Convert.toStr(getDeptId())); + } + devAiProjectData.setNowUser(Convert.toStr(getUserId())); + devAiProjectData.setNowUserName(getUsername()); List list = devAiProjectDataService.selectDevAiProjectDataList(devAiProjectData); return getDataTable(list); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/DevAiProjectConfig.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectConfig.java similarity index 99% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/DevAiProjectConfig.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectConfig.java index 064d37a7..2a16b2b5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/DevAiProjectConfig.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectConfig.java @@ -1,4 +1,4 @@ -package com.yanzhu.jh.project.domain; +package com.yanzhu.jh.video.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/DevAiProjectData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectData.java similarity index 95% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/DevAiProjectData.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectData.java index 80c51b50..d6c3cc73 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/DevAiProjectData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectData.java @@ -1,4 +1,4 @@ -package com.yanzhu.jh.project.domain; +package com.yanzhu.jh.video.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -24,10 +24,14 @@ public class DevAiProjectData extends BaseEntity @Excel(name = "项目主键") private Long projectId; + private String projectName; + /** 部门主键 */ @Excel(name = "部门主键") private Long deptId; + private String deptName; + /** 设备ID */ @Excel(name = "设备ID") private Long deviceId; @@ -137,7 +141,23 @@ public class DevAiProjectData extends BaseEntity @Excel(name = "数据状态") private String isDel; - public void setId(Long id) + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public void setId(Long id) { this.id = id; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/DevAiProjectDataVO.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectDataVO.java similarity index 99% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/DevAiProjectDataVO.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectDataVO.java index 0e4560d8..dc2d6740 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/DevAiProjectDataVO.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/DevAiProjectDataVO.java @@ -1,4 +1,4 @@ -package com.yanzhu.jh.project.domain.vo; +package com.yanzhu.jh.video.domain; import java.io.Serializable; import java.util.Date; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IDevAiProjectConfigService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/IDevAiProjectConfigService.java similarity index 93% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IDevAiProjectConfigService.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/IDevAiProjectConfigService.java index ee02c45e..66269fd0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IDevAiProjectConfigService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/IDevAiProjectConfigService.java @@ -1,7 +1,7 @@ -package com.yanzhu.jh.project.service; +package com.yanzhu.jh.video.service; import java.util.List; -import com.yanzhu.jh.project.domain.DevAiProjectConfig; +import com.yanzhu.jh.video.domain.DevAiProjectConfig; /** * 设备配置Service接口 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IDevAiProjectDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/IDevAiProjectDataService.java similarity index 90% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IDevAiProjectDataService.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/IDevAiProjectDataService.java index 287e216b..0e7a8c56 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/IDevAiProjectDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/IDevAiProjectDataService.java @@ -1,8 +1,8 @@ -package com.yanzhu.jh.project.service; +package com.yanzhu.jh.video.service; import java.util.List; -import com.yanzhu.jh.project.domain.DevAiProjectData; -import com.yanzhu.jh.project.domain.vo.DevAiProjectDataVO; +import com.yanzhu.jh.video.domain.DevAiProjectData; +import com.yanzhu.jh.video.domain.DevAiProjectDataVO; /** * 设备数据Service接口 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/DevAiProjectConfigServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectConfigServiceImpl.java similarity index 94% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/DevAiProjectConfigServiceImpl.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectConfigServiceImpl.java index 43c9ad3b..740e400b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/DevAiProjectConfigServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectConfigServiceImpl.java @@ -1,12 +1,12 @@ -package com.yanzhu.jh.project.service.impl; +package com.yanzhu.jh.video.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.DevAiProjectConfigMapper; -import com.yanzhu.jh.project.domain.DevAiProjectConfig; -import com.yanzhu.jh.project.service.IDevAiProjectConfigService; +import com.yanzhu.jh.video.domain.DevAiProjectConfig; +import com.yanzhu.jh.video.service.IDevAiProjectConfigService; import com.ruoyi.common.utils.SecurityUtils; /** * 设备配置Service业务层处理 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/DevAiProjectDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectDataServiceImpl.java similarity index 94% rename from yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/DevAiProjectDataServiceImpl.java rename to yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectDataServiceImpl.java index 82fa34e1..b7968a67 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/DevAiProjectDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectDataServiceImpl.java @@ -1,4 +1,4 @@ -package com.yanzhu.jh.project.service.impl; +package com.yanzhu.jh.video.service.impl; import java.util.Date; import java.util.List; @@ -8,15 +8,14 @@ import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.MultipartFileUtils; -import com.yanzhu.jh.project.domain.vo.DevAiProjectDataVO; +import com.yanzhu.jh.video.domain.DevAiProjectDataVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.DevAiProjectDataMapper; -import com.yanzhu.jh.project.domain.DevAiProjectData; -import com.yanzhu.jh.project.service.IDevAiProjectDataService; -import com.ruoyi.common.utils.SecurityUtils; +import com.yanzhu.jh.video.domain.DevAiProjectData; +import com.yanzhu.jh.video.service.IDevAiProjectDataService; import org.springframework.web.multipart.MultipartFile; /** @@ -79,7 +78,7 @@ public class DevAiProjectDataServiceImpl implements IDevAiProjectDataService @Override public void insertHttpDevAiProjectData(DevAiProjectDataVO devAiProjectDataVO) { - logger.info("上报消息解析成功！！开始转换实体！！！"); + logger.info("AiBox消息解析成功！！开始转换实体！！！"); DevAiProjectData devAiProjectData = new DevAiProjectData(); devAiProjectData.setDeviceId(devAiProjectDataVO.getDeviceId()); /** 设备名称 */ @@ -133,7 +132,7 @@ public class DevAiProjectDataServiceImpl implements IDevAiProjectDataService logger.info("实体转换成功！！Base64开始转换图片！！！"); String objImg64 = devAiProjectDataVO.getBigImage().get("Image").toString(); try { - MultipartFile file = MultipartFileUtils.base64ToMultipartFile(objImg64); + MultipartFile file = MultipartFileUtils.base64ToMultipartFile("data:image/png;base64,"+objImg64); // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); // 上传并返回新文件名称 diff --git a/yanzhu-jh/src/main/resources/mapper/project/DevAiProjectConfigMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/DevAiProjectConfigMapper.xml similarity index 100% rename from yanzhu-jh/src/main/resources/mapper/project/DevAiProjectConfigMapper.xml rename to yanzhu-jh/src/main/resources/mapper/video/DevAiProjectConfigMapper.xml diff --git a/yanzhu-jh/src/main/resources/mapper/project/DevAiProjectDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml similarity index 79% rename from yanzhu-jh/src/main/resources/mapper/project/DevAiProjectDataMapper.xml rename to yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml index b6b91451..385b330c 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/DevAiProjectDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml @@ -7,7 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -39,23 +41,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, project_id, dept_id, device_id, device_name, device_addr0, device_addr1, serial_number, ipc_serial_num, ipc_addr, image_url, channel_id, channel_name, alarm_type, alarm_id, report_rate, timestamp, left_top_x, left_top_y, right_btm_x, right_btm_y, person_num, in_num, out_num, plate_no, value_type, alarm_videoURL, alarm_video_name, compare_result, create_time, is_del from dev_ai_project_data + select dapd.id, dapd.project_id, sp.projectName, dapd.dept_id, sd.dept_name as deptName, dapd.device_id, dapd.device_name, dapd.device_addr0, dapd.device_addr1, dapd.serial_number, dapd.ipc_serial_num, dapd.ipc_addr, dapd.image_url, dapd.channel_id, dapd.channel_name, dapd.alarm_type, dapd.alarm_id, dapd.report_rate, dapd.timestamp, dapd.left_top_x, dapd.left_top_y, dapd.right_btm_x, dapd.right_btm_y, dapd.person_num, dapd.in_num, dapd.out_num, dapd.plate_no, dapd.value_type, dapd.alarm_videoURL, dapd.alarm_video_name, dapd.compare_result, dapd.create_time, dapd.is_del from dev_ai_project_data dapd + left join sur_project sp on sp.id=dapd.project_id + left join sys_dept sd on sd.dept_id=dapd.dept_id