From 865baee5bc71bd9a72480ef6f010b1ee208f0e25 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 26 Apr 2024 19:45:39 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/mybatis/DataScopeHandler.java    |  3 +++
 .../modules/car/mapper/CarInfoMapper.java     |  2 ++
 .../xml/QualityInspectionRecordMapper.xml     |  2 +-
 ...AnalyseHardWareAlarmRecordServiceImpl.java | 22 ++++++++++++++++---
 .../mapper/WorkerInfoAuditRecordMapper.java   |  2 ++
 .../xmgl/modules/xz/entity/XzMaterial.java    |  6 +++++
 .../modules/xz/mapper/XzMaterialMapper.java   |  2 ++
 7 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
index 60d4549cf..2167c703e 100644
--- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
+++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
@@ -91,6 +91,9 @@ public class DataScopeHandler implements DataPermissionHandler {
         tables.put("enterprise_info", "id");
         tables.put("quality_inspection_record", "enterprise_id");
         tables.put("hidden_danger_inspection_record", "enterprise_id");
+        tables.put("worker_info_audit_record", "enterprise_id");
+        tables.put("car_info", "enterprise_id");
+        tables.put("xz_material", "enterprise_id");
         return tables;
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
index c6ff2d97b..7fef19182 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.DataScope;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version： V1.0
  */
 @Mapper
+@DataScope
 public interface CarInfoMapper extends BaseMapper<CarInfo> {
 
     List<EntityMap> selectCarList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
index 974ffba38..0de5dae48 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
@@ -276,7 +276,7 @@
         </if>
     </select>
     <select id="selectInspectTaskCount" resultType="java.util.Map">
-        SELECT IFNULL(SUM((CASE WHEN status = 1 or status = 4 THEN 1 ELSE 0 END)), 0) closeNum,
+        SELECT IFNULL(SUM((CASE WHEN status = 1 or status = 5 THEN 1 ELSE 0 END)), 0) closeNum,
                IFNULL(SUM((CASE WHEN status = 2 THEN 1 ELSE 0 END)), 0)               rectifyNum,
                IFNULL(SUM((CASE WHEN status = 3 THEN 1 ELSE 0 END)), 0)               reviewNum,
                IFNULL(SUM((CASE WHEN status = 4 THEN 1 ELSE 0 END)), 0)               checkNum
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
index cd099e37b..b28a0fb52 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.xuyanwu.spring.file.storage.FileInfo;
+import cn.xuyanwu.spring.file.storage.FileStorageService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,11 +44,14 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.JinqianmaoUtil;
 import com.zhgd.xmgl.util.MessageUtil;
+import com.zhgd.xmgl.util.UrlUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -90,6 +94,11 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
     @Resource
     private CompanyConfigMapper companyConfigMapper;
 
+    @Value("${serverUrl}")
+    private String serverUrl;
+
+    @Resource
+    private FileStorageService fileStorageService;
 
     @Override
     public IPage<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map) {
@@ -161,17 +170,24 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
         aiAnalyseHardWareAlarmRecord.setAlarmType(Integer.parseInt(body.getString("eventId")));
         aiAnalyseHardWareAlarmRecord.setHardwareId(aiAnalyseHardWareRecord.getHardwareId());
         aiAnalyseHardWareAlarmRecord.setHardwareName(aiAnalyseHardWareRecord.getHardwareName());
-        aiAnalyseHardWareAlarmRecord.setAlarmVideo(body.getString("alarmVideo"));
+        String alarmVideo = body.getString("alarmVideo");
+        alarmVideo = alarmVideo.split(":")[2];
+        alarmVideo = alarmVideo.substring(alarmVideo.indexOf("/"));
+        FileInfo alarmVideoInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmVideo)).setPath(DateUtil.today()).upload();
+        aiAnalyseHardWareAlarmRecord.setAlarmVideo(alarmVideoInfo.getUrl());
         aiAnalyseHardWareAlarmRecord.setProjectSn(aiAnalyseHardWareRecord.getProjectSn());
         aiAnalyseHardWareAlarmRecord.setStatus(1);
-        aiAnalyseHardWareAlarmRecord.setImageUrl(body.getString("alarmImage"));
+        String alarmImage = body.getString("alarmImage");
+        alarmImage = alarmImage.split(":")[2];
+        alarmImage = alarmImage.substring(alarmImage.indexOf("/"));
+        FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmImage)).setPath(DateUtil.today()).upload();
+        aiAnalyseHardWareAlarmRecord.setImageUrl(alarmImageInfo.getUrl());
         aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc"));
         aiAnalyseHardWareAlarmRecordMapper.insert(aiAnalyseHardWareAlarmRecord);
         //将数据通过MQTT转发到前台
         asyncAiAnalyse.sendAiAnalyse(aiAnalyseHardWareAlarmRecord);
     }
 
-
     @Override
     public List<AiAnalyseHardWareAlarmTrendVo> selectAiAnalyseHardWareAlarmTrendList(Map<String, Object> map) {
         List<String> dayList;
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java
index 255c4ac8c..f2e630c69 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.DataScope;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version： V1.0
  */
 @Mapper
+@DataScope
 public interface WorkerInfoAuditRecordMapper extends BaseMapper<WorkerInfoAuditRecord> {
 
     List<EntityMap> selectWorkerInfoAuditList(Page<EntityMap> page, @Param("param")Map<String, Object> map);
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
index 015aeacbb..b598209bc 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
@@ -51,6 +51,12 @@ public class XzMaterial implements Serializable {
     @Excel(name = "项目sn", width = 15)
     @ApiModelProperty(value = "项目sn")
     private String projectSn;
+    /**
+     * 企业id
+     */
+    @Excel(name = "企业id", width = 15)
+    @ApiModelProperty(value = "企业id")
+    private String enterpriseId;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "项目sn")
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzMaterialMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzMaterialMapper.java
index ea6c644bd..35e343f7b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzMaterialMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzMaterialMapper.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.xz.mapper;
 
 import java.util.List;
 
+import com.zhgd.annotation.DataScope;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.zhgd.xmgl.modules.xz.entity.XzMaterial;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version： V1.0
  */
 @Mapper
+@DataScope
 public interface XzMaterialMapper extends BaseMapper<XzMaterial> {
 
 }