diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java index db63543fe..1fb90e229 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java +++ b/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; @@ -22,7 +24,7 @@ import java.util.Map; * @Title: Controller * @Description: 质量—检查部位 * @author: pds - * @date: 2020-10-21 + * @date: 2020-10-21 * @version: V1.0 */ @RestController @@ -30,82 +32,89 @@ import java.util.Map; @Slf4j @Api(tags = "质量—检查部位") public class QualityRegionController { - @Autowired - private IQualityRegionService qualityRegionService; + @Autowired + private IQualityRegionService qualityRegionService; - /** - * 分页列表查询 - * - * @return - */ - @ApiOperation(value = "分页列表查询质量—检查部位信息", notes = "分页列表查询质量—检查部位信息", httpMethod = "POST") + + @ApiOperation(value = "tree列表查询质量—检查部位信息", notes = "tree列表查询质量—检查部位信息", httpMethod = "POST") @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/list") - public Result> selectQualityRegionList(@RequestBody Map map) { - return Result.success(qualityRegionService.selectQualityRegionList(map)); - } + public Result> selectQualityRegionList(@RequestBody Map 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> selectQualityRegionNotTreeList(@RequestBody Map map) { + return Result.success(qualityRegionService.selectQualityRegionNotTreeList(map)); + } + /** - * 添加 + * 添加 + * * @param qualityRegion * @return */ @OperLog(operModul = "质量管理", operType = "添加质量—检查部位", operDesc = "添加质量—检查部位") @ApiOperation(value = "添加质量—检查部位信息", notes = "添加质量—检查部位信息", httpMethod = "POST") @PostMapping(value = "/add") - public Result add(@RequestBody QualityRegion qualityRegion) { + public Result add(@RequestBody QualityRegion qualityRegion) { qualityRegionService.addQualityRegion(qualityRegion); - return Result.ok(); - } + return Result.ok(); + } /** - * 编辑 + * 编辑 + * * @param qualityRegion * @return */ - @OperLog(operModul = "质量管理",operType = "编辑质量—检查部位",operDesc = "编辑质量—检查部位") - @ApiOperation(value = "编辑质量—检查部位信息", notes = "编辑质量—检查部位信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody QualityRegion qualityRegion) { - qualityRegionService.edit(qualityRegion); - return Result.ok(); - } + @OperLog(operModul = "质量管理", operType = "编辑质量—检查部位", operDesc = "编辑质量—检查部位") + @ApiOperation(value = "编辑质量—检查部位信息", notes = "编辑质量—检查部位信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody QualityRegion qualityRegion) { + qualityRegionService.edit(qualityRegion); + return Result.ok(); + } /** - * 通过id删除 - * @param - * @return - */ - @OperLog(operModul = "质量管理",operType = "删除质量—检查部位",operDesc = "删除质量—检查部位") + * 通过id删除 + * + * @param + * @return + */ + @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 delete(@RequestBody Map map) { + public Result delete(@RequestBody Map map) { qualityRegionService.deleteQualityRegion(map); - return Result.ok(); - } + return Result.ok(); + } /** - * 通过id查询 - * @param - * @return - */ + * 通过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 queryById(@RequestBody Map map) { - Result result = new Result(); - QualityRegion qualityRegion = qualityRegionService.getById(MapUtils.getString(map,"id")); - if(qualityRegion==null) { + public Result queryById(@RequestBody Map map) { + Result result = new Result(); + QualityRegion qualityRegion = qualityRegionService.getById(MapUtils.getString(map, "id")); + if (qualityRegion == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - result.setResult(qualityRegion); - result.setSuccess(true); - } - return result; - } - + } else { + result.setResult(qualityRegion); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java index f510c4abf..c874f98cc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java @@ -17,6 +17,8 @@ public interface IQualityRegionService extends IService { List selectQualityRegionList(Map map); + List selectQualityRegionNotTreeList(Map map); + void addQualityRegion(QualityRegion qualityRegion); void deleteQualityRegion(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java index 37876e099..d1d3ce2d6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java +++ b/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 selectQualityRegionNotTreeList(Map map) { + return qualityRegionMapper.selectQualityRegionList(map); + } + private List groupList(List list, List childList) { for (QualityRegion map1 : list) { List tempList = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java b/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java index ea2e8baf4..6b7fc55e2 100644 --- a/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java +++ b/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);