diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java index 64db7fd..cbdf736 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -1,19 +1,19 @@ package com.casic.missiles.modular.cwscase.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.cwscase.model.VideoCase; -import com.casic.missiles.modular.cwscase.service.ICwsCaseService; import com.casic.missiles.modular.cwscase.service.IVideoCaseService; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/videoCase") -public class VideoController { +public class VideoController extends BaseController { private final IVideoCaseService videoCaseService; @@ -30,10 +30,22 @@ if (ToolUtil.isEmpty(videoCaseId)) { return ResponseData.error("视频案卷ID不能为空"); } - if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId, videoCaseId)) { return ResponseData.success(); } else { return ResponseData.error("服务器异常"); } } + + + @GetMapping(value = "/listPage") + public Object listPage(VideoCase videoCase) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(videoCase.getCaseStatus())) { + query.eq("case_status", videoCase.getCaseStatus()); + } + page = videoCaseService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } } \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java index 64db7fd..cbdf736 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -1,19 +1,19 @@ package com.casic.missiles.modular.cwscase.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.cwscase.model.VideoCase; -import com.casic.missiles.modular.cwscase.service.ICwsCaseService; import com.casic.missiles.modular.cwscase.service.IVideoCaseService; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/videoCase") -public class VideoController { +public class VideoController extends BaseController { private final IVideoCaseService videoCaseService; @@ -30,10 +30,22 @@ if (ToolUtil.isEmpty(videoCaseId)) { return ResponseData.error("视频案卷ID不能为空"); } - if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId, videoCaseId)) { return ResponseData.success(); } else { return ResponseData.error("服务器异常"); } } + + + @GetMapping(value = "/listPage") + public Object listPage(VideoCase videoCase) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(videoCase.getCaseStatus())) { + query.eq("case_status", videoCase.getCaseStatus()); + } + page = videoCaseService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } } \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java index cf6ad01..30fd2a5 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -47,7 +47,8 @@ */ @TableField("case_status") private Integer caseStatus; - + @TableField(exist = false) + private String caseStatusName; /** * 立案ID @@ -61,7 +62,8 @@ */ @TableField("case_sub_type") private String caseSubType; - + @TableField(exist = false) + private String caseSubTypeName; /** * 案卷备注信息 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java index 64db7fd..cbdf736 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -1,19 +1,19 @@ package com.casic.missiles.modular.cwscase.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.cwscase.model.VideoCase; -import com.casic.missiles.modular.cwscase.service.ICwsCaseService; import com.casic.missiles.modular.cwscase.service.IVideoCaseService; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/videoCase") -public class VideoController { +public class VideoController extends BaseController { private final IVideoCaseService videoCaseService; @@ -30,10 +30,22 @@ if (ToolUtil.isEmpty(videoCaseId)) { return ResponseData.error("视频案卷ID不能为空"); } - if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId, videoCaseId)) { return ResponseData.success(); } else { return ResponseData.error("服务器异常"); } } + + + @GetMapping(value = "/listPage") + public Object listPage(VideoCase videoCase) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(videoCase.getCaseStatus())) { + query.eq("case_status", videoCase.getCaseStatus()); + } + page = videoCaseService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } } \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java index cf6ad01..30fd2a5 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -47,7 +47,8 @@ */ @TableField("case_status") private Integer caseStatus; - + @TableField(exist = false) + private String caseStatusName; /** * 立案ID @@ -61,7 +62,8 @@ */ @TableField("case_sub_type") private String caseSubType; - + @TableField(exist = false) + private String caseSubTypeName; /** * 案卷备注信息 diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java index d0c69b6..8a8b39d 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java @@ -1,8 +1,11 @@ package com.casic.missiles.modular.cwscase.service.impl; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.core.common.exception.BizExceptionEnum; +import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.exception.GunsException; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.dao.VideoCaseMapper; @@ -27,9 +30,11 @@ @Service public class VideoCaseServiceImpl extends ServiceImpl implements IVideoCaseService { private final ICwsCaseService cwsCaseService; + private final ICommonPermissionService permissionService; - public VideoCaseServiceImpl(ICwsCaseService cwsCaseService) { + public VideoCaseServiceImpl(ICwsCaseService cwsCaseService, ICommonPermissionService permissionService) { this.cwsCaseService = cwsCaseService; + this.permissionService = permissionService; } @Transactional @@ -41,6 +46,10 @@ if (bzminis == null) { bzminis = 0; } + if (isNeedRevisit == null) { + isNeedRevisit = 0; + } + VideoCase videoCase = selectById(videoCaseId); if (ToolUtil.isNotEmpty(videoCase.getRegCaseId())) { GunsException error = new GunsException(BizExceptionEnum.SERVER_ERROR); @@ -51,6 +60,7 @@ cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId); videoCase.setRegCaseId(cwsCase.getId()); + videoCase.setCaseStatus(1); updateById(videoCase); return true; } @@ -62,6 +72,12 @@ cwsCase.setCasetypeDetailCode(caseTypeEnum.getSubType()); cwsCase.setSource(SourceEnum.VIDEO_MONITOR.getState()); + if (ToolUtil.isEmpty(cwsCase.getReporterName())) { + cwsCase.setReporterName("系统管理员"); + } + if (ToolUtil.isEmpty(cwsCase.getReporterPhone())) { + cwsCase.setReporterPhone("13500000000"); + } //设置图片路径 cwsCase.setFileIdVerify(res.getImgPath()); cwsCase.setDescription("视频推送-" + caseTypeEnum.getName()); @@ -74,4 +90,19 @@ //cwsCase.set } + + private void wrapVideoCase(VideoCase videoCase) { + String typeName = VideoCaseTypeEnum.typeOfCode(videoCase.getCaseSubType()).getName(); + videoCase.setCaseSubTypeName(typeName); + String statusName = permissionService.getDictNameByCode("videoCaseStatus", videoCase.getCaseStatus() + ""); + videoCase.setCaseStatusName(statusName); + } + + @Override + public Page selectPage(Page page, Wrapper wrapper) { + wrapper.orderBy("create_time desc"); + Page casePage = super.selectPage(page, wrapper); + casePage.getRecords().forEach(this::wrapVideoCase); + return casePage; + } }