diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketController.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketController.java index a2778e40e..ede9736d4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketController.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketController.java @@ -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 operateWorkTicket(@RequestBody OperateWorkTicketDto workTicketDto) { + try { + workTicketService.operateWorkTicket(workTicketDto); + } catch (OpenPromptException e) { + Result data = new Result<>(); + data.setCode(1); + data.setMessage(e.getMessage()); + return Result.success(data); + } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItem.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItem.java index d3010d17d..d3ee2fd07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItem.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItem.java @@ -153,5 +153,9 @@ public class PoliceCameraItem implements Serializable { */ @ApiModelProperty(value = "默认码流类型：1、子码流，2、主码流，默认子码流") private Integer defaultStreamType; - + /** + * 封面路径 + */ + @ApiModelProperty(value = "封面路径") + private java.lang.String coverUrl; } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java index be65ec9f1..2bdaa5df0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicket.java @@ -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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/CountWorkTicketVo.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/CountWorkTicketVo.java index 3e54e5e9e..13a517c6a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/CountWorkTicketVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/CountWorkTicketVo.java @@ -17,4 +17,8 @@ public class CountWorkTicketVo { //暂停中 @ApiModelProperty("暂停中") private Integer pause; + //施工中高风险数量 + @ApiModelProperty("施工中高风险数量") + private Integer highRikeIngNum; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemVo.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemVo.java index d0f916803..50c44da6e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/PoliceCameraItemVo.java @@ -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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketMapper.xml b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketMapper.xml index f893e4ff6..9b918cf25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketMapper.xml @@ -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 diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java index c37e8a486..ceaef1b3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java @@ -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 queryPageList(HashMap param) { @@ -131,9 +136,18 @@ public class PoliceCameraItemServiceImpl extends ServiceImpl o1)); Map userMap = systemUserService.list(new LambdaQueryWrapper() .eq(SystemUser::getSn, projectSn)).stream().collect(Collectors.toMap(SystemUser::getUserId, Function.identity(), (o1, o2) -> o1)); + Map regionMap = qualityRegionService.list(new LambdaQueryWrapper() + .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; diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java index 55be9f36a..7f5f833cd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java @@ -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;