diff --git a/src/main/java/com/glxp/api/controller/system/ThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java similarity index 97% rename from src/main/java/com/glxp/api/controller/system/ThirdSysApiController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java index 109e71f2b..eaf10179e 100644 --- a/src/main/java/com/glxp/api/controller/system/ThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.system; +package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; import com.glxp.api.entity.system.ThirdSysApiEntity; diff --git a/src/main/java/com/glxp/api/controller/system/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java similarity index 98% rename from src/main/java/com/glxp/api/controller/system/ThirdUploadSetController.java rename to src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java index 039eae996..62414e60a 100644 --- a/src/main/java/com/glxp/api/controller/system/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.system; +package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderUploadLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderUploadLogController.java new file mode 100644 index 000000000..f19bb282a --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderUploadLogController.java @@ -0,0 +1,52 @@ +package com.glxp.api.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest; +import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse; +import com.glxp.api.service.thrsys.ThrOrderUploadLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + + +@Slf4j +@RestController +public class ThrOrderUploadLogController { + + @Resource + private ThrOrderUploadLogService thrOrderUploadLogService; + + /** + * 查询单据上传日志 + * + * @param uploadLogRequest + * @return + */ + @GetMapping("/udiwms/inout/order/uploadLog/filter") + public BaseResponse filter(FilterThrOrderUploadLogRequest uploadLogRequest) { + List list = thrOrderUploadLogService.filterList(uploadLogRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 删除上传单据日志 + * + * @param id + * @return + */ + @GetMapping("/udiwms/inout/order/uploadLog/delete") + public BaseResponse delete(Integer id) { + boolean result = thrOrderUploadLogService.delete(id); + if (result) { + return ResultVOUtils.success("删除成功"); + } + return ResultVOUtils.error(500, "删除失败"); + } + +} diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderUploadLogDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderUploadLogDao.java new file mode 100644 index 000000000..4f04aad07 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderUploadLogDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.dao.inout; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.inout.IoOrderUploadLogEntity; +import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest; +import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse; + +import java.util.List; + +public interface IoOrderUploadLogDao extends BaseMapper { + + /** + * 查询上传日志列表 + * + * @param uploadLogRequest + * @return + */ + List filterList(FilterThrOrderUploadLogRequest uploadLogRequest); +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderUploadLogEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderUploadLogEntity.java new file mode 100644 index 000000000..c18d498b7 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderUploadLogEntity.java @@ -0,0 +1,89 @@ +package com.glxp.api.entity.inout; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 单据上传日志表 + */ +@Data +@TableName(value = "io_order_upload_log") +public class IoOrderUploadLogEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + + /** + * 单据日期 + */ + @TableField(value = "billDate") + private Date billDate; + + /** + * 单据类型 + */ + @TableField(value = "billType") + private String billType; + + /** + * 第三方单据号 + */ + @TableField(value = "thrBillNo") + private String thrBillNo; + + /** + * 提交时间 + */ + @TableField(value = "submitTime") + private Date submitTime; + + /** + * 提交状态 0：未提交 1：正在处理 2：已提交 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 结果信息 + */ + @TableField(value = "`result`") + private String result; + + /** + * 单据来源：1:主动上传到第三方；2.被动接收第三方上传 + */ + @TableField(value = "fromType") + private Integer fromType; + + public static final String COL_ID = "id"; + + public static final String COL_BILLNO = "billNo"; + + public static final String COL_BILLDATE = "billDate"; + + public static final String COL_BILLTYPE = "billType"; + + public static final String COL_THRBILLNO = "thrBillNo"; + + public static final String COL_SUBMITTIME = "submitTime"; + + public static final String COL_STATUS = "status"; + + public static final String COL_RESULT = "result"; + + public static final String COL_FROMTYPE = "fromType"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderUploadLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderUploadLogRequest.java new file mode 100644 index 000000000..c3a0d9ce6 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderUploadLogRequest.java @@ -0,0 +1,41 @@ +package com.glxp.api.req.thrsys; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 查询单据上传日志接口参数 + */ +@Data +public class FilterThrOrderUploadLogRequest extends ListPageRequest { + + /** + * 业务单据号 + */ + private String billNo; + + /** + * 第三方单据号 + */ + private String thirdBillNo; + + /** + * 提交时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date submitTime; + + /** + * 提交状态 + */ + private Integer status; + + /** + * 单据流向：1:主动上传到第三方；2.被动接收第三方上传 + */ + private Integer fromType; + +} diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadLogResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadLogResponse.java new file mode 100644 index 000000000..6884e6699 --- /dev/null +++ b/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadLogResponse.java @@ -0,0 +1,16 @@ +package com.glxp.api.res.thrsys; + +import lombok.Data; + +/** + * 单据上传日志响应参数 + */ +@Data +public class ThrOrderUploadLogResponse { + + /** + * 单据类型名称 + */ + private String billTypeName; + +} diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadResponse.java deleted file mode 100644 index 1b12c0c31..000000000 --- a/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadResponse.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.glxp.api.res.thrsys; - -import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; -import lombok.Data; - -import java.util.List; - -/** - * 单据上传接口响应数据 - */ -@Data -public class ThrOrderUploadResponse { - - private Integer id; - - /** - * 是否自动上传 - */ - private Boolean autoUpload; - - /** - * 同步时间间隔 - */ - private Integer orderSyncTime; - - /** - * 待校验单据 - */ - private Integer orderUnCheck; - - /** - * 未验收单据 - */ - private Integer orderUnReceive; - - /** - * 已完成单据 - */ - private Integer orderScanFinish; - - /** - * UDIMS平台 - */ - private Integer checkUdims; - - /** - * PDA已校验 - */ - private Integer checkPdaEd; - - /** - * pda未校验 - */ - private Integer checkPdaUn; - - /** - * 扫码通 - */ - private Integer checkPc; - - /** - * 网页端新增 - */ - private Integer checkWebNew; - - /** - * 缺量补单 - */ - private Integer checkChange; - - /** - * 自助平台同步 - */ - private Integer checkSp; - - /** - * 平衡补单 - */ - private Integer checkBalacne; - - /** - * 单据上传起始时间 - */ - private String orderStartTime; - - /** - * 创建人 - */ - private String createUser; - - /** - * 创建时间 - */ - private Data createTime; - - /** - * 更新人 - */ - private String updateUser; - - /** - * 更新时间 - */ - private Data updateTime; - - /** - * 备注 - */ - private String remark; - - /** - * 上传单据类型集合 - */ - List busTypes; - -} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadLogService.java new file mode 100644 index 000000000..77995d62b --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadLogService.java @@ -0,0 +1,29 @@ +package com.glxp.api.service.thrsys; + +import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest; +import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse; + +import java.util.List; + +/** + * 上传日志Service + */ +public interface ThrOrderUploadLogService { + + /** + * 查询上传日志列表 + * + * @param uploadLogRequest + * @return + */ + List filterList(FilterThrOrderUploadLogRequest uploadLogRequest); + + /** + * 删除上传日志 + * + * @param id + * @return + */ + boolean delete(Integer id); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadLogServiceImpl.java new file mode 100644 index 000000000..5bdc3a9e2 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadLogServiceImpl.java @@ -0,0 +1,39 @@ +package com.glxp.api.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.inout.IoOrderUploadLogDao; +import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest; +import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse; +import com.glxp.api.service.thrsys.ThrOrderUploadLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class ThrOrderUploadLogServiceImpl implements ThrOrderUploadLogService { + + @Resource + private IoOrderUploadLogDao uploadLogDao; + + @Override + public List filterList(FilterThrOrderUploadLogRequest uploadLogRequest) { + if (null == uploadLogRequest) { + return Collections.emptyList(); + } + if (null != uploadLogRequest && null != uploadLogRequest.getLimit()) { + PageHelper.offsetPage((uploadLogRequest.getPage() - 1) * uploadLogRequest.getLimit(), uploadLogRequest.getLimit()); + } + return uploadLogDao.filterList(uploadLogRequest); + } + + @Override + public boolean delete(Integer id) { + return uploadLogDao.deleteById(id) == 1 ? true : false; + } +} diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml new file mode 100644 index 000000000..22978a3cc --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + id, + billNo, + billDate, + billType, + thrBillNo, + submitTime, + `status`, + `result`, + fromType + + + + \ No newline at end of file