执法记录仪修改
This commit is contained in:
parent
9cdc8edcbe
commit
fa4076b238
@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.zhgd.annotation.OperLog;
|
||||
import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.jeecg.common.execption.OpenPromptException;
|
||||
import com.zhgd.xmgl.modules.policecamera.entity.WorkTicket;
|
||||
import com.zhgd.xmgl.modules.policecamera.entity.dto.OperateWorkTicketDto;
|
||||
import com.zhgd.xmgl.modules.policecamera.entity.dto.WorkTicketDto;
|
||||
@ -130,8 +131,15 @@ public class WorkTicketController {
|
||||
@OperLog(operModul = "工作票管理", operType = "", operDesc = "开始、暂停、继续、结束工作票")
|
||||
@ApiOperation(value = "开始、暂停、继续、结束工作票", notes = "开始、暂停、继续、结束工作票", httpMethod = "POST")
|
||||
@PostMapping(value = "/operateWorkTicket")
|
||||
public Result operateWorkTicket(@RequestBody OperateWorkTicketDto workTicketDto) {
|
||||
workTicketService.operateWorkTicket(workTicketDto);
|
||||
public Result<Result> operateWorkTicket(@RequestBody OperateWorkTicketDto workTicketDto) {
|
||||
try {
|
||||
workTicketService.operateWorkTicket(workTicketDto);
|
||||
} catch (OpenPromptException e) {
|
||||
Result<Object> data = new Result<>();
|
||||
data.setCode(1);
|
||||
data.setMessage(e.getMessage());
|
||||
return Result.success(data);
|
||||
}
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
|
||||
@ -153,5 +153,9 @@ public class PoliceCameraItem implements Serializable {
|
||||
*/
|
||||
@ApiModelProperty(value = "默认码流类型：1、子码流，2、主码流，默认子码流")
|
||||
private Integer defaultStreamType;
|
||||
|
||||
/**
|
||||
* 封面路径
|
||||
*/
|
||||
@ApiModelProperty(value = "封面路径")
|
||||
private java.lang.String coverUrl;
|
||||
}
|
||||
|
||||
@ -130,4 +130,9 @@ public class WorkTicket implements Serializable {
|
||||
*/
|
||||
@ApiModelProperty(value = "班组ids")
|
||||
private java.lang.String teamIds;
|
||||
/**
|
||||
* 风险类型：1:一般风险;2:高风险;
|
||||
*/
|
||||
@ApiModelProperty(value = "风险类型：1:一般风险;2:高风险;")
|
||||
private java.lang.Integer riskType;
|
||||
}
|
||||
|
||||
@ -17,4 +17,8 @@ public class CountWorkTicketVo {
|
||||
//暂停中
|
||||
@ApiModelProperty("暂停中")
|
||||
private Integer pause;
|
||||
//施工中高风险数量
|
||||
@ApiModelProperty("施工中高风险数量")
|
||||
private Integer highRikeIngNum;
|
||||
|
||||
}
|
||||
|
||||
@ -28,4 +28,24 @@ public class PoliceCameraItemVo extends PoliceCameraItem {
|
||||
*/
|
||||
@ApiModelProperty(value = "分组名称")
|
||||
private String groupName;
|
||||
/**
|
||||
* 未结束的工作票id
|
||||
*/
|
||||
@ApiModelProperty(value = "未结束的工作票id")
|
||||
private java.lang.Long workTicketId;
|
||||
/**
|
||||
* 未结束的工作票编号
|
||||
*/
|
||||
@ApiModelProperty(value = "未结束的工作票编号")
|
||||
private java.lang.String workTicketNumber;
|
||||
/**
|
||||
* 未结束的施工场站s（多个,分割）
|
||||
*/
|
||||
@ApiModelProperty(value = "未结束的施工场站s（多个,分割）")
|
||||
private java.lang.String constructionAreas;
|
||||
/**
|
||||
* 施工区域名称s（多个,分割）
|
||||
*/
|
||||
@ApiModelProperty(value = "施工区域名称s（多个,分割）")
|
||||
private java.lang.String constructionAreaNames;
|
||||
}
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
,ifnull(sum(if(t.status=2,1,0)),0) as ing
|
||||
,ifnull(sum(if(t.status=3,1,0)),0) as pause
|
||||
,ifnull(sum(if(t.status=4,1,0)),0) as done
|
||||
,ifnull(sum(if(t.risk_type=2 and t.status=2,1,0)),0) as highRikeIngNum
|
||||
from work_ticket t
|
||||
where 1=1
|
||||
<if test="projectSn != null and projectSn != ''">
|
||||
|
||||
@ -36,6 +36,8 @@ import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraGroupService;
|
||||
import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraItemService;
|
||||
import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraVideoConfigService;
|
||||
import com.zhgd.xmgl.modules.policecamera.service.IWorkTicketCameraRelService;
|
||||
import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
|
||||
import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
|
||||
import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
|
||||
import com.zhgd.xmgl.modules.video.mapper.ProjectVideoHkVqdMapper;
|
||||
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
||||
@ -94,6 +96,9 @@ public class PoliceCameraItemServiceImpl extends ServiceImpl<PoliceCameraItemMap
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IPoliceCameraGroupService policeCameraGroupService;
|
||||
@Lazy
|
||||
@Autowired
|
||||
private IQualityRegionService qualityRegionService;
|
||||
|
||||
@Override
|
||||
public IPage<PoliceCameraItemVo> queryPageList(HashMap<String, Object> param) {
|
||||
@ -131,9 +136,18 @@ public class PoliceCameraItemServiceImpl extends ServiceImpl<PoliceCameraItemMap
|
||||
.eq(WorkerInfo::getProjectSn, projectSn)).stream().collect(Collectors.toMap(WorkerInfo::getId, Function.identity(), (o1, o2) -> o1));
|
||||
Map<Long, SystemUser> userMap = systemUserService.list(new LambdaQueryWrapper<SystemUser>()
|
||||
.eq(SystemUser::getSn, projectSn)).stream().collect(Collectors.toMap(SystemUser::getUserId, Function.identity(), (o1, o2) -> o1));
|
||||
Map<Long, QualityRegion> regionMap = qualityRegionService.list(new LambdaQueryWrapper<QualityRegion>()
|
||||
.select(QualityRegion::getId, QualityRegion::getRegionName, QualityRegion::getProjectSn))
|
||||
.stream().collect(Collectors.toMap(QualityRegion::getId, Function.identity(), (o1, o2) -> o1));
|
||||
for (PoliceCameraItemVo itemVo : list) {
|
||||
itemVo.setPusherNames(StringUtils.isNotEmpty(itemVo.getPushers()) ? StrUtil.split(itemVo.getPushers(), ",").stream().map(id -> userMap.get(Convert.toLong(id))).filter(Objects::nonNull).map(SystemUser::getRealName).collect(Collectors.joining(",")) : "");
|
||||
itemVo.setUserNames(StringUtils.isNotEmpty(itemVo.getUsers()) ? StrUtil.split(itemVo.getUsers(), ",").stream().map(id -> workerInfoMap.get(Convert.toLong(id))).filter(Objects::nonNull).map(WorkerInfo::getWorkerName).collect(Collectors.joining(",")) : "");
|
||||
// 设置施工区域名称
|
||||
itemVo.setConstructionAreaNames(EntityUtils.convertIdsToNames(
|
||||
itemVo.getConstructionAreas(),
|
||||
regionMap,
|
||||
QualityRegion::getRegionName
|
||||
));
|
||||
}
|
||||
}
|
||||
return list;
|
||||
|
||||
@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||
import com.zhgd.jeecg.common.execption.OpenPromptException;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.xmgl.call.api.PoliceCameraManufacturer;
|
||||
import com.zhgd.xmgl.call.factory.PoliceCameraManufacturerFactory;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user