diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} 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 new file mode 100644 index 0000000..cf6ad01 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -0,0 +1,106 @@ +package com.casic.missiles.modular.cwscase.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 视频案卷扩展对象 video_case + * + * @author lwh + * @date 2024-01-15 + */ +@Data +@TableName("video_case") +public class VideoCase extends Model { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableField("id") + private Long id; + + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + + /** + * 修改时间 + */ + @TableField("update_time") + private Date updateTime; + + + /** + * 审批状态 + */ + @TableField("case_status") + private Integer caseStatus; + + + /** + * 立案ID + */ + @TableField("reg_case_id") + private Long regCaseId; + + + /** + * 案卷分类ID + */ + @TableField("case_sub_type") + private String caseSubType; + + + /** + * 案卷备注信息 + */ + @TableField("remarks") + private String remarks; + + + /** + * 案卷路径信息 + */ + @TableField("img_path") + private String imgPath; + + + /** + * 视频点位信息 + */ + @TableField("video_id") + private Long videoId; + + + @Override + public String toString() { + return "VideoCase{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "caseStatus=" + caseStatus + + "regCaseId=" + regCaseId + + "caseSubType=" + caseSubType + + "remarks=" + remarks + + "imgPath=" + imgPath + + "videoId=" + videoId + + "}"; + } + + @Override + protected Serializable pkVal() { + return id; + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} 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 new file mode 100644 index 0000000..cf6ad01 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -0,0 +1,106 @@ +package com.casic.missiles.modular.cwscase.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 视频案卷扩展对象 video_case + * + * @author lwh + * @date 2024-01-15 + */ +@Data +@TableName("video_case") +public class VideoCase extends Model { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableField("id") + private Long id; + + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + + /** + * 修改时间 + */ + @TableField("update_time") + private Date updateTime; + + + /** + * 审批状态 + */ + @TableField("case_status") + private Integer caseStatus; + + + /** + * 立案ID + */ + @TableField("reg_case_id") + private Long regCaseId; + + + /** + * 案卷分类ID + */ + @TableField("case_sub_type") + private String caseSubType; + + + /** + * 案卷备注信息 + */ + @TableField("remarks") + private String remarks; + + + /** + * 案卷路径信息 + */ + @TableField("img_path") + private String imgPath; + + + /** + * 视频点位信息 + */ + @TableField("video_id") + private Long videoId; + + + @Override + public String toString() { + return "VideoCase{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "caseStatus=" + caseStatus + + "regCaseId=" + regCaseId + + "caseSubType=" + caseSubType + + "remarks=" + remarks + + "imgPath=" + imgPath + + "videoId=" + videoId + + "}"; + } + + @Override + protected Serializable pkVal() { + return id; + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java new file mode 100644 index 0000000..b77b56a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.service; + + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.CwsCase; +import com.casic.missiles.modular.cwscase.model.VideoCase; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface IVideoCaseService extends IService { + + boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} 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 new file mode 100644 index 0000000..cf6ad01 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -0,0 +1,106 @@ +package com.casic.missiles.modular.cwscase.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 视频案卷扩展对象 video_case + * + * @author lwh + * @date 2024-01-15 + */ +@Data +@TableName("video_case") +public class VideoCase extends Model { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableField("id") + private Long id; + + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + + /** + * 修改时间 + */ + @TableField("update_time") + private Date updateTime; + + + /** + * 审批状态 + */ + @TableField("case_status") + private Integer caseStatus; + + + /** + * 立案ID + */ + @TableField("reg_case_id") + private Long regCaseId; + + + /** + * 案卷分类ID + */ + @TableField("case_sub_type") + private String caseSubType; + + + /** + * 案卷备注信息 + */ + @TableField("remarks") + private String remarks; + + + /** + * 案卷路径信息 + */ + @TableField("img_path") + private String imgPath; + + + /** + * 视频点位信息 + */ + @TableField("video_id") + private Long videoId; + + + @Override + public String toString() { + return "VideoCase{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "caseStatus=" + caseStatus + + "regCaseId=" + regCaseId + + "caseSubType=" + caseSubType + + "remarks=" + remarks + + "imgPath=" + imgPath + + "videoId=" + videoId + + "}"; + } + + @Override + protected Serializable pkVal() { + return id; + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java new file mode 100644 index 0000000..b77b56a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.service; + + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.CwsCase; +import com.casic.missiles.modular.cwscase.model.VideoCase; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface IVideoCaseService extends IService { + + boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 7cad56a..dc70fb3 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -99,7 +99,8 @@ } else { cwsCase.setCaseState(CaseStateEnum.TO_BE_REGISTERED.getState()); } - String caseid = "";//案卷编号 + //案卷编号 + String caseid = ""; SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); @@ -117,7 +118,6 @@ casedetail.setIsquickReport(0);//非快速上报案卷 casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -131,7 +131,6 @@ } statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); @@ -223,7 +222,6 @@ } casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -231,7 +229,6 @@ status.setBzminis(0);//限制完成总时限（分）初始化 statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} 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 new file mode 100644 index 0000000..cf6ad01 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -0,0 +1,106 @@ +package com.casic.missiles.modular.cwscase.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 视频案卷扩展对象 video_case + * + * @author lwh + * @date 2024-01-15 + */ +@Data +@TableName("video_case") +public class VideoCase extends Model { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableField("id") + private Long id; + + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + + /** + * 修改时间 + */ + @TableField("update_time") + private Date updateTime; + + + /** + * 审批状态 + */ + @TableField("case_status") + private Integer caseStatus; + + + /** + * 立案ID + */ + @TableField("reg_case_id") + private Long regCaseId; + + + /** + * 案卷分类ID + */ + @TableField("case_sub_type") + private String caseSubType; + + + /** + * 案卷备注信息 + */ + @TableField("remarks") + private String remarks; + + + /** + * 案卷路径信息 + */ + @TableField("img_path") + private String imgPath; + + + /** + * 视频点位信息 + */ + @TableField("video_id") + private Long videoId; + + + @Override + public String toString() { + return "VideoCase{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "caseStatus=" + caseStatus + + "regCaseId=" + regCaseId + + "caseSubType=" + caseSubType + + "remarks=" + remarks + + "imgPath=" + imgPath + + "videoId=" + videoId + + "}"; + } + + @Override + protected Serializable pkVal() { + return id; + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java new file mode 100644 index 0000000..b77b56a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.service; + + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.CwsCase; +import com.casic.missiles.modular.cwscase.model.VideoCase; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface IVideoCaseService extends IService { + + boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 7cad56a..dc70fb3 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -99,7 +99,8 @@ } else { cwsCase.setCaseState(CaseStateEnum.TO_BE_REGISTERED.getState()); } - String caseid = "";//案卷编号 + //案卷编号 + String caseid = ""; SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); @@ -117,7 +118,6 @@ casedetail.setIsquickReport(0);//非快速上报案卷 casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -131,7 +131,6 @@ } statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); @@ -223,7 +222,6 @@ } casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -231,7 +229,6 @@ status.setBzminis(0);//限制完成总时限（分）初始化 statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); 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 new file mode 100644 index 0000000..17355d2 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.cwscase.service.impl; + + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.cwscase.dao.VideoCaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.enums.VideoCaseTypeEnum; +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 com.casic.missiles.modular.enums.SourceEnum; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务实现类 + *

+ * + * @author lwh + * @since 2019-09-23 + */ +@Service +public class VideoCaseServiceImpl extends ServiceImpl implements IVideoCaseService { + private final ICwsCaseService cwsCaseService; + + public VideoCaseServiceImpl(ICwsCaseService cwsCaseService) { + this.cwsCaseService = cwsCaseService; + } + + @Transactional + @Override + public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId) { + VideoCase videoCase = selectById(videoCaseId); + covertCase(cwsCase,videoCase); + return cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId); + } + + private void covertCase(CwsCase cwsCase, VideoCase res) { + 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.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/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} 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 new file mode 100644 index 0000000..cf6ad01 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -0,0 +1,106 @@ +package com.casic.missiles.modular.cwscase.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 视频案卷扩展对象 video_case + * + * @author lwh + * @date 2024-01-15 + */ +@Data +@TableName("video_case") +public class VideoCase extends Model { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableField("id") + private Long id; + + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + + /** + * 修改时间 + */ + @TableField("update_time") + private Date updateTime; + + + /** + * 审批状态 + */ + @TableField("case_status") + private Integer caseStatus; + + + /** + * 立案ID + */ + @TableField("reg_case_id") + private Long regCaseId; + + + /** + * 案卷分类ID + */ + @TableField("case_sub_type") + private String caseSubType; + + + /** + * 案卷备注信息 + */ + @TableField("remarks") + private String remarks; + + + /** + * 案卷路径信息 + */ + @TableField("img_path") + private String imgPath; + + + /** + * 视频点位信息 + */ + @TableField("video_id") + private Long videoId; + + + @Override + public String toString() { + return "VideoCase{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "caseStatus=" + caseStatus + + "regCaseId=" + regCaseId + + "caseSubType=" + caseSubType + + "remarks=" + remarks + + "imgPath=" + imgPath + + "videoId=" + videoId + + "}"; + } + + @Override + protected Serializable pkVal() { + return id; + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java new file mode 100644 index 0000000..b77b56a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.service; + + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.CwsCase; +import com.casic.missiles.modular.cwscase.model.VideoCase; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface IVideoCaseService extends IService { + + boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 7cad56a..dc70fb3 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -99,7 +99,8 @@ } else { cwsCase.setCaseState(CaseStateEnum.TO_BE_REGISTERED.getState()); } - String caseid = "";//案卷编号 + //案卷编号 + String caseid = ""; SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); @@ -117,7 +118,6 @@ casedetail.setIsquickReport(0);//非快速上报案卷 casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -131,7 +131,6 @@ } statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); @@ -223,7 +222,6 @@ } casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -231,7 +229,6 @@ status.setBzminis(0);//限制完成总时限（分）初始化 statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); 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 new file mode 100644 index 0000000..17355d2 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.cwscase.service.impl; + + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.cwscase.dao.VideoCaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.enums.VideoCaseTypeEnum; +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 com.casic.missiles.modular.enums.SourceEnum; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务实现类 + *

+ * + * @author lwh + * @since 2019-09-23 + */ +@Service +public class VideoCaseServiceImpl extends ServiceImpl implements IVideoCaseService { + private final ICwsCaseService cwsCaseService; + + public VideoCaseServiceImpl(ICwsCaseService cwsCaseService) { + this.cwsCaseService = cwsCaseService; + } + + @Transactional + @Override + public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId) { + VideoCase videoCase = selectById(videoCaseId); + covertCase(cwsCase,videoCase); + return cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId); + } + + private void covertCase(CwsCase cwsCase, VideoCase res) { + 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.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-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java index e894550..6ffb361 100644 --- a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java @@ -11,7 +11,8 @@ ENDREPORT_QUIK(1, "终端-快捷上报", false), VIDEO_MONITOR(14, "视频监控", false), SEDIMENT_TRUCK_MANAGE(15, "渣土车辆管理", false), - COMMISSIONED_BY_LEADER(16, "领导委办", true); + COMMISSIONED_BY_LEADER(16, "领导委办", true), + ENVIRONMENT(17, "环境监测", false); /** * 案件来源 diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} 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 new file mode 100644 index 0000000..cf6ad01 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -0,0 +1,106 @@ +package com.casic.missiles.modular.cwscase.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 视频案卷扩展对象 video_case + * + * @author lwh + * @date 2024-01-15 + */ +@Data +@TableName("video_case") +public class VideoCase extends Model { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableField("id") + private Long id; + + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + + /** + * 修改时间 + */ + @TableField("update_time") + private Date updateTime; + + + /** + * 审批状态 + */ + @TableField("case_status") + private Integer caseStatus; + + + /** + * 立案ID + */ + @TableField("reg_case_id") + private Long regCaseId; + + + /** + * 案卷分类ID + */ + @TableField("case_sub_type") + private String caseSubType; + + + /** + * 案卷备注信息 + */ + @TableField("remarks") + private String remarks; + + + /** + * 案卷路径信息 + */ + @TableField("img_path") + private String imgPath; + + + /** + * 视频点位信息 + */ + @TableField("video_id") + private Long videoId; + + + @Override + public String toString() { + return "VideoCase{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "caseStatus=" + caseStatus + + "regCaseId=" + regCaseId + + "caseSubType=" + caseSubType + + "remarks=" + remarks + + "imgPath=" + imgPath + + "videoId=" + videoId + + "}"; + } + + @Override + protected Serializable pkVal() { + return id; + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java new file mode 100644 index 0000000..b77b56a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.service; + + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.CwsCase; +import com.casic.missiles.modular.cwscase.model.VideoCase; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface IVideoCaseService extends IService { + + boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 7cad56a..dc70fb3 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -99,7 +99,8 @@ } else { cwsCase.setCaseState(CaseStateEnum.TO_BE_REGISTERED.getState()); } - String caseid = "";//案卷编号 + //案卷编号 + String caseid = ""; SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); @@ -117,7 +118,6 @@ casedetail.setIsquickReport(0);//非快速上报案卷 casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -131,7 +131,6 @@ } statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); @@ -223,7 +222,6 @@ } casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -231,7 +229,6 @@ status.setBzminis(0);//限制完成总时限（分）初始化 statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); 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 new file mode 100644 index 0000000..17355d2 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.cwscase.service.impl; + + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.cwscase.dao.VideoCaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.enums.VideoCaseTypeEnum; +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 com.casic.missiles.modular.enums.SourceEnum; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务实现类 + *

+ * + * @author lwh + * @since 2019-09-23 + */ +@Service +public class VideoCaseServiceImpl extends ServiceImpl implements IVideoCaseService { + private final ICwsCaseService cwsCaseService; + + public VideoCaseServiceImpl(ICwsCaseService cwsCaseService) { + this.cwsCaseService = cwsCaseService; + } + + @Transactional + @Override + public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId) { + VideoCase videoCase = selectById(videoCaseId); + covertCase(cwsCase,videoCase); + return cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId); + } + + private void covertCase(CwsCase cwsCase, VideoCase res) { + 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.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-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java index e894550..6ffb361 100644 --- a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java @@ -11,7 +11,8 @@ ENDREPORT_QUIK(1, "终端-快捷上报", false), VIDEO_MONITOR(14, "视频监控", false), SEDIMENT_TRUCK_MANAGE(15, "渣土车辆管理", false), - COMMISSIONED_BY_LEADER(16, "领导委办", true); + COMMISSIONED_BY_LEADER(16, "领导委办", true), + ENVIRONMENT(17, "环境监测", false); /** * 案件来源 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 9c195c2..ac7f494 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -22,7 +22,7 @@ kaptcha-open: false #是否开启登录时验证码 (true/false) spring-session-open: true #是否开启spring session log: - attendUrl: http://localhost:11409/sanitation/staff/saveUserLog # 环卫考勤日志调用 + attendUrl: http://111.198.10.15:11409/sanitation/staff/saveUserLog # 环卫考勤日志调用 nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/departmentAssess/sourceList,/departmentAssess/highEventList,/case/addWeChat,/case/historyByPhoneListPage,/dict/code/caseSource,/fileUpload flowable: datasource: diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml index 78021cf..e977d61 100644 --- a/casic-service-cws/casic-cws-case/pom.xml +++ b/casic-service-cws/casic-cws-case/pom.xml @@ -31,6 +31,11 @@ casic-export-support ${admin.version} + + com.casic + casic-http + ${extension.version} + com.casic 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 new file mode 100644 index 0000000..64db7fd --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/VideoController.java @@ -0,0 +1,39 @@ +package com.casic.missiles.modular.cwscase.controller; + +import com.casic.missiles.core.base.response.ResponseData; +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; + +@RestController +@RequestMapping("/videoCase") +public class VideoController { + + private final IVideoCaseService videoCaseService; + + public VideoController(IVideoCaseService videoCaseService) { + this.videoCaseService = videoCaseService; + } + + /** + * 新增-pc + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId, String videoCaseId) { + if (ToolUtil.isEmpty(videoCaseId)) { + return ResponseData.error("视频案卷ID不能为空"); + } + if (videoCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId,videoCaseId)) { + return ResponseData.success(); + } else { + return ResponseData.error("服务器异常"); + } + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java new file mode 100644 index 0000000..04719f3 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/VideoCaseMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.VideoCase; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface VideoCaseMapper extends BaseMapper { + + BusDeviceInfo getDeviceInfoByVideoId(@Param("videoId") Long videoId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml new file mode 100644 index 0000000..de23c00 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/VideoCaseMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + id,create_time as createTime , + update_time as updateTime , + case_status as caseStatus , + reg_case_id as regCaseId , + case_sub_type as caseSubType , + remarks , + img_path as imgPath , + video_id as videoId + + + diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java new file mode 100644 index 0000000..7497a31 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dto/BusDeviceInfo.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.cwscase.dto; + +import lombok.Data; + +@Data +public class BusDeviceInfo { + private Long id; + private String devName; + private String indexCode; + private String detailLocation; +} diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java new file mode 100644 index 0000000..77fb97a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/enums/VideoCaseTypeEnum.java @@ -0,0 +1,123 @@ +package com.casic.missiles.modular.cwscase.enums; + +/** + * @Description: 事件类型 + * @Author: lwh + * @Date: 2022/7/18 14:40 + */ +public enum VideoCaseTypeEnum { + stallOccupyingRoad("stallOccupyingRoad", "占道经营","1","04","06"), + stallOutsideShop("stallOutsideShop", "店外经营","1","04","05"), + //无照经营游商 + unregisteredStreetVendor("unregisteredStreetVendor", "非法摆摊","1","04","01"), + //乱堆物堆 + illegalHeap("illegalHeap", "乱堆物堆","1","01","36"), + //暴露垃圾 + dustbinOverflow("dustbinOverflow", "垃圾箱满溢","1","01","10"), + //暴露垃圾 + packGarbage("packGarbage", "打包垃圾","1","01","10"), + //暴露垃圾 + exposeGarbage("exposeGarbage", "暴露垃圾","1","01","10"), + //私搭乱建 + stallUnderUmbrella("stallUnderUmbrella", "违规撑伞","1","01","01"), + //沿街晾晒 + hangClothingAlongStreet("hangClothingAlongStreet", "沿街晾晒","1","01","07"), + illegalParkingofNonMotorVehicle("illegalParkingofNon-MotorVehicle", "非机动车乱停放","1","04","10"), + illegalOutdoorAdvertisement("illegalOutdoorAdvertisement", "违规户外广告","1","02","03"); + + private String code; + private String name; + private String eroc; + private String type; + private String subType; + + VideoCaseTypeEnum(String code, String name, String eroc, String type, String subType) { + this.code = code; + this.name = name; + this.eroc = eroc; + this.type = type; + this.subType = subType; + } + + public static VideoCaseTypeEnum typeOfCode(String code) { + VideoCaseTypeEnum caseTypeEnum = null; + switch (code) { + case "stallOccupyingRoad": + caseTypeEnum = stallOccupyingRoad; + break; + case "stallOutsideShop": + caseTypeEnum = stallOutsideShop; + break; + case "unregisteredStreetVendor": + caseTypeEnum = unregisteredStreetVendor; + break; + case "illegalHeap": + caseTypeEnum = illegalHeap; + break; + case "dustbinOverflow": + caseTypeEnum = dustbinOverflow; + break; + case "packGarbage": + caseTypeEnum = packGarbage; + break; + case "exposeGarbage": + caseTypeEnum = exposeGarbage; + break; + case "stallUnderUmbrella": + caseTypeEnum = stallUnderUmbrella; + break; + case "hangClothingAlongStreet": + caseTypeEnum = hangClothingAlongStreet; + break; + case "illegalParkingofNon-MotorVehicle": + caseTypeEnum = illegalParkingofNonMotorVehicle; + break; + case "illegalOutdoorAdvertisement": + caseTypeEnum = illegalOutdoorAdvertisement; + break; + default: + ; + } + return caseTypeEnum; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEroc() { + return eroc; + } + + public void setEroc(String eroc) { + this.eroc = eroc; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getSubType() { + return subType; + } + + public void setSubType(String subType) { + this.subType = subType; + } +} 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 new file mode 100644 index 0000000..cf6ad01 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/VideoCase.java @@ -0,0 +1,106 @@ +package com.casic.missiles.modular.cwscase.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 视频案卷扩展对象 video_case + * + * @author lwh + * @date 2024-01-15 + */ +@Data +@TableName("video_case") +public class VideoCase extends Model { + private static final long serialVersionUID = 1L; + + + /** + * 主键 + */ + @TableField("id") + private Long id; + + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + + /** + * 修改时间 + */ + @TableField("update_time") + private Date updateTime; + + + /** + * 审批状态 + */ + @TableField("case_status") + private Integer caseStatus; + + + /** + * 立案ID + */ + @TableField("reg_case_id") + private Long regCaseId; + + + /** + * 案卷分类ID + */ + @TableField("case_sub_type") + private String caseSubType; + + + /** + * 案卷备注信息 + */ + @TableField("remarks") + private String remarks; + + + /** + * 案卷路径信息 + */ + @TableField("img_path") + private String imgPath; + + + /** + * 视频点位信息 + */ + @TableField("video_id") + private Long videoId; + + + @Override + public String toString() { + return "VideoCase{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "caseStatus=" + caseStatus + + "regCaseId=" + regCaseId + + "caseSubType=" + caseSubType + + "remarks=" + remarks + + "imgPath=" + imgPath + + "videoId=" + videoId + + "}"; + } + + @Override + protected Serializable pkVal() { + return id; + } +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java new file mode 100644 index 0000000..b77b56a --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/IVideoCaseService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.cwscase.service; + + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.cwscase.model.Casedetail; +import com.casic.missiles.modular.cwscase.model.CwsCase; +import com.casic.missiles.modular.cwscase.model.VideoCase; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务类 + *

+ * + * @author stylefeng123 + * @since 2019-09-23 + */ +public interface IVideoCaseService extends IService { + + boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId); +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 7cad56a..dc70fb3 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -99,7 +99,8 @@ } else { cwsCase.setCaseState(CaseStateEnum.TO_BE_REGISTERED.getState()); } - String caseid = "";//案卷编号 + //案卷编号 + String caseid = ""; SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); @@ -117,7 +118,6 @@ casedetail.setIsquickReport(0);//非快速上报案卷 casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -131,7 +131,6 @@ } statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); @@ -223,7 +222,6 @@ } casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 - //更新STATUS表 Status status = new Status(); status.setId(id); @@ -231,7 +229,6 @@ status.setBzminis(0);//限制完成总时限（分）初始化 statusService.insert(status);//往status表新增案卷 - //更新process_detail表 ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); 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 new file mode 100644 index 0000000..17355d2 --- /dev/null +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/VideoCaseServiceImpl.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.cwscase.service.impl; + + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.cwscase.dao.VideoCaseMapper; +import com.casic.missiles.modular.cwscase.dto.BusDeviceInfo; +import com.casic.missiles.modular.cwscase.enums.VideoCaseTypeEnum; +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 com.casic.missiles.modular.enums.SourceEnum; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + *

+ * 案件拓展详情表（0表示否，1表示是） 服务实现类 + *

+ * + * @author lwh + * @since 2019-09-23 + */ +@Service +public class VideoCaseServiceImpl extends ServiceImpl implements IVideoCaseService { + private final ICwsCaseService cwsCaseService; + + public VideoCaseServiceImpl(ICwsCaseService cwsCaseService) { + this.cwsCaseService = cwsCaseService; + } + + @Transactional + @Override + public boolean createNewPC(CwsCase cwsCase, Integer isNeedVerify, Integer isNeedRevisit, Integer bzhours, Integer bzminis, Long verifyPersonId,String videoCaseId) { + VideoCase videoCase = selectById(videoCaseId); + covertCase(cwsCase,videoCase); + return cwsCaseService.createNewPC(cwsCase, isNeedVerify, isNeedRevisit, bzhours, bzminis, verifyPersonId); + } + + private void covertCase(CwsCase cwsCase, VideoCase res) { + 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.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-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java index e894550..6ffb361 100644 --- a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java @@ -11,7 +11,8 @@ ENDREPORT_QUIK(1, "终端-快捷上报", false), VIDEO_MONITOR(14, "视频监控", false), SEDIMENT_TRUCK_MANAGE(15, "渣土车辆管理", false), - COMMISSIONED_BY_LEADER(16, "领导委办", true); + COMMISSIONED_BY_LEADER(16, "领导委办", true), + ENVIRONMENT(17, "环境监测", false); /** * 案件来源 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 9c195c2..ac7f494 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -22,7 +22,7 @@ kaptcha-open: false #是否开启登录时验证码 (true/false) spring-session-open: true #是否开启spring session log: - attendUrl: http://localhost:11409/sanitation/staff/saveUserLog # 环卫考勤日志调用 + attendUrl: http://111.198.10.15:11409/sanitation/staff/saveUserLog # 环卫考勤日志调用 nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/departmentAssess/sourceList,/departmentAssess/highEventList,/case/addWeChat,/case/historyByPhoneListPage,/dict/code/caseSource,/fileUpload flowable: datasource: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index e428ff8..2d67c8a 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev datasource: driver-class-name: com.mysql.jdbc.Driver jms: