From 1995a0c9ec586c3645dc9c16b765d0dfc5c2ae5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Wed, 19 Jul 2023 17:03:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=9C=A8=E2=80=9C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E8=AE=BE=E7=BD=AE=E2=80=9D=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=80=E4=B8=AA=20=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/SyncDataSetController.java | 23 +++++++++++++++++++ .../glxp/api/dao/sync/SyncDataBustypeDao.java | 2 ++ .../dao/system/SyncDataChangeBustypesDao.java | 6 ++++- .../service/sync/SyncDataBustypeService.java | 3 +++ .../sync/impl/SyncDataBustypeServiceImpl.java | 5 ++++ .../SyncDataChangeBustypeServiceImpl.java | 2 ++ .../mapper/system/SyncDataBustypeDao.xml | 14 +++++++++++ 7 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index ed63fc404..8c804a8a2 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -3,11 +3,15 @@ package com.glxp.api.controller.sync; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONUtil; +import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.constant.Constant; import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.req.basic.FilterBussinessTypeRequest; +import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.sync.SyncDataBustypeService; import com.glxp.api.service.sync.SyncDataChangeBustypeService; @@ -23,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.Date; import java.util.List; @@ -110,4 +115,22 @@ public class SyncDataSetController { } } + + @AuthRuleAnnotation("system/param/syncData/selectedToInBus") + @GetMapping("/system/param/syncData/selectedToInBus") + public BaseResponse filterselectedToInBus(SyncDataBustypeEntity syncDataBustypeEntity) { + syncDataBustypeEntity.setDirect(2); + List list = syncDataBustypeService.filterSelected(syncDataBustypeEntity); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + @AuthRuleAnnotation("system/param/syncData/selectedBus") + @GetMapping("/system/param/syncData/selectedBus") + public BaseResponse filterselectedBus(SyncDataBustypeEntity syncDataBustypeEntity) { + syncDataBustypeEntity.setDirect(1); + List list = syncDataBustypeService.filterSelected(syncDataBustypeEntity); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } } diff --git a/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java b/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java index fb8e39f20..d1789f3df 100644 --- a/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java @@ -16,4 +16,6 @@ public interface SyncDataBustypeDao extends BaseMapper { void inserts(@Param("syncDataBustypeEntities") List syncDataBustypeEntities); + List filterSelected(SyncDataBustypeEntity syncDataBustypeEntity); + } diff --git a/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java b/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java index e13082124..e56456e40 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java @@ -3,5 +3,9 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; +import java.util.List; + public interface SyncDataChangeBustypesDao extends BaseMapper { -} \ No newline at end of file + + List filterSelected(SyncDataChangeBustypesEntity syncDataChangeBustypesEntity); +} diff --git a/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java index bf28a290e..7b564b5a6 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.sync; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import java.util.List; @@ -19,4 +20,6 @@ public interface SyncDataBustypeService extends IService boolean isExits(List syncDataBustypeEntities, Integer direct); + List filterSelected(SyncDataBustypeEntity syncDataBustypeEntity); + } diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java index 7ee116bb7..063a1b5b3 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java @@ -48,4 +48,9 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl filterSelected(SyncDataBustypeEntity syncDataBustypeEntity) { + return syncDataBustypeDao.filterSelected(syncDataBustypeEntity); + } } diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java index d1be070db..ab7b2639e 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java @@ -41,4 +41,6 @@ public class SyncDataChangeBustypeServiceImpl implements SyncDataChangeBustypeSe syncDataChangeBustypesEntities.forEach(item -> syncDataChangeBustypesDao.insert(item)); } } + + } diff --git a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml index 7cc59beb8..e4b959211 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml @@ -20,4 +20,18 @@ #{item.outChange}, #{item.orderStatus}, #{item.direct}, #{item.syncStatus}, #{item.syncChange}) + +