bug修改

src/main/java/com/zhgd/mybatis/DataScopeHandler.java

@@ -89,6 +89,8 @@ public class DataScopeHandler implements DataPermissionHandler {
         tables.put("xz_task_progress_alarm", "enterprise_id");
         tables.put("xz_task_progress", "enterprise_id");
         tables.put("enterprise_info", "id");
+        tables.put("quality_inspection_record", "enterprise_id");
+        tables.put("hidden_danger_inspection_record", "enterprise_id");
         return tables;
     }
 

src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java

@@ -205,6 +205,8 @@ public class HiddenDangerInspectRecord implements Serializable {
 
     @ApiModelProperty(value = "扣分数")
     private Double deductScore;
+    @ApiModelProperty(value = "合作单位id")
+    private Long enterpriseId;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "验收表验收任务-验收结果ID")

src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectRecordMapper.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.dangerous.mapper;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.DataScope;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
 import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
@@ -22,8 +23,10 @@ import java.util.Map;
  * @version： V1.0
  */
 @Mapper
+@DataScope
 public interface HiddenDangerInspectRecordMapper extends BaseMapper<HiddenDangerInspectRecord> {
 
+    @DataScope(includeTable = "hidden_danger_inspection_record")
     List<HiddenDangerInspectRecord> selectHiddenDangerInspectPage(Page<HiddenDangerInspectRecord> page, @Param("param") Map<String, Object> map);
 
     EntityMap selectHiddenDangerInspectRecordById(Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java

@@ -29,6 +29,7 @@ import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService
 import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectionStatisticsService;
 import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
 import com.zhgd.xmgl.modules.quality.service.impl.QualityInspectionRecordServiceImpl;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
 import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
@@ -67,7 +68,6 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
     private InspectHiddenDangerItemRecordMapper inspectHiddenDangerItemRecordMapper;
     @Autowired
     private WorkerInfoMapper workerInfoMapper;
-
     @Autowired
     private HiddenDangerInspectionStatisticsMapper hiddenDangerInspectionStatisticsMapper;
 
@@ -151,6 +151,12 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
             e.printStackTrace();
             throw new OpenAlertException("整改期限有误");
         }
+        String enterpriseSn = hiddenDangerInspectRecord.getEnterpriseSn();
+        if (StrUtil.isNotBlank(enterpriseSn)) {
+            EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>()
+                    .eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn));
+            hiddenDangerInspectRecord.setEnterpriseId(enterpriseInfo.getId());
+        }
         hiddenDangerInspectRecordMapper.insert(hiddenDangerInspectRecord);
         if (StringUtils.isNotEmpty(hiddenDangerInspectRecord.getCheckItemResultId())) {
             //验收任务添加隐患时候保存对应验收检查项

src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecord.java

@@ -241,6 +241,9 @@ public class QualityInspectionRecord implements Serializable {
     @TableField(value = "added_description")
     @ApiModelProperty(value = "问题补充描述")
     private String addedDescription;
+    @ApiModelProperty(value = "合作单位id")
+    private Long enterpriseId;
+
 
     /**
      * 分部工程名称

src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java

@@ -2,12 +2,14 @@ package com.zhgd.xmgl.modules.quality.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.DataScope;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
 import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
 import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
 import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto;
 import com.zhgd.xmgl.modules.quality.entity.vo.*;
+import lombok.Data;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,6 +24,7 @@ import java.util.Map;
  * @version： V1.0
  */
 @Mapper
+@DataScope(includeTable = "quality_inspection_record")
 public interface QualityInspectionRecordMapper extends BaseMapper<QualityInspectionRecord> {
 
     QualityInspectionRecordVo selectQualityInspectionRecordById(Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.quality.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -27,6 +28,8 @@ import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper;
 import com.zhgd.xmgl.modules.quality.mapper.QualityRectifyRecordMapper;
 import com.zhgd.xmgl.modules.quality.mapper.QualityRegionMapper;
 import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
+import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
 import com.zhgd.xmgl.util.JxlExcelUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -52,6 +55,8 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
     @Autowired
     private QualityRegionMapper qualityRegionMapper;
     @Autowired
+    private EnterpriseInfoMapper enterpriseInfoMapper;
+    @Autowired
     SanjiangDataCall sanjiangDataCall;
     @Autowired
     private QualityInspectionRecordMapper qualityInspectionRecordMapper;
@@ -209,6 +214,13 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
         if (Objects.equals(qualityInspectionRecord.getRecordType(), 2)) {
             qualityInspectionRecord.setStatus(5);
         }
+
+        String enterpriseSn = qualityInspectionRecord.getEnterpriseSn();
+        if (StrUtil.isNotBlank(enterpriseSn)) {
+            EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>()
+                    .eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn));
+            qualityInspectionRecord.setEnterpriseId(enterpriseInfo.getId());
+        }
         qualityInspectionRecordMapper.insert(qualityInspectionRecord);
         if (qualityInspectionRecord.getRecordType() == 1 && qualityInspectionRecord.getStatus() == 2) {
             noticeService.addUserNotice(qualityInspectionRecord.getChangeId(), "您有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "质量管理待整改", "11");

src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java

@@ -54,7 +54,6 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl<XzTaskProgress
         } else {
             taskProgress.setStatus(1);
         }
-        taskProgress.setProgressRatio(taskProgressContent.getProgressRatio());
         taskProgressMapper.updateById(taskProgress);
         String projectSn = taskProgress.getProjectSn();
         taskProgressContent.setProjectSn(projectSn);

src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java

@@ -41,19 +41,29 @@ public class HikVideoUtil {
         String url = null;
         final String getCamsApi = ARTEMIS_PATH + "/api/video/v2/cameras/previewURLs";
         Map<String, Object> paramMap = new HashMap<String, Object>();// post请求Form表单参数
-        paramMap.put("cameraIndexCode", cameraIndexCode);
+
-        //1:子码流，0:主码流
+        if (EnvironmentUtil.getActiveEnvironment().equals("xingzong")) {
-        if (streamType == null) {
+            log.info("callPostApiGetPreviewURL，xingzong环境");
-            streamType = 1;
+            paramMap.put("cameraIndexCode", cameraIndexCode);
+            //1:子码流，0:主码流
+            if (streamType == null) {
+                streamType = 1;
+            }
+            if (streamType == 2) {
+                streamType = 0;
+            }
+            paramMap.put("streamType", streamType);
+            paramMap.put("protocol", StringUtils.isNotEmpty(type) ? type : "hls");
+            paramMap.put("expand", "streamform=rtp");
+        } else {
+            paramMap.put("cameraIndexCode", cameraIndexCode);
+            paramMap.put("streamType", 0);
+            paramMap.put("protocol", "rtsp");
+            paramMap.put("expand", "transcode=0");
+            paramMap.put("transmode", 1);
+            paramMap.put("streamform", "rtp");
+
         }
-        if (streamType == 2) {
-            streamType = 0;
-        }
-        paramMap.put("streamType", streamType);
-        paramMap.put("protocol", StringUtils.isNotEmpty(type) ? type : "hls");
-        paramMap.put("expand", "transcode=0");
-        paramMap.put("transmode", 1);
-        paramMap.put("streamform", "rtp");
         String body = JSON.toJSON(paramMap).toString();
         log.info("callPostApiGetPreviewURL body:{}", body);
         Map<String, String> path = new HashMap<String, String>(2) {