From f51054ea40fba7b8486770901238f7a7dcb8708f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 2 Jun 2023 09:40:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThirdUploadSetController.java | 16 +------ .../thrsys/ThrOrderUploadBustypesMapper.java | 9 ++++ .../thrsys/ThrOrderUploadBustypesEntity.java | 47 ++++++++++--------- .../com/glxp/api/http/ErpBasicClient.java | 1 - .../thrsys/ThrOrderUploadBustypesService.java | 10 ++++ .../thrsys/ThrOrderUploadBustypesMapper.xml | 4 ++ 6 files changed, 51 insertions(+), 36 deletions(-) create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBustypesMapper.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java create mode 100644 src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java index 62414e60a..545b85e80 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java @@ -1,14 +1,11 @@ package com.glxp.api.controller.thrsys; -import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; -import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncUploadDataSetEntity; -import com.glxp.api.service.system.SyncUploadDataBustypeService; -import com.glxp.api.service.system.SyncUploadDataSetService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.system.SyncUploadDataSetEntity; +import com.glxp.api.service.system.SyncUploadDataSetService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,19 +13,15 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.List; @RestController public class ThirdUploadSetController { @Resource SyncUploadDataSetService syncUploadDataSetService; - @Resource - SyncUploadDataBustypeService syncUploadDataBustypeService; @AuthRuleAnnotation("system/third/syncData/config") @GetMapping("/system/third/syncData/config") public BaseResponse list() { - SyncUploadDataSetEntity syncDataSetResponse = syncUploadDataSetService.selectSet(); return ResultVOUtils.success(syncDataSetResponse); } @@ -37,11 +30,6 @@ public class ThirdUploadSetController { @PostMapping("/system/third/syncData/save") public BaseResponse save(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity ) { - List busTypes = syncUploadDataSetEntity.getBusTypes(); - syncUploadDataBustypeService.deleteAll(); - if (CollUtil.isNotEmpty(busTypes)) - syncUploadDataBustypeService.inserts(busTypes); - syncUploadDataSetEntity.setBusTypes(null); boolean b = syncUploadDataSetService.insert(syncUploadDataSetEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBustypesMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBustypesMapper.java new file mode 100644 index 000000000..42a62e1eb --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderUploadBustypesMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ThrOrderUploadBustypesMapper 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 783fb3b8b..0165f4833 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java @@ -4,62 +4,67 @@ 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.io.Serializable; import java.util.Date; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; +import lombok.Data; -/** - *

- * - *

- * - * @author 作者 - * @since 2023-01-13 - */ @Data -@TableName("thr_order_upload_bustypes") -public class ThrOrderUploadBustypesEntity { +@TableName(value = "thr_order_upload_bustypes") +public class ThrOrderUploadBustypesEntity implements Serializable { - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.INPUT) private Integer id; - @TableField("action") + @TableField(value = "`action`") private String action; - @TableField("name") + @TableField(value = "`name`") private String name; + /** + * 单据类型状态: 1:未审核;2:已审核;3:已确认 + */ + @TableField(value = "orderStatus") + private Integer orderStatus; + + /** + * 单据来源(数组) + */ + @TableField(value = "orderSource", typeHandler = FastjsonTypeHandler.class) + private String orderSource; + /** * 创建人 */ - @TableField("createUser") + @TableField(value = "`createUser`") private String createUser; /** * 创建时间 */ - @TableField("createTime") + @TableField(value = "createTime") private Date createTime; /** * 更新人 */ - @TableField("updateUser") + @TableField(value = "updateUser") private String updateUser; /** * 更新时间 */ - @TableField("updateTime") + @TableField(value = "updateTime") private Date updateTime; /** * 备注 */ - @TableField("remark") + @TableField(value = "remark") private String remark; - - + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index bbd0a1c27..c862eb87b 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -154,7 +154,6 @@ public class ErpBasicClient { /** * 上传文件到第三方接口服务，解析第三方系统产品信息并获取回调结果 * - * @param files * @param thirdSys * @return */ diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java new file mode 100644 index 000000000..dd94da9e8 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java @@ -0,0 +1,10 @@ +package com.glxp.api.service.thrsys; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.thrsys.ThrOrderUploadBustypesMapper; +import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; +@Service +public class ThrOrderUploadBustypesService extends ServiceImpl { + +} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml new file mode 100644 index 000000000..6583cc3be --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml @@ -0,0 +1,4 @@ + + + +