From 7412cafda04e66746dccb3099aea2f114b3aa476 Mon Sep 17 00:00:00 2001 From: BrandWang Date: Sat, 6 May 2023 18:29:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=AF=E5=9B=9E=E6=BA=AF):=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重构为mysql --- afis-recall-service/.gitignore | 38 +++ afis-recall-service/pom.xml | 65 +++++ .../recall/trace/dao/RecallOrderDao.java | 51 ++++ .../recall/trace/dao/RecallRecordDao.java | 51 ++++ .../recall/trace/dto/RecallOrderDTO.java | 77 ++++++ .../recall/trace/dto/RecallRecordDTO.java | 44 ++++ .../trace/entity/RecallOrderEntity.java | 66 +++++ .../trace/entity/RecallRecordEntity.java | 38 +++ .../trace/service/RecallOrderService.java | 48 ++++ .../trace/service/RecallRecordService.java | 48 ++++ .../service/impl/RecallOrderServiceImpl.java | 46 ++++ .../service/impl/RecallRecordServiceImpl.java | 46 ++++ .../recall/trace/vo/RecallOrderVO.java | 87 +++++++ .../recall/trace/vo/RecallRecordVO.java | 48 ++++ .../resources/mapper/trace/RecallOrderDao.xml | 236 ++++++++++++++++++ .../mapper/trace/RecallRecordDao.xml | 117 +++++++++ afis-recall-web/.gitignore | 38 +++ afis-recall-web/pom.xml | 105 ++++++++ .../recall/AfisRecallApplication.java | 0 .../com/wabestway/recall/model/Order.java | 0 .../com/wabestway/recall/model/OrderList.java | 0 .../com/wabestway/recall/model/Record.java | 0 .../com/wabestway/recall/model/ResObj.java | 0 .../recall/repository/OrderRepository.java | 0 .../recall/repository/RecordRepository.java | 0 .../controller/RecallOrderController.java | 69 +++++ .../controller/RecallRecordController.java | 69 +++++ .../trace/service/RecallOrderApiService.java | 54 ++++ .../trace/service/RecallRecordApiService.java | 54 ++++ .../impl/RecallOrderApiServiceImpl.java | 85 +++++++ .../impl/RecallRecordApiServiceImpl.java | 85 +++++++ .../wabestway/recall/web/OrderController.java | 0 .../recall/web/RecallController.java | 0 pom.xml | 119 +++------ src/main/resources/application-dev.yml | 7 - src/main/resources/application-native.yml | 7 - src/main/resources/application.properties | 1 - src/main/resources/application.yml | 1 - src/main/resources/bootstrap-dev.yml | 16 -- src/main/resources/bootstrap-prod.yml | 17 -- src/main/resources/bootstrap-sit.yml | 16 -- src/main/resources/bootstrap-uat.yml | 16 -- src/main/resources/bootstrap.yml | 3 - .../java/com/wabestway/recall/FFmpeg.java | 69 ----- .../java/com/wabestway/recall/JSEngine.java | 15 -- 45 files changed, 1699 insertions(+), 253 deletions(-) create mode 100644 afis-recall-service/.gitignore create mode 100644 afis-recall-service/pom.xml create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallOrderDao.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallRecordDao.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallRecordDTO.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallOrderEntity.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallRecordEntity.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallRecordService.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordServiceImpl.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallOrderVO.java create mode 100644 afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallRecordVO.java create mode 100644 afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml create mode 100644 afis-recall-service/src/main/resources/mapper/trace/RecallRecordDao.xml create mode 100644 afis-recall-web/.gitignore create mode 100644 afis-recall-web/pom.xml rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/AfisRecallApplication.java (100%) rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/model/Order.java (100%) rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/model/OrderList.java (100%) rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/model/Record.java (100%) rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/model/ResObj.java (100%) rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/repository/OrderRepository.java (100%) rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/repository/RecordRepository.java (100%) create mode 100644 afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java create mode 100644 afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallRecordController.java create mode 100644 afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java create mode 100644 afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java create mode 100644 afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java create mode 100644 afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordApiServiceImpl.java rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/web/OrderController.java (100%) rename {src => afis-recall-web/src}/main/java/com/wabestway/recall/web/RecallController.java (100%) delete mode 100644 src/main/resources/application-dev.yml delete mode 100644 src/main/resources/application-native.yml delete mode 100644 src/main/resources/application.properties delete mode 100644 src/main/resources/application.yml delete mode 100644 src/main/resources/bootstrap-dev.yml delete mode 100644 src/main/resources/bootstrap-prod.yml delete mode 100644 src/main/resources/bootstrap-sit.yml delete mode 100644 src/main/resources/bootstrap-uat.yml delete mode 100644 src/main/resources/bootstrap.yml delete mode 100644 src/test/java/com/wabestway/recall/FFmpeg.java delete mode 100644 src/test/java/com/wabestway/recall/JSEngine.java diff --git a/afis-recall-service/.gitignore b/afis-recall-service/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/afis-recall-service/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/afis-recall-service/pom.xml b/afis-recall-service/pom.xml new file mode 100644 index 0000000..6bd1a71 --- /dev/null +++ b/afis-recall-service/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + com.wabestway.recall + afis-recall + 0.0.1-SNAPSHOT + + jar + afis-recall-service + + 1.8 + 1.8 + UTF-8 + UTF-8 + 3.3.2 + + + + + com.wabestway.common + afis-web-common + 1.0 + + + + javax.validation + validation-api + 2.0.1.Final + + + org.springframework + spring-context + 5.2.10.RELEASE + provided + + + org.springframework + spring-beans + 5.2.10.RELEASE + provided + + + + com.fasterxml.jackson.core + jackson-databind + 2.10.5 + provided + + + com.baomidou + mybatis-plus + ${mybatisplus.version} + provided + + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.5.1 + provided + + + \ No newline at end of file diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallOrderDao.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallOrderDao.java new file mode 100644 index 0000000..22efc10 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallOrderDao.java @@ -0,0 +1,51 @@ +package com.wabestway.recall.trace.dao; + +import com.wabestway.recall.trace.entity.RecallOrderEntity; +import com.wabestway.recall.trace.dto.RecallOrderDTO; +import com.wabestway.recall.trace.vo.RecallOrderVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Mapper +public interface RecallOrderDao extends BaseMapper { + + /** + * 分页查询 + * @param page 分页对象 + * @param recallOrderDTO + * @return + */ + IPage queryRecallOrderByCondition(Page page, @Param("recallOrderDTO")RecallOrderDTO recallOrderDTO); + + /** + * 条件查询，不分页 + * @param recallOrderDTO + * @return + */ + List queryRecallOrderListNoPage(@Param("recallOrderDTO")RecallOrderDTO recallOrderDTO); + + /** + * 根据id更新 + * @param recallOrder 对象 + * @return + */ + void updateRecallOrderById(@Param("recallOrder")RecallOrderEntity recallOrder); + + /** + * 根据id查询详情 + * @param id + * @return + */ + RecallOrderVO queryRecallOrderById(@Param("id") String id); +} diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallRecordDao.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallRecordDao.java new file mode 100644 index 0000000..7e295f8 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dao/RecallRecordDao.java @@ -0,0 +1,51 @@ +package com.wabestway.recall.trace.dao; + +import com.wabestway.recall.trace.entity.RecallRecordEntity; +import com.wabestway.recall.trace.dto.RecallRecordDTO; +import com.wabestway.recall.trace.vo.RecallRecordVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Mapper +public interface RecallRecordDao extends BaseMapper { + + /** + * 分页查询 + * @param page 分页对象 + * @param recallRecordDTO + * @return + */ + IPage queryRecallRecordByCondition(Page page, @Param("recallRecordDTO")RecallRecordDTO recallRecordDTO); + + /** + * 条件查询，不分页 + * @param recallRecordDTO + * @return + */ + List queryRecallRecordListNoPage(@Param("recallRecordDTO")RecallRecordDTO recallRecordDTO); + + /** + * 根据id更新 + * @param recallRecord 对象 + * @return + */ + void updateRecallRecordById(@Param("recallRecord")RecallRecordEntity recallRecord); + + /** + * 根据id查询详情 + * @param id + * @return + */ + RecallRecordVO queryRecallRecordById(@Param("id") String id); +} diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java new file mode 100644 index 0000000..12edece --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java @@ -0,0 +1,77 @@ +package com.wabestway.recall.trace.dto; + +import java.io.Serializable; +import lombok.Data; +import com.wabestway.commons.http.PageDTO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Data +@ApiModel +public class RecallOrderDTO extends PageDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** 主键 */ + @ApiModelProperty(value = "主键") + private String id; + /** 产品编码 */ + @ApiModelProperty(value = "产品编码") + private String productCode; + /** 产品名称 */ + @ApiModelProperty(value = "产品名称") + private String productName; + /** 保单号 */ + @ApiModelProperty(value = "保单号") + private String policyNo; + /** 投保人名称 */ + @ApiModelProperty(value = "投保人名称") + private String holderName; + /** 投保人手机号 */ + @ApiModelProperty(value = "投保人手机号") + private String holderPhone; + /** 保险公司名称 */ + @ApiModelProperty(value = "保险公司名称") + private String supplierName; + /** 是否记录完整0-否1-是 */ + @ApiModelProperty(value = "是否记录完整0-否1-是") + private String complete; + /** 是否已归档 0-否1-是 */ + @ApiModelProperty(value = "是否已归档 0-否1-是 ") + private String archived; + /** 完成日期 */ + @ApiModelProperty(value = "完成日期") + private Long completeDate; + /** 归档日期 */ + @ApiModelProperty(value = "归档日期") + private Long archivedDate; + /** 保单起始日期 */ + @ApiModelProperty(value = "保单起始日期") + private String startDate; + /** 保单结束日期 */ + @ApiModelProperty(value = "保单结束日期") + private String endDate; + /** 生成视频文件ID */ + @ApiModelProperty(value = "生成视频文件ID") + private String fileId; + /** 生成视频文件地址 */ + @ApiModelProperty(value = "生成视频文件地址") + private String fileUrl; + /** 业务订单ID */ + @ApiModelProperty(value = "业务订单ID") + private String orderId; + /** 回溯记录跟踪ID */ + @ApiModelProperty(value = "回溯记录跟踪ID") + private String traceId; + /** 可回溯记录appKey */ + @ApiModelProperty(value = "可回溯记录appKey") + private String appKey; + +} diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallRecordDTO.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallRecordDTO.java new file mode 100644 index 0000000..33de171 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallRecordDTO.java @@ -0,0 +1,44 @@ +package com.wabestway.recall.trace.dto; + +import java.io.Serializable; +import lombok.Data; +import com.wabestway.commons.http.PageDTO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Data +@ApiModel +public class RecallRecordDTO extends PageDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** 主键 */ + @ApiModelProperty(value = "主键") + private String id; + /** 产品编码 */ + @ApiModelProperty(value = "产品编码") + private String productCode; + /** 产品名称 */ + @ApiModelProperty(value = "产品名称") + private String productName; + /** 模块 */ + @ApiModelProperty(value = "模块") + private String module; + /** 页面说明 */ + @ApiModelProperty(value = "页面说明") + private String content; + /** 记录事件 */ + @ApiModelProperty(value = "记录事件") + private Blob events; + /** 回溯记录跟踪ID */ + @ApiModelProperty(value = "回溯记录跟踪ID") + private String traceId; + +} diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallOrderEntity.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallOrderEntity.java new file mode 100644 index 0000000..317f8c9 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallOrderEntity.java @@ -0,0 +1,66 @@ +package com.wabestway.recall.trace.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; + +import lombok.Data; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Data +@TableName(value = "recall_order") +public class RecallOrderEntity { + /** 主键 */ + @TableId + private String id; + /** 产品编码 */ + private String productCode; + /** 产品名称 */ + private String productName; + /** 保单号 */ + private String policyNo; + /** 投保人名称 */ + private String holderName; + /** 投保人手机号 */ + private String holderPhone; + /** 保险公司名称 */ + private String supplierName; + /** 是否记录完整0-否1-是 */ + private String complete; + /** 是否已归档 0-否1-是 */ + private String archived; + /** 完成日期 */ + private Long completeDate; + /** 归档日期 */ + private Long archivedDate; + /** 保单起始日期 */ + private String startDate; + /** 保单结束日期 */ + private String endDate; + /** 生成视频文件ID */ + private String fileId; + /** 生成视频文件地址 */ + private String fileUrl; + /** 业务订单ID */ + private String orderId; + /** 回溯记录跟踪ID */ + private String traceId; + /** 租户ID */ + private String tenantId; + /** 可回溯记录appKey */ + private String appKey; + /** 创建人 */ + private String createBy; + /** 创建时间 */ + private Long createTime; + /** 更新人 */ + private String updateBy; + /** 更新时间 */ + private Long updateTime; + +} diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallRecordEntity.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallRecordEntity.java new file mode 100644 index 0000000..12e41f2 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/entity/RecallRecordEntity.java @@ -0,0 +1,38 @@ +package com.wabestway.recall.trace.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; + +import lombok.Data; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Data +@TableName(value = "recall_record") +public class RecallRecordEntity { + /** 主键 */ + @TableId + private String id; + /** 产品编码 */ + private String productCode; + /** 产品名称 */ + private String productName; + /** 模块 */ + private String module; + /** 页面说明 */ + private String content; + /** 记录事件 */ + private Blob events; + /** 回溯记录跟踪ID */ + private String traceId; + /** 创建人 */ + private String createBy; + /** 创建时间 */ + private Long createTime; + +} diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java new file mode 100644 index 0000000..56f4cfa --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallOrderService.java @@ -0,0 +1,48 @@ +package com.wabestway.recall.trace.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.wabestway.recall.trace.entity.RecallOrderEntity; +import com.wabestway.recall.trace.dto.RecallOrderDTO; +import com.wabestway.recall.trace.vo.RecallOrderVO; +import java.util.List; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +public interface RecallOrderService extends IService { + + /** + * 分页查询 + * @param page 分页对象 + * @param recallOrderDTO + * @return + */ + IPage queryRecallOrderByCondition(long page, long size, RecallOrderDTO recallOrderDTO); + + /** + * 条件查询，不分页 + * @param recallOrderDTO + * @return + */ + List queryRecallOrderListNoPage(RecallOrderDTO recallOrderDTO); + + /** + * 根据id更新 + * @param recallOrder 对象 + * @return + */ + void updateRecallOrderById(RecallOrderEntity recallOrder); + + /** + * 根据id查询详情 + * @param id + * @return + */ + RecallOrderVO queryRecallOrderById(String id); +} + diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallRecordService.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallRecordService.java new file mode 100644 index 0000000..7c9b966 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/RecallRecordService.java @@ -0,0 +1,48 @@ +package com.wabestway.recall.trace.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.wabestway.recall.trace.entity.RecallRecordEntity; +import com.wabestway.recall.trace.dto.RecallRecordDTO; +import com.wabestway.recall.trace.vo.RecallRecordVO; +import java.util.List; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +public interface RecallRecordService extends IService { + + /** + * 分页查询 + * @param page 分页对象 + * @param recallRecordDTO + * @return + */ + IPage queryRecallRecordByCondition(long page, long size, RecallRecordDTO recallRecordDTO); + + /** + * 条件查询，不分页 + * @param recallRecordDTO + * @return + */ + List queryRecallRecordListNoPage(RecallRecordDTO recallRecordDTO); + + /** + * 根据id更新 + * @param recallRecord 对象 + * @return + */ + void updateRecallRecordById(RecallRecordEntity recallRecord); + + /** + * 根据id查询详情 + * @param id + * @return + */ + RecallRecordVO queryRecallRecordById(String id); +} + diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java new file mode 100644 index 0000000..5cff9f6 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderServiceImpl.java @@ -0,0 +1,46 @@ +package com.wabestway.recall.trace.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wabestway.recall.trace.dao.RecallOrderDao; +import com.wabestway.recall.trace.entity.RecallOrderEntity; +import com.wabestway.recall.trace.dto.RecallOrderDTO; +import com.wabestway.recall.trace.vo.RecallOrderVO; +import com.wabestway.recall.trace.service.RecallOrderService; +import java.util.List; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Service +public class RecallOrderServiceImpl extends ServiceImpl implements RecallOrderService { + + @Override + public IPage queryRecallOrderByCondition(long page, long size, RecallOrderDTO recallOrderDTO) { + Page paramReq = new Page<>(page,size); + paramReq.addOrder(new OrderItem().setColumn("create_time").setAsc(false));//创建时间降序排序 + IPage iPage = baseMapper.queryRecallOrderByCondition(paramReq, recallOrderDTO); + return iPage; + } + + public List queryRecallOrderListNoPage(RecallOrderDTO recallOrderDTO) { + return baseMapper.queryRecallOrderListNoPage(recallOrderDTO); + } + + @Override + public void updateRecallOrderById(RecallOrderEntity recallOrder) { + baseMapper.updateRecallOrderById(recallOrder); + } + + @Override + public RecallOrderVO queryRecallOrderById(String id ) { + return baseMapper.queryRecallOrderById(id); + } +} \ No newline at end of file diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordServiceImpl.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordServiceImpl.java new file mode 100644 index 0000000..f5f2bf0 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordServiceImpl.java @@ -0,0 +1,46 @@ +package com.wabestway.recall.trace.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wabestway.recall.trace.dao.RecallRecordDao; +import com.wabestway.recall.trace.entity.RecallRecordEntity; +import com.wabestway.recall.trace.dto.RecallRecordDTO; +import com.wabestway.recall.trace.vo.RecallRecordVO; +import com.wabestway.recall.trace.service.RecallRecordService; +import java.util.List; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Service +public class RecallRecordServiceImpl extends ServiceImpl implements RecallRecordService { + + @Override + public IPage queryRecallRecordByCondition(long page, long size, RecallRecordDTO recallRecordDTO) { + Page paramReq = new Page<>(page,size); + paramReq.addOrder(new OrderItem().setColumn("create_time").setAsc(false));//创建时间降序排序 + IPage iPage = baseMapper.queryRecallRecordByCondition(paramReq, recallRecordDTO); + return iPage; + } + + public List queryRecallRecordListNoPage(RecallRecordDTO recallRecordDTO) { + return baseMapper.queryRecallRecordListNoPage(recallRecordDTO); + } + + @Override + public void updateRecallRecordById(RecallRecordEntity recallRecord) { + baseMapper.updateRecallRecordById(recallRecord); + } + + @Override + public RecallRecordVO queryRecallRecordById(String id ) { + return baseMapper.queryRecallRecordById(id); + } +} \ No newline at end of file diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallOrderVO.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallOrderVO.java new file mode 100644 index 0000000..bda9bf9 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallOrderVO.java @@ -0,0 +1,87 @@ +package com.wabestway.recall.trace.vo; + +import java.io.Serializable; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Data +@ApiModel +public class RecallOrderVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** 主键 */ + @ApiModelProperty(value = "主键") + private String id; + /** 产品编码 */ + @ApiModelProperty(value = "产品编码") + private String productCode; + /** 产品名称 */ + @ApiModelProperty(value = "产品名称") + private String productName; + /** 保单号 */ + @ApiModelProperty(value = "保单号") + private String policyNo; + /** 投保人名称 */ + @ApiModelProperty(value = "投保人名称") + private String holderName; + /** 投保人手机号 */ + @ApiModelProperty(value = "投保人手机号") + private String holderPhone; + /** 保险公司名称 */ + @ApiModelProperty(value = "保险公司名称") + private String supplierName; + /** 是否记录完整0-否1-是 */ + @ApiModelProperty(value = "是否记录完整0-否1-是") + private String complete; + /** 是否已归档 0-否1-是 */ + @ApiModelProperty(value = "是否已归档 0-否1-是 ") + private String archived; + /** 完成日期 */ + @ApiModelProperty(value = "完成日期") + private Long completeDate; + /** 归档日期 */ + @ApiModelProperty(value = "归档日期") + private Long archivedDate; + /** 保单起始日期 */ + @ApiModelProperty(value = "保单起始日期") + private String startDate; + /** 保单结束日期 */ + @ApiModelProperty(value = "保单结束日期") + private String endDate; + /** 生成视频文件ID */ + @ApiModelProperty(value = "生成视频文件ID") + private String fileId; + /** 生成视频文件地址 */ + @ApiModelProperty(value = "生成视频文件地址") + private String fileUrl; + /** 业务订单ID */ + @ApiModelProperty(value = "业务订单ID") + private String orderId; + /** 回溯记录跟踪ID */ + @ApiModelProperty(value = "回溯记录跟踪ID") + private String traceId; + /** 可回溯记录appKey */ + @ApiModelProperty(value = "可回溯记录appKey") + private String appKey; + /** 创建人 */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** 创建时间 */ + @ApiModelProperty(value = "创建时间") + private Long createTime; + /** 更新人 */ + @ApiModelProperty(value = "更新人") + private String updateBy; + /** 更新时间 */ + @ApiModelProperty(value = "更新时间") + private Long updateTime; + +} diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallRecordVO.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallRecordVO.java new file mode 100644 index 0000000..f0748c8 --- /dev/null +++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/vo/RecallRecordVO.java @@ -0,0 +1,48 @@ +package com.wabestway.recall.trace.vo; + +import java.io.Serializable; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Data +@ApiModel +public class RecallRecordVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** 主键 */ + @ApiModelProperty(value = "主键") + private String id; + /** 产品编码 */ + @ApiModelProperty(value = "产品编码") + private String productCode; + /** 产品名称 */ + @ApiModelProperty(value = "产品名称") + private String productName; + /** 模块 */ + @ApiModelProperty(value = "模块") + private String module; + /** 页面说明 */ + @ApiModelProperty(value = "页面说明") + private String content; + /** 记录事件 */ + @ApiModelProperty(value = "记录事件") + private Blob events; + /** 回溯记录跟踪ID */ + @ApiModelProperty(value = "回溯记录跟踪ID") + private String traceId; + /** 创建人 */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** 创建时间 */ + @ApiModelProperty(value = "创建时间") + private Long createTime; + +} diff --git a/afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml b/afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml new file mode 100644 index 0000000..c0253a2 --- /dev/null +++ b/afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml @@ -0,0 +1,236 @@ + + + + + + + t.id id, + t.product_code productCode, + t.product_name productName, + t.policy_no policyNo, + t.holder_name holderName, + t.holder_phone holderPhone, + t.supplier_name supplierName, + t.complete complete, + t.archived archived, + t.complete_date completeDate, + t.archived_date archivedDate, + t.start_date startDate, + t.end_date endDate, + t.file_id fileId, + t.file_url fileUrl, + t.order_id orderId, + t.trace_id traceId, + t.tenant_id tenantId, + t.app_key appKey, + t.create_by createBy, + t.create_time createTime, + t.update_by updateBy, + t.update_time updateTime + + + + + + + + + + update recall_order t + + + + t.id = #{recallOrder.id}, + + + t.product_code = #{recallOrder.productCode}, + + + t.product_name = #{recallOrder.productName}, + + + t.policy_no = #{recallOrder.policyNo}, + + + t.holder_name = #{recallOrder.holderName}, + + + t.holder_phone = #{recallOrder.holderPhone}, + + + t.supplier_name = #{recallOrder.supplierName}, + + + t.complete = #{recallOrder.complete}, + + + t.archived = #{recallOrder.archived}, + + + t.complete_date = #{recallOrder.completeDate}, + + + t.archived_date = #{recallOrder.archivedDate}, + + + t.start_date = #{recallOrder.startDate}, + + + t.end_date = #{recallOrder.endDate}, + + + t.file_id = #{recallOrder.fileId}, + + + t.file_url = #{recallOrder.fileUrl}, + + + t.order_id = #{recallOrder.orderId}, + + + t.trace_id = #{recallOrder.traceId}, + + + t.app_key = #{recallOrder.appKey}, + + + t.update_by = #{recallOrder.updateBy}, + + + t.update_time = #{recallOrder.updateTime}, + + + where t.id= #{recallOrder.id} + + + \ No newline at end of file diff --git a/afis-recall-service/src/main/resources/mapper/trace/RecallRecordDao.xml b/afis-recall-service/src/main/resources/mapper/trace/RecallRecordDao.xml new file mode 100644 index 0000000..19067eb --- /dev/null +++ b/afis-recall-service/src/main/resources/mapper/trace/RecallRecordDao.xml @@ -0,0 +1,117 @@ + + + + + + + t.id id, + t.product_code productCode, + t.product_name productName, + t.module module, + t.content content, + t.events events, + t.trace_id traceId, + t.create_by createBy, + t.create_time createTime + + + + + + + + + + update recall_record t + + + + t.id = #{recallRecord.id}, + + + t.product_code = #{recallRecord.productCode}, + + + t.product_name = #{recallRecord.productName}, + + + t.module = #{recallRecord.module}, + + + t.content = #{recallRecord.content}, + + + t.events = #{recallRecord.events}, + + + t.trace_id = #{recallRecord.traceId}, + + + where t.id= #{recallRecord.id} + + + \ No newline at end of file diff --git a/afis-recall-web/.gitignore b/afis-recall-web/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/afis-recall-web/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/afis-recall-web/pom.xml b/afis-recall-web/pom.xml new file mode 100644 index 0000000..76fa513 --- /dev/null +++ b/afis-recall-web/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + + com.wabestway.recall + afis-recall + 0.0.1-SNAPSHOT + + + afis-recall-web + jar + + 1.8 + Hoxton.SR9 + 2.2.3.RELEASE + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + com.wabestway.engine + afis-engine-api + 2.5 + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-data-mongodb-reactive + + + org.springframework.boot + spring-boot-starter-webflux + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + io.projectreactor + reactor-test + test + + + com.alibaba + fastjson + 2.0.17 + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/wabestway/recall/AfisRecallApplication.java b/afis-recall-web/src/main/java/com/wabestway/recall/AfisRecallApplication.java similarity index 100% rename from src/main/java/com/wabestway/recall/AfisRecallApplication.java rename to afis-recall-web/src/main/java/com/wabestway/recall/AfisRecallApplication.java diff --git a/src/main/java/com/wabestway/recall/model/Order.java b/afis-recall-web/src/main/java/com/wabestway/recall/model/Order.java similarity index 100% rename from src/main/java/com/wabestway/recall/model/Order.java rename to afis-recall-web/src/main/java/com/wabestway/recall/model/Order.java diff --git a/src/main/java/com/wabestway/recall/model/OrderList.java b/afis-recall-web/src/main/java/com/wabestway/recall/model/OrderList.java similarity index 100% rename from src/main/java/com/wabestway/recall/model/OrderList.java rename to afis-recall-web/src/main/java/com/wabestway/recall/model/OrderList.java diff --git a/src/main/java/com/wabestway/recall/model/Record.java b/afis-recall-web/src/main/java/com/wabestway/recall/model/Record.java similarity index 100% rename from src/main/java/com/wabestway/recall/model/Record.java rename to afis-recall-web/src/main/java/com/wabestway/recall/model/Record.java diff --git a/src/main/java/com/wabestway/recall/model/ResObj.java b/afis-recall-web/src/main/java/com/wabestway/recall/model/ResObj.java similarity index 100% rename from src/main/java/com/wabestway/recall/model/ResObj.java rename to afis-recall-web/src/main/java/com/wabestway/recall/model/ResObj.java diff --git a/src/main/java/com/wabestway/recall/repository/OrderRepository.java b/afis-recall-web/src/main/java/com/wabestway/recall/repository/OrderRepository.java similarity index 100% rename from src/main/java/com/wabestway/recall/repository/OrderRepository.java rename to afis-recall-web/src/main/java/com/wabestway/recall/repository/OrderRepository.java diff --git a/src/main/java/com/wabestway/recall/repository/RecordRepository.java b/afis-recall-web/src/main/java/com/wabestway/recall/repository/RecordRepository.java similarity index 100% rename from src/main/java/com/wabestway/recall/repository/RecordRepository.java rename to afis-recall-web/src/main/java/com/wabestway/recall/repository/RecordRepository.java diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java new file mode 100644 index 0000000..f23c9f6 --- /dev/null +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java @@ -0,0 +1,69 @@ +package com.wabestway.recall.trace.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.wabestway.recall.trace.dto.RecallOrderDTO; +import com.wabestway.recall.trace.vo.RecallOrderVO; +import com.wabestway.recall.trace.service.RecallOrderApiService; +import com.wabestway.commons.http.Paging; +import com.wabestway.commons.http.ResObj; + + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@RestController +@RequestMapping("/trace/recallOrder") +@Api(tags = {"-接口"}, description = "-接口") +public class RecallOrderController { + @Autowired + private RecallOrderApiService recallOrderApiService; + + /** + * 列表 + */ + @PostMapping("/list") + @ApiOperation(value = "分页列表查询", notes = "条件分页查询列表", httpMethod = "POST") + public ResObj> list(@RequestBody RecallOrderDTO paramRequest) { + return recallOrderApiService.list(paramRequest); + } + + /** + * 信息 + */ + @GetMapping("/info/{id}") + @ApiOperation(value = "根据id查详情", notes = "根据id查详情", httpMethod = "GET") + public ResObj info(@PathVariable("id") String id) { + return recallOrderApiService.getRecallOrder(id); + } + + /** + * 保存 + */ + @PostMapping("/save") + @ApiOperation(value = "保存", notes = "保存", httpMethod = "POST") + public ResObj saveRecallOrder(@RequestBody RecallOrderDTO paramRequest) { + return recallOrderApiService.saveRecallOrder(paramRequest); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperation(value = "修改", notes = "修改", httpMethod = "POST") + public ResObj updateRecallOrder(@RequestBody RecallOrderDTO paramRequest) { + return recallOrderApiService.updateRecallOrder(paramRequest); + } + + @PostMapping("/changeStatus") + @ApiOperation(value = "启禁用更新", notes = "启禁用更新", httpMethod = "POST") + public ResObj changeStatus(@RequestBody RecallOrderDTO paramRequest) { + return recallOrderApiService.changeStatus(paramRequest.getId(), paramRequest.getStatus()); + } +} diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallRecordController.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallRecordController.java new file mode 100644 index 0000000..df72b34 --- /dev/null +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallRecordController.java @@ -0,0 +1,69 @@ +package com.wabestway.recall.trace.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.wabestway.recall.trace.dto.RecallRecordDTO; +import com.wabestway.recall.trace.vo.RecallRecordVO; +import com.wabestway.recall.trace.service.RecallRecordApiService; +import com.wabestway.commons.http.Paging; +import com.wabestway.commons.http.ResObj; + + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@RestController +@RequestMapping("/trace/recallRecord") +@Api(tags = {"-接口"}, description = "-接口") +public class RecallRecordController { + @Autowired + private RecallRecordApiService recallRecordApiService; + + /** + * 列表 + */ + @PostMapping("/list") + @ApiOperation(value = "分页列表查询", notes = "条件分页查询列表", httpMethod = "POST") + public ResObj> list(@RequestBody RecallRecordDTO paramRequest) { + return recallRecordApiService.list(paramRequest); + } + + /** + * 信息 + */ + @GetMapping("/info/{id}") + @ApiOperation(value = "根据id查详情", notes = "根据id查详情", httpMethod = "GET") + public ResObj info(@PathVariable("id") String id) { + return recallRecordApiService.getRecallRecord(id); + } + + /** + * 保存 + */ + @PostMapping("/save") + @ApiOperation(value = "保存", notes = "保存", httpMethod = "POST") + public ResObj saveRecallRecord(@RequestBody RecallRecordDTO paramRequest) { + return recallRecordApiService.saveRecallRecord(paramRequest); + } + + /** + * 修改 + */ + @PostMapping("/update") + @ApiOperation(value = "修改", notes = "修改", httpMethod = "POST") + public ResObj updateRecallRecord(@RequestBody RecallRecordDTO paramRequest) { + return recallRecordApiService.updateRecallRecord(paramRequest); + } + + @PostMapping("/changeStatus") + @ApiOperation(value = "启禁用更新", notes = "启禁用更新", httpMethod = "POST") + public ResObj changeStatus(@RequestBody RecallRecordDTO paramRequest) { + return recallRecordApiService.changeStatus(paramRequest.getId(), paramRequest.getStatus()); + } +} diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java new file mode 100644 index 0000000..9cd1d5d --- /dev/null +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallOrderApiService.java @@ -0,0 +1,54 @@ +package com.wabestway.recall.trace.service; + +import java.util.List; +import com.wabestway.recall.trace.dto.RecallOrderDTO; +import com.wabestway.recall.trace.vo.RecallOrderVO; +import com.wabestway.commons.http.Paging; +import com.wabestway.commons.http.ResObj; + + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +public interface RecallOrderApiService { + + /** + * 列表 + * @param paramReq + * @return + */ + ResObj> list(RecallOrderDTO paramReq); + + /** + * 查询详情 + * @param id + * @return + */ + ResObj getRecallOrder(String id); + + /** + * 保存 + * @param paramReq + * @return + */ + ResObj saveRecallOrder(RecallOrderDTO paramReq); + + /** + * 修改 + * @param paramReq + * @return + */ + ResObj updateRecallOrder(RecallOrderDTO paramReq); + + /** + * 启禁用 + * @param id + * @param status + * @return + */ + ResObj changeStatus(String id, String status); +} diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java new file mode 100644 index 0000000..991c83a --- /dev/null +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/RecallRecordApiService.java @@ -0,0 +1,54 @@ +package com.wabestway.recall.trace.service; + +import java.util.List; +import com.wabestway.recall.trace.dto.RecallRecordDTO; +import com.wabestway.recall.trace.vo.RecallRecordVO; +import com.wabestway.commons.http.Paging; +import com.wabestway.commons.http.ResObj; + + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +public interface RecallRecordApiService { + + /** + * 列表 + * @param paramReq + * @return + */ + ResObj> list(RecallRecordDTO paramReq); + + /** + * 查询详情 + * @param id + * @return + */ + ResObj getRecallRecord(String id); + + /** + * 保存 + * @param paramReq + * @return + */ + ResObj saveRecallRecord(RecallRecordDTO paramReq); + + /** + * 修改 + * @param paramReq + * @return + */ + ResObj updateRecallRecord(RecallRecordDTO paramReq); + + /** + * 启禁用 + * @param id + * @param status + * @return + */ + ResObj changeStatus(String id, String status); +} diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java new file mode 100644 index 0000000..5b573e9 --- /dev/null +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallOrderApiServiceImpl.java @@ -0,0 +1,85 @@ +package com.wabestway.recall.trace.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wabestway.commons.http.Paging; +import com.wabestway.commons.http.ResObj; +import com.wabestway.commons.enums.DataValidEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.BeanUtils; +import com.wabestway.ins.utils.UUIDUtil; +import com.wabestway.recall.trace.entity.RecallOrderEntity; +import com.wabestway.recall.trace.dto.RecallOrderDTO; +import com.wabestway.recall.trace.vo.RecallOrderVO; +import com.wabestway.recall.trace.service.RecallOrderApiService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.wabestway.recall.trace.util.HeaderDataUtil; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Service +public class RecallOrderApiServiceImpl implements RecallOrderApiService { + @Autowired + private RecallOrderService recallOrderService; + + @Override + public ResObj> list(RecallOrderDTO paramReq) { + IPage resultPage = recallOrderService.queryRecallOrderByCondition(paramReq.getPage(), paramReq.getPageSize(), paramReq); + + Paging paging = new Paging(resultPage.getRecords(), paramReq.getPage(), resultPage.getSize(), resultPage.getTotal()); + return ResObj.ok(paging); + } + + @Override + public ResObj getRecallOrder(String id) { + RecallOrderVO recallOrderVO = recallOrderService.queryRecallOrderById(id); + + return ResObj.ok(recallOrderVO); + } + + @Transactional + @Override + public ResObj saveRecallOrder(RecallOrderDTO paramReq) { + RecallOrderEntity recallOrder = new RecallOrderEntity(); + BeanUtils.copyProperties(paramReq, recallOrder); + + recallOrder.setId(UUIDUtil.generate());//赋值id + recallOrder.setStatus(DataValidEnum.VALID.getCode()); + recallOrder.setCreateBy(HeaderDataUtil.getUserId());//创建人 + recallOrder.setCreateTime(System.currentTimeMillis());//创建时间 + recallOrder.setUpdateBy(HeaderDataUtil.getUserId());//更新人 + recallOrder.setUpdateTime(System.currentTimeMillis());//更新时间 + + recallOrderService.save(recallOrder); + return ResObj.ok(); + } + + @Transactional + @Override + public ResObj updateRecallOrder(RecallOrderDTO paramReq) { + RecallOrderEntity recallOrder = new RecallOrderEntity(); + BeanUtils.copyProperties(paramReq, recallOrder); + recallOrder.setUpdateBy(HeaderDataUtil.getUserId());//更新人 + recallOrder.setUpdateTime(System.currentTimeMillis());//更新时间 + recallOrderService.updateById(recallOrder); + return ResObj.ok(); + } + + @Transactional + @Override + public ResObj changeStatus(String id, String status) { + RecallOrderEntity recallOrder = new RecallOrderEntity(); + recallOrder.setId(id); + recallOrder.setStatus(status); + recallOrder.setUpdateBy(HeaderDataUtil.getUserId()); + recallOrder.setUpdateTime(System.currentTimeMillis()); + recallOrderService.updateRecallOrderById(recallOrder); + + return ResObj.ok(); + } +} diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordApiServiceImpl.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordApiServiceImpl.java new file mode 100644 index 0000000..56308e2 --- /dev/null +++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/service/impl/RecallRecordApiServiceImpl.java @@ -0,0 +1,85 @@ +package com.wabestway.recall.trace.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wabestway.commons.http.Paging; +import com.wabestway.commons.http.ResObj; +import com.wabestway.commons.enums.DataValidEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.BeanUtils; +import com.wabestway.ins.utils.UUIDUtil; +import com.wabestway.recall.trace.entity.RecallRecordEntity; +import com.wabestway.recall.trace.dto.RecallRecordDTO; +import com.wabestway.recall.trace.vo.RecallRecordVO; +import com.wabestway.recall.trace.service.RecallRecordApiService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.wabestway.recall.trace.util.HeaderDataUtil; + +/** + * + * + * @author wangH + * @company 北京华焱坤泰科技有限公司 + * @Time 2023-05-06 17:37:03 + */ +@Service +public class RecallRecordApiServiceImpl implements RecallRecordApiService { + @Autowired + private RecallRecordService recallRecordService; + + @Override + public ResObj> list(RecallRecordDTO paramReq) { + IPage resultPage = recallRecordService.queryRecallRecordByCondition(paramReq.getPage(), paramReq.getPageSize(), paramReq); + + Paging paging = new Paging(resultPage.getRecords(), paramReq.getPage(), resultPage.getSize(), resultPage.getTotal()); + return ResObj.ok(paging); + } + + @Override + public ResObj getRecallRecord(String id) { + RecallRecordVO recallRecordVO = recallRecordService.queryRecallRecordById(id); + + return ResObj.ok(recallRecordVO); + } + + @Transactional + @Override + public ResObj saveRecallRecord(RecallRecordDTO paramReq) { + RecallRecordEntity recallRecord = new RecallRecordEntity(); + BeanUtils.copyProperties(paramReq, recallRecord); + + recallRecord.setId(UUIDUtil.generate());//赋值id + recallRecord.setStatus(DataValidEnum.VALID.getCode()); + recallRecord.setCreateBy(HeaderDataUtil.getUserId());//创建人 + recallRecord.setCreateTime(System.currentTimeMillis());//创建时间 + recallRecord.setUpdateBy(HeaderDataUtil.getUserId());//更新人 + recallRecord.setUpdateTime(System.currentTimeMillis());//更新时间 + + recallRecordService.save(recallRecord); + return ResObj.ok(); + } + + @Transactional + @Override + public ResObj updateRecallRecord(RecallRecordDTO paramReq) { + RecallRecordEntity recallRecord = new RecallRecordEntity(); + BeanUtils.copyProperties(paramReq, recallRecord); + recallRecord.setUpdateBy(HeaderDataUtil.getUserId());//更新人 + recallRecord.setUpdateTime(System.currentTimeMillis());//更新时间 + recallRecordService.updateById(recallRecord); + return ResObj.ok(); + } + + @Transactional + @Override + public ResObj changeStatus(String id, String status) { + RecallRecordEntity recallRecord = new RecallRecordEntity(); + recallRecord.setId(id); + recallRecord.setStatus(status); + recallRecord.setUpdateBy(HeaderDataUtil.getUserId()); + recallRecord.setUpdateTime(System.currentTimeMillis()); + recallRecordService.updateRecallRecordById(recallRecord); + + return ResObj.ok(); + } +} diff --git a/src/main/java/com/wabestway/recall/web/OrderController.java b/afis-recall-web/src/main/java/com/wabestway/recall/web/OrderController.java similarity index 100% rename from src/main/java/com/wabestway/recall/web/OrderController.java rename to afis-recall-web/src/main/java/com/wabestway/recall/web/OrderController.java diff --git a/src/main/java/com/wabestway/recall/web/RecallController.java b/afis-recall-web/src/main/java/com/wabestway/recall/web/RecallController.java similarity index 100% rename from src/main/java/com/wabestway/recall/web/RecallController.java rename to afis-recall-web/src/main/java/com/wabestway/recall/web/RecallController.java diff --git a/pom.xml b/pom.xml index cd35c4c..545ab26 100644 --- a/pom.xml +++ b/pom.xml @@ -1,107 +1,56 @@ - + 4.0.0 + + com.wabestway.recall + afis-recall + pom + 1.0-SNAPSHOT + + afis-recall-web + afis-recall-service + + + org.springframework.boot spring-boot-starter-parent - 2.3.12.RELEASE + 2.2.11.RELEASE - com.wabestway.recall - afis-recall - 0.0.1-SNAPSHOT - afis-recall - afis-recall + - 1.8 - Hoxton.SR9 - 2.2.3.RELEASE + 2.0.3 + 2.9.2 + + - org.springframework.cloud - spring-cloud-starter-openfeign + io.springfox + springfox-swagger-ui + ${swagger.version} - com.wabestway.engine - afis-engine-api - 2.5 + io.springfox + springfox-swagger2 + ${swagger.version} - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-data-mongodb-reactive - - - org.springframework.boot - spring-boot-starter-webflux + com.github.xiaoymin + knife4j-spring-boot-starter + + ${knife4j.version} + + org.projectlombok lombok + 1.18.6 true - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - com.alibaba - fastjson - 2.0.17 - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - + \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml deleted file mode 100644 index 6b0df99..0000000 --- a/src/main/resources/application-dev.yml +++ /dev/null @@ -1,7 +0,0 @@ -server: - port: 9235 - -spring: - data: - mongodb: - uri: mongodb://localhost:27017/recall \ No newline at end of file diff --git a/src/main/resources/application-native.yml b/src/main/resources/application-native.yml deleted file mode 100644 index 6b0df99..0000000 --- a/src/main/resources/application-native.yml +++ /dev/null @@ -1,7 +0,0 @@ -server: - port: 9235 - -spring: - data: - mongodb: - uri: mongodb://localhost:27017/recall \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 253dcf4..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.data.mongodb.uri=mongodb://localhost:27017/recall diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index 8b13789..0000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/resources/bootstrap-dev.yml b/src/main/resources/bootstrap-dev.yml deleted file mode 100644 index a2c0c81..0000000 --- a/src/main/resources/bootstrap-dev.yml +++ /dev/null @@ -1,16 +0,0 @@ - -spring: - application: - name: afis-recall - cloud: - nacos: - config: - file-extension: yaml - server-addr: 192.168.0.141:8848 - namespace: ns-car-dev - discovery: - #Nacos服务注册中心地址 - server-addr: 192.168.0.141:8848 - namespace: ns-car-dev - main: - allow-bean-definition-overriding: true \ No newline at end of file diff --git a/src/main/resources/bootstrap-prod.yml b/src/main/resources/bootstrap-prod.yml deleted file mode 100644 index 90acfa4..0000000 --- a/src/main/resources/bootstrap-prod.yml +++ /dev/null @@ -1,17 +0,0 @@ - -spring: - profiles: prod - application: - name: afis-recall - cloud: - nacos: - config: - file-extension: yaml - server-addr: 192.168.0.249:8848,192.168.0.203:8848 - namespace: yxb-prod - discovery: - #Nacos服务注册中心地址 - server-addr: 192.168.0.249:8848,192.168.0.203:8848 - namespace: yxb-prod - main: - allow-bean-definition-overriding: true diff --git a/src/main/resources/bootstrap-sit.yml b/src/main/resources/bootstrap-sit.yml deleted file mode 100644 index 8565c97..0000000 --- a/src/main/resources/bootstrap-sit.yml +++ /dev/null @@ -1,16 +0,0 @@ -spring: - profiles: sit - application: - name: afis-recall - cloud: - nacos: - config: - file-extension: yaml - server-addr: 10.255.255.177:8848 - namespace: ns-car-sit - discovery: - #Nacos服务注册中心地址 - server-addr: 10.255.255.177:8848 - namespace: ns-car-sit - main: - allow-bean-definition-overriding: true diff --git a/src/main/resources/bootstrap-uat.yml b/src/main/resources/bootstrap-uat.yml deleted file mode 100644 index 0f34476..0000000 --- a/src/main/resources/bootstrap-uat.yml +++ /dev/null @@ -1,16 +0,0 @@ -spring: - profiles: uat - application: - name: afis-recall - cloud: - nacos: - config: - file-extension: yaml - server-addr: 192.168.1.128:9010 - namespace: ns-car-uat - discovery: - #Nacos服务注册中心地址 - server-addr: 192.168.1.128:9010 - namespace: ns-car-uat - main: - allow-bean-definition-overriding: true diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml deleted file mode 100644 index 54d7ddc..0000000 --- a/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: native diff --git a/src/test/java/com/wabestway/recall/FFmpeg.java b/src/test/java/com/wabestway/recall/FFmpeg.java deleted file mode 100644 index 3945f20..0000000 --- a/src/test/java/com/wabestway/recall/FFmpeg.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.wabestway.recall; - - -import com.alibaba.fastjson.JSONArray; -import org.junit.jupiter.api.Test; - -import javax.script.*; -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Base64; -import java.util.Comparator; -import java.util.List; -import java.util.zip.GZIPInputStream; - - -public class FFmpeg { - @Test - public void TestMp4() throws IOException { - String jsonData = new String(Files.readAllBytes(Paths.get("C:","Users/Administrator/Desktop","traces.json")), StandardCharsets.UTF_8); - - // 创建临时目录 - Path tempDir = null; - try { - tempDir = Files.createTempDirectory("example"); - } catch (IOException e) { - e.printStackTrace(); - } - System.out.println("Created temporary directory: " + tempDir); - - try { - File tempFile = File.createTempFile("traces", ".json", tempDir.toFile()); - FileWriter fw = new FileWriter(tempFile); - BufferedWriter bw = new BufferedWriter(fw); - bw.write(jsonData); - bw.flush(); - bw.close(); - fw.close(); - String[] command = {"C:\\Users\\Administrator\\AppData\\Roaming\\npm\\ts-node", "E:\\Develop\\trace-transform\\src\\index.ts"}; - ProcessBuilder processBuilder = new ProcessBuilder(command); - processBuilder.directory(tempDir.toFile()); - // 在临时目录下执行命令 - Process process = processBuilder.start(); - // 读取命令输出 - BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); - String line; - while ((line = reader.readLine()) != null) { - System.out.println(line); - } - reader.close(); - - // 等待命令执行完成 - int exitCode = process.waitFor(); - System.out.println("Command exited with code " + exitCode); - } catch (IOException | InterruptedException e) { - e.printStackTrace(); - } finally { - // 删除临时目录 - Files.walk(tempDir) - .sorted(Comparator.reverseOrder()) - .map(Path::toFile) - .forEach(File::delete); - } - } - - -} diff --git a/src/test/java/com/wabestway/recall/JSEngine.java b/src/test/java/com/wabestway/recall/JSEngine.java deleted file mode 100644 index 8503276..0000000 --- a/src/test/java/com/wabestway/recall/JSEngine.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wabestway.recall; - -import org.junit.Test; - -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; - -public class JSEngine { - @Test - public void TestEngine(){ - ScriptEngineManager manager = new ScriptEngineManager(); - ScriptEngine engine = manager.getEngineByName("js"); - System.out.printf(engine.toString()); - } -}