bug修改

src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java

@@ -2,7 +2,6 @@ package com.zhgd.xmgl.modules.quality.controller;
 
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
-import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
 import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
 import com.zhgd.xmgl.util.MessageUtil;
@@ -12,7 +11,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
@@ -33,20 +35,25 @@ public class QualityRegionController {
     @Autowired
     private IQualityRegionService qualityRegionService;
 
-	/**
+
-	 * 分页列表查询
+    @ApiOperation(value = "tree列表查询质量—检查部位信息", notes = "tree列表查询质量—检查部位信息", httpMethod = "POST")
-	 *
-	 * @return
-	 */
-	@ApiOperation(value = "分页列表查询质量—检查部位信息", notes = "分页列表查询质量—检查部位信息", httpMethod = "POST")
     @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String")
     @PostMapping(value = "/list")
     public Result<List<QualityRegion>> selectQualityRegionList(@RequestBody Map<String, Object> map) {
         return Result.success(qualityRegionService.selectQualityRegionList(map));
     }
 
+    @ApiOperation(value = "列表查询质量—检查部位信息", notes = "列表查询质量—检查部位信息", httpMethod = "POST")
+    @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String")
+    @PostMapping(value = "/notTreeList")
+    public Result<List<QualityRegion>> selectQualityRegionNotTreeList(@RequestBody Map<String, Object> map) {
+        return Result.success(qualityRegionService.selectQualityRegionNotTreeList(map));
+    }
+
+
     /**
      * 添加
+     *
      * @param qualityRegion
      * @return
      */
@@ -60,11 +67,12 @@ public class QualityRegionController {
 
     /**
      * 编辑
+     *
      * @param qualityRegion
      * @return
      */
-    @OperLog(operModul = "质量管理",operType = "编辑质量—检查部位",operDesc = "编辑质量—检查部位")
+    @OperLog(operModul = "质量管理", operType = "编辑质量—检查部位", operDesc = "编辑质量—检查部位")
-	@ApiOperation(value = "编辑质量—检查部位信息", notes = "编辑质量—检查部位信息" , httpMethod="POST")
+    @ApiOperation(value = "编辑质量—检查部位信息", notes = "编辑质量—检查部位信息", httpMethod = "POST")
     @PostMapping(value = "/edit")
     public Result<QualityRegion> edit(@RequestBody QualityRegion qualityRegion) {
         qualityRegionService.edit(qualityRegion);
@@ -73,14 +81,15 @@ public class QualityRegionController {
 
     /**
      * 通过id删除
+     *
      * @param
      * @return
      */
-    @OperLog(operModul = "质量管理",operType = "删除质量—检查部位",operDesc = "删除质量—检查部位")
+    @OperLog(operModul = "质量管理", operType = "删除质量—检查部位", operDesc = "删除质量—检查部位")
     @ApiOperation(value = "删除质量—检查部位信息", notes = "删除质量—检查部位信息", httpMethod = "POST")
     @ApiImplicitParam(name = "id", value = "质量—检查部位ID", paramType = "body", required = true, dataType = "Integer")
     @PostMapping(value = "/delete")
-	public Result<QualityRegion> delete(@RequestBody Map<String,Object> map) {
+    public Result<QualityRegion> delete(@RequestBody Map<String, Object> map) {
         qualityRegionService.deleteQualityRegion(map);
         return Result.ok();
     }
@@ -88,18 +97,19 @@ public class QualityRegionController {
 
     /**
      * 通过id查询
+     *
      * @param
      * @return
      */
     @ApiOperation(value = "通过id查询质量—检查部位信息", notes = "通过id查询质量—检查部位信息", httpMethod = "POST")
     @ApiImplicitParam(name = "id", value = "质量—检查部位ID", paramType = "body", required = true, dataType = "Integer")
     @PostMapping(value = "/queryById")
-	public Result<QualityRegion> queryById(@RequestBody Map<String,Object> map) {
+    public Result<QualityRegion> queryById(@RequestBody Map<String, Object> map) {
         Result<QualityRegion> result = new Result<QualityRegion>();
-		QualityRegion qualityRegion = qualityRegionService.getById(MapUtils.getString(map,"id"));
+        QualityRegion qualityRegion = qualityRegionService.getById(MapUtils.getString(map, "id"));
-		if(qualityRegion==null) {
+        if (qualityRegion == null) {
             result.error500(MessageUtil.get("notFindErr"));
-		}else {
+        } else {
             result.setResult(qualityRegion);
             result.setSuccess(true);
         }
@@ -107,5 +117,4 @@ public class QualityRegionController {
     }
 
 
-
 }

src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java

@@ -17,6 +17,8 @@ public interface IQualityRegionService extends IService<QualityRegion> {
 
     List<QualityRegion> selectQualityRegionList(Map<String, Object> map);
 
+    List<QualityRegion> selectQualityRegionNotTreeList(Map<String, Object> map);
+
     void addQualityRegion(QualityRegion qualityRegion);
 
     void deleteQualityRegion(Map<String, Object> map);

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

@@ -7,7 +7,6 @@ import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
 import com.zhgd.xmgl.modules.quality.mapper.QualityRegionMapper;
 import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
-import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
 import com.zhgd.xmgl.util.ListUtils;
 import com.zhgd.xmgl.util.MessageUtil;
 import org.apache.commons.collections.MapUtils;
@@ -35,6 +34,11 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
         return ListUtils.buildTreeByMap(list, "id", "parentRegion", "children", 0L);
     }
 
+    @Override
+    public List<QualityRegion> selectQualityRegionNotTreeList(Map<String, Object> map) {
+        return qualityRegionMapper.selectQualityRegionList(map);
+    }
+
     private List<QualityRegion> groupList(List<QualityRegion> list, List<QualityRegion> childList) {
         for (QualityRegion map1 : list) {
             List<QualityRegion> tempList = new ArrayList<>();

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

@@ -44,6 +44,13 @@ public class HikVideoUtil {
 
         if (EnvironmentUtil.getActiveEnvironment().equals("xingzong")) {
             log.info("callPostApiGetPreviewURL，xingzong环境");
+            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");
+        } else {
             paramMap.put("cameraIndexCode", cameraIndexCode);
             //1:子码流，0:主码流
             if (streamType == null) {
@@ -55,14 +62,6 @@ public class HikVideoUtil {
             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");
-
         }
         String body = JSON.toJSON(paramMap).toString();
         log.info("callPostApiGetPreviewURL body:{}", body);