admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-04-26 10:56:20 +08:00
parent d5bc1c95ee
commit 023671f570
4 changed files with 72 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<List<QualityRegion>> selectQualityRegionList(@RequestBody Map<String, Object> map) {
return Result.success(qualityRegionService.selectQualityRegionList(map));
}
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
*/
@OperLog(operModul = "质量管理", operType = "添加质量—检查部位", operDesc = "添加质量—检查部位")
@ApiOperation(value = "添加质量—检查部位信息", notes = "添加质量—检查部位信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<QualityRegion> add(@RequestBody QualityRegion qualityRegion) {
public Result<QualityRegion> 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<QualityRegion> edit(@RequestBody QualityRegion qualityRegion) {
qualityRegionService.edit(qualityRegion);
return Result.ok();
}
@OperLog(operModul = "质量管理", operType = "编辑质量—检查部位", operDesc = "编辑质量—检查部位")
@ApiOperation(value = "编辑质量—检查部位信息", notes = "编辑质量—检查部位信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<QualityRegion> 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<QualityRegion> delete(@RequestBody Map<String,Object> map) {
public Result<QualityRegion> delete(@RequestBody Map<String, Object> 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<QualityRegion> queryById(@RequestBody Map<String,Object> map) {
Result<QualityRegion> result = new Result<QualityRegion>();
QualityRegion qualityRegion = qualityRegionService.getById(MapUtils.getString(map,"id"));
if(qualityRegion==null) {
public Result<QualityRegion> queryById(@RequestBody Map<String, Object> map) {
Result<QualityRegion> result = new Result<QualityRegion>();
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;
}
}

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

@ -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);

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

@ -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<>();

15
src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java
View File

@ -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);