From 68586c23cb28b3eec0f6da73c9a75a9a4cb845b9 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Mon, 5 Jun 2023 11:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AE=BE=E7=BD=AE=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThirdUploadSetController.java | 41 ++++++++++++++++--- .../api/dao/system/SyncUploadDataSetDao.java | 3 ++ .../system/SyncUploadDataSetService.java | 4 ++ .../impl/SyncUploadDataSetServiceImpl.java | 10 +++++ .../mapper/system/SyncUploadDataSetDao.xml | 24 +++++++++++ 5 files changed, 76 insertions(+), 6 deletions(-) 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 c315b526b..74b814e12 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,20 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; 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 org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -48,13 +54,36 @@ public class ThirdUploadSetController { } return ResultVOUtils.success(); } -//编辑 + + //编辑 @AuthRuleAnnotation("system/third/syncData/update") @GetMapping("/system/third/syncData/update") - public BaseResponse update() { - - SyncUploadDataSetEntity syncDataSetResponse = syncUploadDataSetService.selectSet(); - return ResultVOUtils.success(syncDataSetResponse); + public BaseResponse update(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity) { + // 获取需要更新的数据集ID + Long dataSetId = Long.valueOf(syncUploadDataSetEntity.getId()); + // 根据数据集ID查询原有数据集信息 + SyncUploadDataSetEntity oldDataSet = syncUploadDataSetService.getById(dataSetId); + if (oldDataSet == null) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } +// // 更新数据集信息 +// oldDataSet.setName(syncUploadDataSetEntity.getName()); +// oldDataSet.setDescription(syncUploadDataSetEntity.getDescription()); +// oldDataSet.setUpdateTime(new Date()); + // 更新数据集业务类型信息 +// List busTypes = syncUploadDataSetEntity.getBusTypes(); +// syncUploadDataBustypeService.deleteByDataSetId(dataSetId); +// if (CollUtil.isNotEmpty(busTypes)) { +// for (SyncDataBustypeEntity busType : busTypes) { +// busType.setDataSetId(dataSetId); +// } +// syncUploadDataBustypeService.inserts(busTypes); +// } + // 保存更新后的数据集信息 + boolean b = syncUploadDataSetService.updateById(oldDataSet); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); } - } diff --git a/src/main/java/com/glxp/api/dao/system/SyncUploadDataSetDao.java b/src/main/java/com/glxp/api/dao/system/SyncUploadDataSetDao.java index f1b91d6dc..baf356c35 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncUploadDataSetDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncUploadDataSetDao.java @@ -10,4 +10,7 @@ public interface SyncUploadDataSetDao { boolean insert(SyncUploadDataSetEntity syncDataSetEntity); + SyncUploadDataSetEntity getById(Long dataSetId); + + boolean updateById(SyncUploadDataSetEntity oldDataSet); } diff --git a/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java b/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java index 1c38a1132..5e26cbf8e 100644 --- a/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java +++ b/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java @@ -11,4 +11,8 @@ public interface SyncUploadDataSetService { boolean insert(SyncUploadDataSetEntity syncUploadDataSetEntity); + + SyncUploadDataSetEntity getById(Long dataSetId); + + boolean updateById(SyncUploadDataSetEntity oldDataSet); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java index 41860f1f6..2909c4ffb 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java @@ -47,4 +47,14 @@ public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService { return syncUploadDataSetDao.insert(syncDataSetEntity); } + @Override + public SyncUploadDataSetEntity getById(Long dataSetId) { + return syncUploadDataSetDao.getById(dataSetId); + } + + @Override + public boolean updateById(SyncUploadDataSetEntity oldDataSet) { + return syncUploadDataSetDao.updateById(oldDataSet); + } + } diff --git a/src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml b/src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml index c28432cce..19a52e497 100644 --- a/src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncUploadDataSetDao.xml @@ -2,6 +2,25 @@ + + UPDATE thr_order_upload + + orderUnCheck=#{orderUnCheck}, + orderUnReceive=#{orderUnReceive}, + orderScanFinish=#{orderScanFinish}, + + checkUdims=#{checkUdims}, + checkPdaEd=#{checkPdaEd}, + checkPdaUn=#{checkPdaUn}, + checkPc=#{checkPc}, + checkWebNew=#{checkWebNew}, + checkChange=#{checkChange}, + checkSp=#{checkSp}, + checkBalacne=#{checkBalacne}, + + WHERE id = #{id} + + + SELECT * + FROM thr_order_upload_bustypes WHERE id = ? + +