From 9a644e8f7347c87d1f52df73758296c5aff9edb1 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 28 Feb 2023 20:51:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E8=AE=BE=E7=BD=AE=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrUploadSetController.java | 64 ++++++++++ .../dao/thrsys/ThrOrderUploadBusTypeDao.java | 11 ++ .../api/dao/thrsys/ThrOrderUploadDao.java | 8 ++ .../thrsys/ThrOrderUploadBustypesEntity.java | 6 +- .../entity/thrsys/ThrOrderUploadEntity.java | 2 +- .../req/thrsys/PostThrOrderUploadRequest.java | 116 ++++++++++++++++++ .../res/thrsys/ThrOrderUploadResponse.java | 116 ++++++++++++++++++ .../thrsys/ThrOrderUploadBusTypService.java | 26 ++++ .../service/thrsys/ThrOrderUploadService.java | 23 ++++ .../impl/ThrOrderUploadBusTypServiceImpl.java | 44 +++++++ .../impl/ThrOrderUploadServiceImpl.java | 58 +++++++++ 11 files changed, 471 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/thrsys/ThrUploadSetController.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBusTypeDao.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadDao.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/PostThrOrderUploadRequest.java create mode 100644 src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadResponse.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBusTypService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadBusTypServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadServiceImpl.java diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrUploadSetController.java new file mode 100644 index 000000000..ffa2d1900 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrUploadSetController.java @@ -0,0 +1,64 @@ +package com.glxp.api.controller.thrsys; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; +import com.glxp.api.entity.thrsys.ThrOrderUploadEntity; +import com.glxp.api.req.thrsys.PostThrOrderUploadRequest; +import com.glxp.api.res.thrsys.ThrOrderUploadResponse; +import com.glxp.api.service.thrsys.ThrOrderUploadBusTypService; +import com.glxp.api.service.thrsys.ThrOrderUploadService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 单据上传设置接口 + */ +@Slf4j +@RestController +public class ThrUploadSetController { + + @Resource + private ThrOrderUploadService thrOrderUploadService; + @Resource + private ThrOrderUploadBusTypService thrOrderUploadBusTypService; + + /** + * 查询上传设置 + * + * @return + */ + @GetMapping("/system/third/syncData/config") + public BaseResponse list() { + ThrOrderUploadResponse uploadResponse = thrOrderUploadService.findSet(); + return ResultVOUtils.success(uploadResponse); + } + + /** + * 添加或修改上传设置 + * + * @param thrOrderUploadRequest + * @return + */ + @PostMapping("/system/third/syncData/save") + public BaseResponse save(@RequestBody PostThrOrderUploadRequest thrOrderUploadRequest) { + List busTypes = thrOrderUploadRequest.getBusTypes(); + thrOrderUploadBusTypService.deleteAll(); + if (CollUtil.isNotEmpty(busTypes)) { + thrOrderUploadBusTypService.save(busTypes); + ThrOrderUploadEntity thrOrderUploadEntity = new ThrOrderUploadEntity(); + BeanUtil.copyProperties(thrOrderUploadRequest, thrOrderUploadEntity); + thrOrderUploadService.insert(thrOrderUploadEntity); + } + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBusTypeDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBusTypeDao.java new file mode 100644 index 000000000..d40e77183 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBusTypeDao.java @@ -0,0 +1,11 @@ +package com.glxp.api.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; + +/** + * 单据上传类型Dao + */ +public interface ThrOrderUploadBusTypeDao extends BaseMapper { + +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadDao.java new file mode 100644 index 000000000..16c45b562 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadDao.java @@ -0,0 +1,8 @@ +package com.glxp.api.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.thrsys.ThrOrderUploadEntity; + +public interface ThrOrderUploadDao extends BaseMapper { + +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java index 9fa7097f7..783fb3b8b 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** *

@@ -38,7 +40,7 @@ public class ThrOrderUploadBustypesEntity { * 创建时间 */ @TableField("createTime") - private Data createTime; + private Date createTime; /** * 更新人 @@ -50,7 +52,7 @@ public class ThrOrderUploadBustypesEntity { * 更新时间 */ @TableField("updateTime") - private Data updateTime; + private Date updateTime; /** * 备注 diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadEntity.java index dc3b1c18b..47dcda706 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadEntity.java @@ -24,7 +24,7 @@ public class ThrOrderUploadEntity{ * 是否自动上传 */ @TableField("autoUpload") - private Integer autoUpload; + private boolean autoUpload; /** * 同步时间间隔 diff --git a/src/main/java/com/glxp/api/req/thrsys/PostThrOrderUploadRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostThrOrderUploadRequest.java new file mode 100644 index 000000000..bf8faff58 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/PostThrOrderUploadRequest.java @@ -0,0 +1,116 @@ +package com.glxp.api.req.thrsys; + +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; +import lombok.Data; + +import java.util.List; + +/** + * 上传单据设置添加修改参数 + */ +@Data +public class PostThrOrderUploadRequest { + + 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/res/thrsys/ThrOrderUploadResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadResponse.java new file mode 100644 index 000000000..1b12c0c31 --- /dev/null +++ b/src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadResponse.java @@ -0,0 +1,116 @@ +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/ThrOrderUploadBusTypService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBusTypService.java new file mode 100644 index 000000000..19fc9d122 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBusTypService.java @@ -0,0 +1,26 @@ +package com.glxp.api.service.thrsys; + +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; + +import java.util.List; + +/** + * 单据上传类型Service + */ +public interface ThrOrderUploadBusTypService { + + /** + * 删除所有类型数据 + * + * @return + */ + boolean deleteAll(); + + /** + * 新增单据类型数据 + * + * @param list + */ + void save(List list); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadService.java new file mode 100644 index 000000000..6ca8a0a7f --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.thrsys; + +import com.glxp.api.entity.thrsys.ThrOrderUploadEntity; +import com.glxp.api.res.thrsys.ThrOrderUploadResponse; + +public interface ThrOrderUploadService { + + /** + * 查询上传单据设置 + * + * @return + */ + ThrOrderUploadResponse findSet(); + + /** + * 添加或修改上传单据设置 + * + * @param thrOrderUploadEntity + * @return + */ + boolean insert(ThrOrderUploadEntity thrOrderUploadEntity); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadBusTypServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadBusTypServiceImpl.java new file mode 100644 index 000000000..015b2d273 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadBusTypServiceImpl.java @@ -0,0 +1,44 @@ +package com.glxp.api.service.thrsys.impl; + +import com.glxp.api.dao.thrsys.ThrOrderUploadBusTypeDao; +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.thrsys.ThrOrderUploadBusTypService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class ThrOrderUploadBusTypServiceImpl implements ThrOrderUploadBusTypService { + + @Resource + private ThrOrderUploadBusTypeDao thrOrderUploadBusTypeDao; + @Resource + private CustomerService customerService; + + @Override + public boolean deleteAll() { + thrOrderUploadBusTypeDao.delete(null); + return true; + } + + @Override + public void save(List list) { + Date date = new Date(); + String userId = customerService.getUserIdStr(); + + for (ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity : list) { + thrOrderUploadBustypesEntity.setCreateTime(date); + thrOrderUploadBustypesEntity.setUpdateTime(date); + thrOrderUploadBustypesEntity.setCreateUser(userId); + thrOrderUploadBustypesEntity.setUpdateUser(userId); + thrOrderUploadBusTypeDao.insert(thrOrderUploadBustypesEntity); + } + } +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadServiceImpl.java new file mode 100644 index 000000000..9f9701672 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.api.service.thrsys.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.glxp.api.dao.thrsys.ThrOrderUploadBusTypeDao; +import com.glxp.api.dao.thrsys.ThrOrderUploadDao; +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; +import com.glxp.api.entity.thrsys.ThrOrderUploadEntity; +import com.glxp.api.res.thrsys.ThrOrderUploadResponse; +import com.glxp.api.service.thrsys.ThrOrderUploadService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class ThrOrderUploadServiceImpl implements ThrOrderUploadService { + + @Resource + private ThrOrderUploadDao thrOrderUploadDao; + @Resource + private ThrOrderUploadBusTypeDao thrOrderUploadBusTypeDao; + + @Override + public ThrOrderUploadResponse findSet() { + ThrOrderUploadEntity thrOrderUploadEntity = thrOrderUploadDao.selectById(1); + if (null == thrOrderUploadEntity) { + thrOrderUploadEntity = new ThrOrderUploadEntity(); + thrOrderUploadEntity.setId(1); + thrOrderUploadEntity.setAutoUpload(false); + thrOrderUploadEntity.setOrderSyncTime(1); + thrOrderUploadDao.insert(thrOrderUploadEntity); + } + List busTypeList = thrOrderUploadBusTypeDao.selectList(null); + ThrOrderUploadResponse response = new ThrOrderUploadResponse(); + BeanUtil.copyProperties(thrOrderUploadEntity, response); + response.setBusTypes(busTypeList); + return response; + } + + @Override + public boolean insert(ThrOrderUploadEntity thrOrderUploadEntity) { + Long count = thrOrderUploadDao.selectCount(new QueryWrapper().eq("id", 1)); + thrOrderUploadEntity.setId(1); + if (count > 0) { + thrOrderUploadDao.updateById(thrOrderUploadEntity); + } else { + thrOrderUploadDao.insert(thrOrderUploadEntity); + } + return true; + } + + +}