From 678af45fbef5958852d9ff48c8795b294deb4d48 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 17 May 2022 11:27:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicThirdSysController.java | 45 +++++++++++++------ .../dao/basic/BasicThirdSysBusApiDao.java | 11 +++++ .../basic/BasicThirdSysBusApiService.java | 10 ++++- .../impl/BasicThirdSysBusApiServiceImpl.java | 13 ++++++ .../mapper/basic/BasicThirdSysBusApiDao.xml | 18 ++++++++ 5 files changed, 82 insertions(+), 15 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java index f4264457..10fa9751 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java @@ -7,26 +7,18 @@ import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BasicThirdSysResponse; -import com.glxp.api.admin.res.inout.WarehouseResponse; import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; 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; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; @@ -46,14 +38,9 @@ public class BasicThirdSysController { UdiRelevanceService udiRelevanceService; @Resource UnitMaintainService unitMaintainService; - @Resource - SystemParamConfigService systemParamConfigService; - @Resource BasicThirdSysBusApiService basicThirdSysBusApiService; @Resource - ErpBasicClient erpBasicClient; - @Resource private BussinessOriginTypeService bussinessOriginTypeService; @@ -244,4 +231,34 @@ public class BasicThirdSysController { } + /** + * 第三方系统 业务单据提交接口添加单据类型 + * + * @param list + * @return + */ + @PostMapping("/udiwms/basic/thirdsys/saveBusTypes") + public BaseResponse saveBusTypes(@RequestBody List list) { + if (CollUtil.isEmpty(list)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean result = basicThirdSysBusApiService.saveBusTypes(list); + if (result) { + return ResultVOUtils.success(); + } + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + @GetMapping("/udiwms/basic/thirdsys/delete") + public BaseResponse delete(Integer id) { + if (null == id) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + boolean result = basicThirdSysBusApiService.delete(id); + if (result) { + return ResultVOUtils.success(); + } + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java index cb6e8af1..9873e4d5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysBusApiDao.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.dao.basic; import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,4 +14,14 @@ public interface BasicThirdSysBusApiDao { boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity); List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); + + /** + * 批量保存 + * + * @param list + * @return + */ + boolean saveBusTypes(@Param("list") List list); + + boolean deleteById(@Param("id") Integer id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java index b4fdace6..3f1708f8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysBusApiService.java @@ -1,7 +1,6 @@ package com.glxp.api.admin.service.basic; import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import java.util.List; @@ -17,4 +16,13 @@ public interface BasicThirdSysBusApiService { List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); + /** + * 第三方系统 业务单据提交接口添加单据类型 + * + * @param list + * @return + */ + boolean saveBusTypes(List list); + + boolean delete(Integer id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java index fff1c871..3ee5b783 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java @@ -6,6 +6,7 @@ import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.service.basic.BasicThirdSysBusApiService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -42,4 +43,16 @@ public class BasicThirdSysBusApiServiceImpl implements BasicThirdSysBusApiServic public List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) { return basicThirdSysBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest); } + + @Transactional(rollbackFor = Exception.class) + @Override + public boolean saveBusTypes(List list) { + return basicThirdSysBusApiDao.saveBusTypes(list); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public boolean delete(Integer id) { + return basicThirdSysBusApiDao.deleteById(id); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml index db89800c..2aee8d3f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysBusApiDao.xml @@ -56,4 +56,22 @@ ) + + insert into basic_third_sys_bus_api (code, `name`, thirdSys, type) + values + + ( + #{item.code}, + #{item.name}, + #{item.thirdSys}, + #{item.type} + ) + + + + + delete + from basic_third_sys_bus_api + where id = #{id} + \ No newline at end of file