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 17355d2..d0c69b6 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
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.exception.BizExceptionEnum;
+import com.casic.missiles.core.exception.GunsException;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.dao.VideoCaseMapper;
import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo;
import com.casic.missiles.modular.cwscase.enums.VideoCaseTypeEnum;
@@ -31,27 +34,44 @@
@Transactional
@Override
- public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId) {
+ public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) {
+ if (bzhours == null) {
+ bzhours = 0;
+ }
+ if (bzminis == null) {
+ bzminis = 0;
+ }
VideoCase videoCase = selectById(videoCaseId);
- covertCase(cwsCase,videoCase);
- return cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId);
+ if (ToolUtil.isNotEmpty(videoCase.getRegCaseId())) {
+ GunsException error = new GunsException(BizExceptionEnum.SERVER_ERROR);
+ error.setMessage("该案卷已立案,不可重复受理!");
+ throw error;
+ }
+ covertCase(cwsCase, videoCase);
+
+ cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId);
+ videoCase.setRegCaseId(cwsCase.getId());
+ updateById(videoCase);
+ return true;
}
private void covertCase(CwsCase cwsCase, VideoCase res) {
- VideoCaseTypeEnum caseTypeEnum = VideoCaseTypeEnum.typeOfCode(res.getCaseSubType());
+ VideoCaseTypeEnum caseTypeEnum = VideoCaseTypeEnum.typeOfCode(res.getCaseSubType());
cwsCase.setEorc(caseTypeEnum.getEroc());
cwsCase.setCasetypeCode(caseTypeEnum.getType());
cwsCase.setCasetypeDetailCode(caseTypeEnum.getSubType());
cwsCase.setSource(SourceEnum.VIDEO_MONITOR.getState());
+
//设置图片路径
cwsCase.setFileIdVerify(res.getImgPath());
- cwsCase.setDescription("视频推送-"+caseTypeEnum.getName());
+ cwsCase.setDescription("视频推送-" + caseTypeEnum.getName());
cwsCase.setAreaCode("361024");
cwsCase.setStreetCode("36124100");
cwsCase.setCommunityCode("1");
cwsCase.setGridId(361024100801L);
BusDeviceInfo busDeviceInfo = baseMapper.getDeviceInfoByVideoId(res.getVideoId());
cwsCase.setFieldintro(busDeviceInfo.getDetailLocation());
+
//cwsCase.set
}
}
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 17355d2..d0c69b6 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
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.exception.BizExceptionEnum;
+import com.casic.missiles.core.exception.GunsException;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.dao.VideoCaseMapper;
import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo;
import com.casic.missiles.modular.cwscase.enums.VideoCaseTypeEnum;
@@ -31,27 +34,44 @@
@Transactional
@Override
- public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId) {
+ public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) {
+ if (bzhours == null) {
+ bzhours = 0;
+ }
+ if (bzminis == null) {
+ bzminis = 0;
+ }
VideoCase videoCase = selectById(videoCaseId);
- covertCase(cwsCase,videoCase);
- return cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId);
+ if (ToolUtil.isNotEmpty(videoCase.getRegCaseId())) {
+ GunsException error = new GunsException(BizExceptionEnum.SERVER_ERROR);
+ error.setMessage("该案卷已立案,不可重复受理!");
+ throw error;
+ }
+ covertCase(cwsCase, videoCase);
+
+ cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId);
+ videoCase.setRegCaseId(cwsCase.getId());
+ updateById(videoCase);
+ return true;
}
private void covertCase(CwsCase cwsCase, VideoCase res) {
- VideoCaseTypeEnum caseTypeEnum = VideoCaseTypeEnum.typeOfCode(res.getCaseSubType());
+ VideoCaseTypeEnum caseTypeEnum = VideoCaseTypeEnum.typeOfCode(res.getCaseSubType());
cwsCase.setEorc(caseTypeEnum.getEroc());
cwsCase.setCasetypeCode(caseTypeEnum.getType());
cwsCase.setCasetypeDetailCode(caseTypeEnum.getSubType());
cwsCase.setSource(SourceEnum.VIDEO_MONITOR.getState());
+
//设置图片路径
cwsCase.setFileIdVerify(res.getImgPath());
- cwsCase.setDescription("视频推送-"+caseTypeEnum.getName());
+ cwsCase.setDescription("视频推送-" + caseTypeEnum.getName());
cwsCase.setAreaCode("361024");
cwsCase.setStreetCode("36124100");
cwsCase.setCommunityCode("1");
cwsCase.setGridId(361024100801L);
BusDeviceInfo busDeviceInfo = baseMapper.getDeviceInfoByVideoId(res.getVideoId());
cwsCase.setFieldintro(busDeviceInfo.getDetailLocation());
+
//cwsCase.set
}
}
diff --git a/pom.xml b/pom.xml
index 773ae15..839365a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,6 @@
${core.version}
-
com.casic
@@ -186,6 +185,7 @@
ehcache-core
${ehcache.core.version}
+
io.jsonwebtoken
jjwt
@@ -201,7 +201,6 @@
-