From 1bb784e8a3abaa499783554c973ccef3cc43866c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 23 May 2024 09:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=97=E9=9D=96=EF=BC=8C=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + .../java/com/glxp/mipsdl/Application.java | 2 +- .../glxp/mipsdl/client/CommonFileClient.java | 32 --- .../glxp/mipsdl/client/CommonHttpClient.java | 15 -- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 1 - .../glxp/mipsdl/client/dsxyy/DsxyyClient.java | 1 - .../glxp/mipsdl/client/njxyy/NjxyyClient.java | 206 +++++++++++++----- .../glxp/mipsdl/client/phxyy/PhxyyClient.java | 1 - .../mipsdl/client/ptxhyy/PtxhyyClient.java | 18 +- .../glxp/mipsdl/client/pzh/PzhzdClient.java | 1 - .../glxp/mipsdl/client/yxzyy/YxzyyClient.java | 3 - .../glxp/mipsdl/client/zaxyy/ZaxyyClient.java | 5 - .../glxp/mipsdl/client/zzzyy/ZzzyyClient.java | 3 - .../com/glxp/mipsdl/config/HospConfig.java | 1 - .../com/glxp/mipsdl/config/MyBatisConfig.java | 27 +++ .../glxp/mipsdl/config/ThirdSysConfig.java | 1 - .../glxp/mipsdl/dao/auth/AuthLicenseDao.java | 4 +- .../mipsdl/dao/auth/AuthWarehouseDao.java | 4 +- .../dao/auth/AuthWarehouseUserMapper.java | 2 + .../dao/basic/BasicBussinessTypeDao.java | 4 +- .../glxp/mipsdl/dao/basic/BasicCorpDao.java | 2 + .../mipsdl/dao/basic/BasicProductsDao.java | 4 +- .../glxp/mipsdl/dao/basic/BasicUdirelDao.java | 4 +- .../com/glxp/mipsdl/dao/inout/IoCodeDao.java | 4 +- .../glxp/mipsdl/dao/inout/IoCodeTempDao.java | 4 +- .../com/glxp/mipsdl/dao/inout/IoOrderDao.java | 4 +- .../mipsdl/dao/inout/IoOrderDetailBizDao.java | 4 +- .../dao/inout/IoOrderDetailCodeDao.java | 4 +- .../dao/inout/IoOrderDetailResultDao.java | 4 +- .../mipsdl/dao/inout/IoOrderUploadLogDao.java | 4 +- .../mipsdl/dao/pzhzd/YyUcloudV31SetDao.java | 2 + .../glxp/mipsdl/dao/system/SysErpLogDao.java | 4 +- .../mipsdl/dao/system/SysHospConfigDao.java | 4 +- .../mipsdl/dao/system/SysScheduledDao.java | 4 +- .../mipsdl/dao/system/SysThirdSysApiDao.java | 4 +- .../dao/thrsys/ThrBustypeOriginDao.java | 4 +- .../glxp/mipsdl/dao/thrsys/ThrCorpDao.java | 4 +- .../glxp/mipsdl/dao/thrsys/ThrDeptDao.java | 4 +- .../mipsdl/dao/thrsys/ThrInvWarehouseDao.java | 4 +- .../mipsdl/dao/thrsys/ThrProductsDao.java | 4 +- .../mipsdl/dao/thrsys/ThrSystemBusApiDao.java | 4 +- .../glxp/mipsdl/dao/thrsys/ThrSystemDao.java | 4 +- .../mipsdl/dao/thrsys/ThrSystemDetailDao.java | 4 +- .../glxp/mipsdl/entity/njxyy/InvEntity.java | 27 +++ .../mipsdl/entity/njxyy/ProductEntity.java | 75 +++++++ .../mipsdl/entity/njxyy/SickerEntity.java | 91 ++++++++ .../req/njxyy/PostThrProductRequest.java | 37 ++++ .../res/udiwms/BasicSkSickerResponse.java | 9 + .../service/system/SysParamConfigService.java | 1 - .../service/thrsys/ThrProductService.java | 1 - .../service/thrsys/ThrSysBusTypeService.java | 1 - .../thrsys/ThrSystemDetailService.java | 1 - .../mipsdl/thirddao/njxyy/ThrCorpMapper.java | 17 ++ .../njxyy/ThrInvWarehourseMapper.java | 11 + .../thirddao/njxyy/ThrProductsMapper.java | 12 + .../thirddao/njxyy/ThrSickerMapper.java | 12 + src/main/resources/application-dev.yml | 12 +- src/main/resources/application-pro.yml | 12 +- src/main/resources/application.yml | 2 +- .../mybatis/mapper/basic/BasicProductsDao.xml | 76 ------- .../{ => master}/auth/AuthLicenseDao.xml | 2 +- .../mapper/{ => master}/auth/AuthUserDao.xml | 4 +- .../{ => master}/auth/AuthWarehouseDao.xml | 4 +- .../auth/AuthWarehouseUserMapper.xml | 0 .../basic/BasicBussinessTypeDao.xml | 2 +- .../{ => master}/basic/BasicCorpDao.xml | 0 .../basic/BasicDestinyRelMapper.xml | 0 .../mapper/master/basic/BasicProductsDao.xml | 77 +++++++ .../basic/BasicSkProjectMapper.xml | 0 .../{ => master}/basic/BasicUdirelDao.xml | 0 .../mapper/{ => master}/basic/UdiRlSupDao.xml | 0 .../mapper/{ => master}/inout/IoCodeDao.xml | 6 +- .../{ => master}/inout/IoCodeTempDao.xml | 6 +- .../mapper/{ => master}/inout/IoOrderDao.xml | 10 +- .../inout/IoOrderDetailBizDao.xml | 8 +- .../inout/IoOrderDetailCodeDao.xml | 8 +- .../inout/IoOrderDetailResultDao.xml | 8 +- .../inout/IoOrderUploadLogDao.xml | 2 +- .../{ => master}/ptxyy/ThrHslbMapper.xml | 0 .../{ => master}/pzhzd/YyUcloudV31SetDao.xml | 2 +- .../{ => master}/system/SysErpLogDao.xml | 2 +- .../{ => master}/system/SysHospConfigDao.xml | 0 .../system/SysParamConfigMapper.xml | 0 .../{ => master}/system/SysScheduledDao.xml | 2 +- .../{ => master}/system/SysThirdSysApiDao.xml | 2 +- .../thrsys/ThrBustypeOriginDao.xml | 2 +- .../mapper/{ => master}/thrsys/ThrCorpDao.xml | 4 +- .../mapper/{ => master}/thrsys/ThrDeptDao.xml | 4 +- .../thrsys/ThrInvWarehouseDao.xml | 2 +- .../thrsys/ThrOrderUploadBustypesMapper.xml | 0 .../{ => master}/thrsys/ThrProductsDao.xml | 8 +- .../thrsys/ThrSystemBusApiDao.xml | 2 +- .../{ => master}/thrsys/ThrSystemDao.xml | 4 +- .../thrsys/ThrSystemDetailDao.xml | 2 +- .../mapper/other/njxyy/ThrCorpMapper.xml | 18 ++ .../other/njxyy/ThrInvWarehourseMapper.xml | 4 + .../mapper/other/njxyy/ThrProductsMapper.xml | 4 + 97 files changed, 726 insertions(+), 296 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/config/MyBatisConfig.java create mode 100644 src/main/java/com/glxp/mipsdl/entity/njxyy/InvEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/entity/njxyy/ProductEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/entity/njxyy/SickerEntity.java create mode 100644 src/main/java/com/glxp/mipsdl/req/njxyy/PostThrProductRequest.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrCorpMapper.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrInvWarehourseMapper.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrProductsMapper.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java delete mode 100644 src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml rename src/main/resources/mybatis/mapper/{ => master}/auth/AuthLicenseDao.xml (99%) rename src/main/resources/mybatis/mapper/{ => master}/auth/AuthUserDao.xml (97%) rename src/main/resources/mybatis/mapper/{ => master}/auth/AuthWarehouseDao.xml (97%) rename src/main/resources/mybatis/mapper/{ => master}/auth/AuthWarehouseUserMapper.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/basic/BasicBussinessTypeDao.xml (99%) rename src/main/resources/mybatis/mapper/{ => master}/basic/BasicCorpDao.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/basic/BasicDestinyRelMapper.xml (100%) create mode 100644 src/main/resources/mybatis/mapper/master/basic/BasicProductsDao.xml rename src/main/resources/mybatis/mapper/{ => master}/basic/BasicSkProjectMapper.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/basic/BasicUdirelDao.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/basic/UdiRlSupDao.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/inout/IoCodeDao.xml (97%) rename src/main/resources/mybatis/mapper/{ => master}/inout/IoCodeTempDao.xml (97%) rename src/main/resources/mybatis/mapper/{ => master}/inout/IoOrderDao.xml (96%) rename src/main/resources/mybatis/mapper/{ => master}/inout/IoOrderDetailBizDao.xml (96%) rename src/main/resources/mybatis/mapper/{ => master}/inout/IoOrderDetailCodeDao.xml (96%) rename src/main/resources/mybatis/mapper/{ => master}/inout/IoOrderDetailResultDao.xml (96%) rename src/main/resources/mybatis/mapper/{ => master}/inout/IoOrderUploadLogDao.xml (99%) rename src/main/resources/mybatis/mapper/{ => master}/ptxyy/ThrHslbMapper.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/pzhzd/YyUcloudV31SetDao.xml (98%) rename src/main/resources/mybatis/mapper/{ => master}/system/SysErpLogDao.xml (95%) rename src/main/resources/mybatis/mapper/{ => master}/system/SysHospConfigDao.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/system/SysParamConfigMapper.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/system/SysScheduledDao.xml (98%) rename src/main/resources/mybatis/mapper/{ => master}/system/SysThirdSysApiDao.xml (98%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrBustypeOriginDao.xml (99%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrCorpDao.xml (97%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrDeptDao.xml (97%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrInvWarehouseDao.xml (98%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrOrderUploadBustypesMapper.xml (100%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrProductsDao.xml (96%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrSystemBusApiDao.xml (99%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrSystemDao.xml (97%) rename src/main/resources/mybatis/mapper/{ => master}/thrsys/ThrSystemDetailDao.xml (99%) create mode 100644 src/main/resources/mybatis/mapper/other/njxyy/ThrCorpMapper.xml create mode 100644 src/main/resources/mybatis/mapper/other/njxyy/ThrInvWarehourseMapper.xml create mode 100644 src/main/resources/mybatis/mapper/other/njxyy/ThrProductsMapper.xml diff --git a/pom.xml b/pom.xml index bf72725..bd67593 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,13 @@ 8.0.21 runtime + + + com.oracle + ojdbc8 + 19.18.0.0 + runtime + org.projectlombok lombok diff --git a/src/main/java/com/glxp/mipsdl/Application.java b/src/main/java/com/glxp/mipsdl/Application.java index fc719ff..4b3d73e 100644 --- a/src/main/java/com/glxp/mipsdl/Application.java +++ b/src/main/java/com/glxp/mipsdl/Application.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @ServletComponentScan @EnableTransactionManagement -@MapperScan("com.glxp.mipsdl.dao") +//@MapperScan("com.glxp.mipsdl.dao") public class Application extends SpringBootServletInitializer { public static void main(String[] args) { diff --git a/src/main/java/com/glxp/mipsdl/client/CommonFileClient.java b/src/main/java/com/glxp/mipsdl/client/CommonFileClient.java index 4fd82cf..421de36 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonFileClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonFileClient.java @@ -1,12 +1,5 @@ package com.glxp.mipsdl.client; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.glxp.mipsdl.config.ThirdSysConfig; -import com.glxp.mipsdl.constant.ConstantType; -import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao; import com.glxp.mipsdl.dao.basic.BasicCorpDao; @@ -16,39 +9,14 @@ import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao; import com.glxp.mipsdl.dao.thrsys.ThrBustypeOriginDao; import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao; import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; -import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; -import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; -import com.glxp.mipsdl.entity.inout.IoCodeEntity; -import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity; -import com.glxp.mipsdl.entity.inout.IoOrderEntity; -import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; -import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; -import com.glxp.mipsdl.http.HttpClient; -import com.glxp.mipsdl.req.base.*; -import com.glxp.mipsdl.req.post.PostFileThrOrderRequest; -import com.glxp.mipsdl.req.post.PostThrCorpRequest; -import com.glxp.mipsdl.req.post.PostThrInvProductsRequest; -import com.glxp.mipsdl.req.post.PostThrProductsRequest; import com.glxp.mipsdl.res.BaseResponse; -import com.glxp.mipsdl.res.udiwms.UdiwmsProductInfoResponse; -import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.file.UdiInfoUploadService; -import com.glxp.mipsdl.service.thrsys.ThrCorpService; -import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; import com.glxp.mipsdl.util.*; -import com.glxp.mipsdl.vo.file.yxzyy.YxzyyProductEntity; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index 92baace..95b0754 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -2,9 +2,7 @@ package com.glxp.mipsdl.client; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.glxp.mipsdl.config.ThirdSysConfig; -import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao; @@ -15,14 +13,8 @@ import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao; import com.glxp.mipsdl.dao.thrsys.ThrBustypeOriginDao; import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao; import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; -import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; -import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; import com.glxp.mipsdl.entity.inout.IoCodeEntity; import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity; -import com.glxp.mipsdl.entity.inout.IoOrderEntity; -import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; -import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.base.forthird.ForBasicProductsSearchFilter; @@ -34,23 +26,16 @@ import com.glxp.mipsdl.req.ctqyy.GetSickPrescribeRequest; import com.glxp.mipsdl.req.ctqyy.GetSickRequest; import com.glxp.mipsdl.req.post.*; import com.glxp.mipsdl.res.BaseResponse; -import com.glxp.mipsdl.res.udiwms.InvProductRequest; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; -import com.glxp.mipsdl.util.DateUtil; import com.glxp.mipsdl.util.DictUtl; import com.glxp.mipsdl.util.ResultVOUtils; import com.glxp.mipsdl.util.SubmitOrderUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 76e4bc7..732b79a 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -64,7 +64,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.IOException; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java b/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java index 7e14a41..8bc8787 100644 --- a/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java @@ -10,7 +10,6 @@ import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.glxp.mipsdl.client.BaseHttpClient; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; diff --git a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java index a381429..df2f02d 100644 --- a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java @@ -4,14 +4,16 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; @@ -23,16 +25,22 @@ import com.glxp.mipsdl.dao.basic.BasicUdirelDao; import com.glxp.mipsdl.dao.inout.IoCodeDao; import com.glxp.mipsdl.dao.inout.IoOrderDao; import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao; +import com.glxp.mipsdl.entity.ctqyy.MaterialDictEntity; +import com.glxp.mipsdl.entity.njxyy.ProductEntity; +import com.glxp.mipsdl.entity.njxyy.SickerEntity; +import com.glxp.mipsdl.req.ctqyy.CtqyyRequest; +import com.glxp.mipsdl.req.ctqyy.GetSickRequest; +import com.glxp.mipsdl.req.njxyy.PostThrProductRequest; +import com.glxp.mipsdl.req.post.*; +import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; +import com.glxp.mipsdl.thirddao.njxyy.ThrCorpMapper; import com.glxp.mipsdl.dao.thrsys.*; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; import com.glxp.mipsdl.entity.basic.BasicCorpEntity; import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; import com.glxp.mipsdl.entity.inout.*; -import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.mipsdl.entity.thrsys.ThrOrderUploadBustypesEntity; -import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; -import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.mipsdl.entity.thrsys.*; import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.base.forthird.*; @@ -40,17 +48,14 @@ import com.glxp.mipsdl.req.phxyy.PhBusTypeRequest; import com.glxp.mipsdl.req.phxyy.PhOrderRequest; import com.glxp.mipsdl.req.phxyy.PhProductRequest; import com.glxp.mipsdl.req.phxyy.PhUnitRequest; -import com.glxp.mipsdl.req.post.PostFileThrOrderRequest; -import com.glxp.mipsdl.req.post.PostThrCorpRequest; -import com.glxp.mipsdl.req.post.PostThrInvProductsRequest; -import com.glxp.mipsdl.req.post.PostThrProductsRequest; import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.res.PageSimpleResponse; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.order.OrderUploadLogService; -import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; +import com.glxp.mipsdl.thirddao.njxyy.ThrProductsMapper; +import com.glxp.mipsdl.thirddao.njxyy.ThrSickerMapper; import com.glxp.mipsdl.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -60,6 +65,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -94,8 +100,6 @@ public class NjxyyClient extends CommonHttpClient { @Resource private ThirdSysConfig thirdSysConfig; @Resource - private ThrCorpService thrCorpService; - @Resource private IoOrderDetailBizDao orderDetailBizDao; @Resource private SubmitOrderUtil submitOrderUtil; @@ -108,24 +112,147 @@ public class NjxyyClient extends CommonHttpClient { @Resource private ThrOrderUploadBustypesMapper thrOrderUploadBustypesMapper; + @Resource + ThrCorpMapper thrCorpMapper; + @Resource + ThrProductsMapper thrProductsMapper; + @Resource + ThrSickerMapper thrSickerMapper; + + + /** + * 获取产品信息---(A001产品信息查询) + * + * @param udiwmsProductRequest + * @return + */ @Override - public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) { - PhUnitRequest phUnitRequest = new PhUnitRequest(); - BeanUtil.copyProperties(udiwmsUnitRequest, phUnitRequest); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_CORP_URL), phUnitRequest); - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - return baseResponse; + public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) { + IPage page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()); + IPage productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper() + .lambda() + .like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode()) + .like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName())); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(productEntityIPage.getTotal()); + pageSimpleResponse.setList(productEntityIPage.getRecords()); + return ResultVOUtils.success(pageSimpleResponse); } + /** + * 获取患者信息--( A003病人信息视图) + * + * @param getSickRequest + * @return + */ + public BaseResponse getSickInfo(GetSickRequest getSickRequest) { + IPage page = new Page<>(getSickRequest.getPage(), getSickRequest.getLimit()); + IPage productEntityIPage = thrSickerMapper.selectPage(page, new QueryWrapper() + .lambda() + .like(StringUtils.isNotBlank(getSickRequest.getCode()), SickerEntity::getIdentityNo, getSickRequest.getCode()) + .like(StringUtils.isNotBlank(getSickRequest.getName()), SickerEntity::getName, getSickRequest.getName())); + + productEntityIPage.getRecords().forEach(sickerEntity -> { + BasicSkSickerResponse.builder() + .sickerId(sickerEntity.getInpatientID()) + .code(sickerEntity.getCurno()) + .name(sickerEntity.getName()) + .adNum(sickerEntity.getInpatientID()) + .idNum(sickerEntity.getIdentityNo()) + .phone(sickerEntity.getCellPhoneNo()) + .gender(sickerEntity.getSex()) + .bornDate(sickerEntity.getBirthDate()) + .guardianName(sickerEntity.getOperName()) + .build(); + + }); + + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(productEntityIPage.getTotal()); + pageSimpleResponse.setList(productEntityIPage.getRecords()); + return ResultVOUtils.success(pageSimpleResponse); + } + + + /** + * 提交关联产品更新--（A004接收新增产品信息） + * + * @return + */ @Override - public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) { - PhProductRequest phProductRequest = new PhProductRequest(); - BeanUtil.copyProperties(udiwmsProductRequest, phProductRequest); - String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_PI_QUERY_URL), phProductRequest); + public BaseResponse postRelProduct(PostRelProductRequest postThrInvProductsRequest) { + List datas = postThrInvProductsRequest.getDatas(); + BaseResponse baseResponse = null; + if (CollUtil.isNotEmpty(datas)) { + for (UdiRelevanceResponse udiRelevanceResponse : datas) { + PostThrProductRequest postThrProductsRequest = new PostThrProductRequest(); + BeanUtil.copyProperties(udiRelevanceResponse, postThrProductsRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_POST_THR_PRODUCTS_URL), postThrProductsRequest); + baseResponse = JSONObject.parseObject(response, BaseResponse.class); + log.error(baseResponse.getMessage()); +// return baseResponse; + } + } + return ResultVOUtils.success(baseResponse); + } + + + /** + * B001 查询指定科室高值/普耗库存 + * + * @param forInvProductsFilter + * @return + */ + @Override + public BaseResponse queryUdiInvProductsFilter(ForInvProductsFilter forInvProductsFilter) { + //入参业务系统字段控制 + FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); + BeanUtils.copyProperties(forInvProductsFilter, filterInvProductRequest); + //调用业务系统http + String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvProductsFilterUrl(), filterInvProductRequest); + //业务系统返回参数 字段控制 BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + if (baseResponse.getCode() == 20000) { + PageSimpleResponse pageSimpleResponse = + JSONObject.parseObject(String.valueOf(baseResponse.getData()), PageSimpleResponse.class); + List list = pageSimpleResponse.getList(); + //处理list字段 进行实体转换 过滤掉不必要字段 + String json = JSON.toJSONString(list); + List newList = JSON.parseArray(json, ForInvProductsResponse.class); + + PageSimpleResponse newPageSimpleResponse = new PageSimpleResponse<>(); + newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal()); + newPageSimpleResponse.setList(newList); + baseResponse.setData(newPageSimpleResponse); + } else { + + } return baseResponse; } + + /** + * 获取往来单位 + * + * @param udiwmsUnitRequest + * @return + */ + @Override + public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) { + PhUnitRequest phUnitRequest = new PhUnitRequest(); + BeanUtil.copyProperties(udiwmsUnitRequest, phUnitRequest); + IPage page = new Page<>(udiwmsUnitRequest.getPage(), udiwmsUnitRequest.getLimit()); + IPage thrCorpEntityPage = thrCorpMapper.selectPage(page, new QueryWrapper() + .lambda() + .like(StringUtils.isNotBlank(phUnitRequest.getUnitId()), ThrCorpEntity::getUnitId, phUnitRequest.getUnitId()) + .like(StringUtils.isNotBlank(phUnitRequest.getName()), ThrCorpEntity::getName, phUnitRequest.getName())); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(thrCorpEntityPage.getTotal()); + pageSimpleResponse.setList(thrCorpEntityPage.getRecords()); + return ResultVOUtils.success(pageSimpleResponse); + } + + @Override public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsBusTypeRequest) { PhBusTypeRequest phBusTypeRequest = new PhBusTypeRequest(); @@ -434,55 +561,29 @@ public class NjxyyClient extends CommonHttpClient { return baseResponse; } - @Override - public BaseResponse queryUdiInvProductsFilter(ForInvProductsFilter forInvProductsFilter) { - //入参业务系统字段控制 - FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); - BeanUtils.copyProperties(forInvProductsFilter,filterInvProductRequest); - //调用业务系统http - String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvProductsFilterUrl(), filterInvProductRequest); - //业务系统返回参数 字段控制 - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - if (baseResponse.getCode() == 20000){ - PageSimpleResponse pageSimpleResponse = - JSONObject.parseObject(String.valueOf(baseResponse.getData()), PageSimpleResponse.class); - List list = pageSimpleResponse.getList(); - //处理list字段 进行实体转换 过滤掉不必要字段 - String json = JSON.toJSONString(list); - List newList = JSON.parseArray(json,ForInvProductsResponse.class); - - PageSimpleResponse newPageSimpleResponse = new PageSimpleResponse<>(); - newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal()); - newPageSimpleResponse.setList(newList); - baseResponse.setData(newPageSimpleResponse); - }else { - - } - return baseResponse; - } @Override public BaseResponse queryUdiBasicProductsSearch(ForBasicProductsSearchFilter forBasicProductsSearchFilter) { //入参业务系统字段控制 FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - BeanUtils.copyProperties(forBasicProductsSearchFilter,filterUdiRelRequest); + BeanUtils.copyProperties(forBasicProductsSearchFilter, filterUdiRelRequest); //调用业务系统http String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostBasicProductsSearch(), filterUdiRelRequest); //业务系统返回参数 字段控制 BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - if (baseResponse.getCode() == 20000){ + if (baseResponse.getCode() == 20000) { PageSimpleResponse pageSimpleResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), PageSimpleResponse.class); List list = pageSimpleResponse.getList(); //处理list字段 进行实体转换 过滤掉不必要字段 String json = JSON.toJSONString(list); - List newList = JSON.parseArray(json,ForBasicProductsSearchResponse.class); + List newList = JSON.parseArray(json, ForBasicProductsSearchResponse.class); PageSimpleResponse newPageSimpleResponse = new PageSimpleResponse<>(); newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal()); newPageSimpleResponse.setList(newList); baseResponse.setData(newPageSimpleResponse); - }else { + } else { } return baseResponse; @@ -560,4 +661,5 @@ public class NjxyyClient extends CommonHttpClient { return baseResponse; } + } diff --git a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java b/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java index 4d185ad..40c264e 100644 --- a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java @@ -9,7 +9,6 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.glxp.mipsdl.client.BaseHttpClient; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 4280beb..836af8a 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -3,18 +3,13 @@ package com.glxp.mipsdl.client.ptxhyy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.BeanUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.mipsdl.client.CommonHttpClient; -import com.glxp.mipsdl.client.ctqyy.entity.InvProjectResultEntity; import com.glxp.mipsdl.client.ptxhyy.entity.HisProductEntity; import com.glxp.mipsdl.client.ptxhyy.entity.OrderUploadResponse; import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbEntity; @@ -24,6 +19,7 @@ import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.auth.AuthUserDao; import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; +import com.glxp.mipsdl.dao.auth.AuthWarehouseUserMapper; import com.glxp.mipsdl.dao.basic.*; import com.glxp.mipsdl.dao.inout.IoCodeDao; import com.glxp.mipsdl.dao.inout.IoOrderDao; @@ -36,22 +32,16 @@ import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; import com.glxp.mipsdl.entity.auth.AuthUserEntity; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.auth.AuthWarehouseUser; -import com.glxp.mipsdl.dao.auth.AuthWarehouseUserMapper; import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; import com.glxp.mipsdl.entity.basic.BasicCorpEntity; -import com.glxp.mipsdl.entity.basic.BasicSkProjectDetailEntity; import com.glxp.mipsdl.entity.basic.BasicSkProjectEntity; import com.glxp.mipsdl.entity.inout.*; -import com.glxp.mipsdl.entity.thrsys.ThrDeptEntity; import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.mipsdl.http.HttpClient; -import com.glxp.mipsdl.req.base.CompanyProductRelevanceRequest; import com.glxp.mipsdl.req.base.UdiwmsInvProductsRequest; import com.glxp.mipsdl.req.base.UdiwmsOrderDetailRequest; import com.glxp.mipsdl.req.base.UdiwmsOrderRequest; -import com.glxp.mipsdl.req.ctqyy.CtqyyRequest; import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest; import com.glxp.mipsdl.req.ptxhyy.PtxhyyInvRequest; import com.glxp.mipsdl.req.ptxhyy.PtxhyyOrderDetailRequest; @@ -59,10 +49,7 @@ import com.glxp.mipsdl.req.ptxhyy.PtxhyyOrderRequest; import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.res.PageSimpleResponse; import com.glxp.mipsdl.res.ptxhyy.PtxhInvResponse; -import com.glxp.mipsdl.res.udiwms.BasicSkProjectResponse; -import com.glxp.mipsdl.res.udiwms.InvProductRequest; import com.glxp.mipsdl.res.udiwms.ThrInvResultResponse; -import com.glxp.mipsdl.res.udiwms.UdiRlSupResponse; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; @@ -73,10 +60,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.IOException; import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java index 7aa9397..0f5f7dd 100644 --- a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java +++ b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java @@ -1,7 +1,6 @@ package com.glxp.mipsdl.client.pzh; import cn.hutool.core.util.StrUtil; -import com.glxp.mipsdl.client.BaseHttpClient; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.dao.pzhzd.YyUcloudV31SetDao; import com.glxp.mipsdl.entity.pzhzd.YyUcloudV31SetEntity; diff --git a/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java index a5bb4b3..5db7e8d 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java @@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.mipsdl.client.BaseHttpClient; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; @@ -23,7 +21,6 @@ import com.glxp.mipsdl.dao.thrsys.ThrProductsDao; import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; -import com.glxp.mipsdl.entity.basic.BasicCorpEntity; import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; import com.glxp.mipsdl.entity.inout.IoCodeEntity; import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity; diff --git a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java index ac03c27..d724393 100644 --- a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java @@ -11,7 +11,6 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.glxp.mipsdl.client.BaseHttpClient; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; @@ -31,19 +30,15 @@ import com.glxp.mipsdl.entity.auth.AuthWarehouseUser; import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; import com.glxp.mipsdl.entity.basic.BasicCorpEntity; import com.glxp.mipsdl.entity.inout.*; -import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.entity.thrsys.ThrOrderUploadBustypesEntity; import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; -import com.glxp.mipsdl.req.ctqyy.CtqPostRelProductRequest; import com.glxp.mipsdl.req.post.*; import com.glxp.mipsdl.req.zaxyy.ZaZyRequest; import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest; -import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; -import com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse; import com.glxp.mipsdl.res.udiwms.ZzzyyProductsResponse; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.order.OrderUploadLogService; diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java index 01a7a64..4ac8dc4 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java @@ -10,7 +10,6 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.glxp.mipsdl.client.BaseHttpClient; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; @@ -34,12 +33,10 @@ import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; -import com.glxp.mipsdl.req.ctqyy.CtqPostRelProductRequest; import com.glxp.mipsdl.req.post.*; import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest; import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; -import com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse; import com.glxp.mipsdl.res.udiwms.ZzzyyProductsResponse; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; diff --git a/src/main/java/com/glxp/mipsdl/config/HospConfig.java b/src/main/java/com/glxp/mipsdl/config/HospConfig.java index ac8ca55..c85f821 100644 --- a/src/main/java/com/glxp/mipsdl/config/HospConfig.java +++ b/src/main/java/com/glxp/mipsdl/config/HospConfig.java @@ -3,7 +3,6 @@ package com.glxp.mipsdl.config; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.mipsdl.dao.auth.AuthLicenseDao; import com.glxp.mipsdl.dao.system.SysHospConfigDao; import com.glxp.mipsdl.entity.auth.AuthLicenseEntity; diff --git a/src/main/java/com/glxp/mipsdl/config/MyBatisConfig.java b/src/main/java/com/glxp/mipsdl/config/MyBatisConfig.java new file mode 100644 index 0000000..dbfca96 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/config/MyBatisConfig.java @@ -0,0 +1,27 @@ +package com.glxp.mipsdl.config; + +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +@Configuration +public class MyBatisConfig { + @Bean + public MybatisPlusInterceptor paginationInterceptor() { + MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor(); +//这是分页拦截器 + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + + paginationInnerInterceptor.setOverflow(false); + paginationInnerInterceptor.setMaxLimit(500L); + mybatisPlusInterceptor.addInnerInterceptor(paginationInnerInterceptor); +//设置请求的页面大于最大页后操作，true调回到首页，false继续请求默认false +// paginationInterceptor.setOverflow(false);//设置最大单页限制数量，默认500条，-1不受限制 +//paginationInterceptor.setLimit(500); +//开启 count 的 join 优化,只针对部分 left join + return mybatisPlusInterceptor; + } +} + diff --git a/src/main/java/com/glxp/mipsdl/config/ThirdSysConfig.java b/src/main/java/com/glxp/mipsdl/config/ThirdSysConfig.java index b89f7a9..f022f7b 100644 --- a/src/main/java/com/glxp/mipsdl/config/ThirdSysConfig.java +++ b/src/main/java/com/glxp/mipsdl/config/ThirdSysConfig.java @@ -1,7 +1,6 @@ package com.glxp.mipsdl.config; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.thrsys.ThrSystemDao; import com.glxp.mipsdl.entity.thrsys.ThrSystemEntity; diff --git a/src/main/java/com/glxp/mipsdl/dao/auth/AuthLicenseDao.java b/src/main/java/com/glxp/mipsdl/dao/auth/AuthLicenseDao.java index 367cfee..2b5fc78 100644 --- a/src/main/java/com/glxp/mipsdl/dao/auth/AuthLicenseDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/auth/AuthLicenseDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.auth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.auth.AuthLicenseEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AuthLicenseDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseDao.java b/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseDao.java index 9d008ee..86ba037 100644 --- a/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.auth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AuthWarehouseDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseUserMapper.java b/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseUserMapper.java index 47a272d..ba4c625 100644 --- a/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseUserMapper.java +++ b/src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseUserMapper.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.auth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.auth.AuthWarehouseUser; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AuthWarehouseUserMapper extends BaseMapper { } diff --git a/src/main/java/com/glxp/mipsdl/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/mipsdl/dao/basic/BasicBussinessTypeDao.java index 56f66d9..9a86fd8 100644 --- a/src/main/java/com/glxp/mipsdl/dao/basic/BasicBussinessTypeDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/basic/BasicBussinessTypeDao.java @@ -2,8 +2,10 @@ package com.glxp.mipsdl.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +@Mapper public interface BasicBussinessTypeDao extends BaseMapper { /** @@ -14,4 +16,4 @@ public interface BasicBussinessTypeDao extends BaseMapper { /** diff --git a/src/main/java/com/glxp/mipsdl/dao/basic/BasicProductsDao.java b/src/main/java/com/glxp/mipsdl/dao/basic/BasicProductsDao.java index 9ec2111..febdb0e 100644 --- a/src/main/java/com/glxp/mipsdl/dao/basic/BasicProductsDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/basic/BasicProductsDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.basic.BasicProductsEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface BasicProductsDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/basic/BasicUdirelDao.java b/src/main/java/com/glxp/mipsdl/dao/basic/BasicUdirelDao.java index 8d705f6..5fb19da 100644 --- a/src/main/java/com/glxp/mipsdl/dao/basic/BasicUdirelDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/basic/BasicUdirelDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface BasicUdirelDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeDao.java b/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeDao.java index f906a22..87cba39 100644 --- a/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.inout.IoCodeEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface IoCodeDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeTempDao.java b/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeTempDao.java index 15f395d..e88fa7e 100644 --- a/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeTempDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/inout/IoCodeTempDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.inout.IoCodeTempEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface IoCodeTempDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDao.java index aa6130b..2da924f 100644 --- a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.inout.IoOrderEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface IoOrderDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailBizDao.java index 692e4eb..ee5d81a 100644 --- a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailBizDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface IoOrderDetailBizDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailCodeDao.java b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailCodeDao.java index 14889bb..af7023f 100644 --- a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailCodeDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailCodeDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.inout.IoOrderDetailCodeEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface IoOrderDetailCodeDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailResultDao.java b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailResultDao.java index 31f848f..16e2e62 100644 --- a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailResultDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.inout.IoOrderDetailResultEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface IoOrderDetailResultDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderUploadLogDao.java b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderUploadLogDao.java index 6381be4..668608a 100644 --- a/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderUploadLogDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/inout/IoOrderUploadLogDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.inout.IoOrderUploadLogEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface IoOrderUploadLogDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/pzhzd/YyUcloudV31SetDao.java b/src/main/java/com/glxp/mipsdl/dao/pzhzd/YyUcloudV31SetDao.java index f91d4c5..7230214 100644 --- a/src/main/java/com/glxp/mipsdl/dao/pzhzd/YyUcloudV31SetDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/pzhzd/YyUcloudV31SetDao.java @@ -1,11 +1,13 @@ package com.glxp.mipsdl.dao.pzhzd; import com.glxp.mipsdl.entity.pzhzd.YyUcloudV31SetEntity; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** * 片仔癀 */ +@Mapper public interface YyUcloudV31SetDao { YyUcloudV31SetEntity findSetUp(@Param("url") String url); diff --git a/src/main/java/com/glxp/mipsdl/dao/system/SysErpLogDao.java b/src/main/java/com/glxp/mipsdl/dao/system/SysErpLogDao.java index a76ac2e..6b327d6 100644 --- a/src/main/java/com/glxp/mipsdl/dao/system/SysErpLogDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/system/SysErpLogDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.system.SysErpLogEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface SysErpLogDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/system/SysHospConfigDao.java b/src/main/java/com/glxp/mipsdl/dao/system/SysHospConfigDao.java index 43a46f4..e4cf658 100644 --- a/src/main/java/com/glxp/mipsdl/dao/system/SysHospConfigDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/system/SysHospConfigDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.system.SysHospConfigEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface SysHospConfigDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/system/SysScheduledDao.java b/src/main/java/com/glxp/mipsdl/dao/system/SysScheduledDao.java index cd4d738..af60244 100644 --- a/src/main/java/com/glxp/mipsdl/dao/system/SysScheduledDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/system/SysScheduledDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.system.SysScheduledEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface SysScheduledDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/system/SysThirdSysApiDao.java b/src/main/java/com/glxp/mipsdl/dao/system/SysThirdSysApiDao.java index 08b850d..da091b3 100644 --- a/src/main/java/com/glxp/mipsdl/dao/system/SysThirdSysApiDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/system/SysThirdSysApiDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.system.SysThirdsysApiEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface SysThirdSysApiDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrBustypeOriginDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrBustypeOriginDao.java index 9d66d0c..f2eca76 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrBustypeOriginDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrBustypeOriginDao.java @@ -2,8 +2,10 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrBustypeOriginEntity; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +@Mapper public interface ThrBustypeOriginDao extends BaseMapper { /** @@ -14,4 +16,4 @@ public interface ThrBustypeOriginDao extends BaseMapper * @return */ String findThirdActionByBillType(@Param("billType") String billType, @Param("hospCode") String hospCode); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrCorpDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrCorpDao.java index 53799a7..3d2ec1c 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrCorpDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrCorpDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ThrCorpDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrDeptDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrDeptDao.java index 6dd0079..312029e 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrDeptDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrDeptDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrDeptEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ThrDeptDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrInvWarehouseDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrInvWarehouseDao.java index 54bd14a..0050103 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrInvWarehouseDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrInvWarehouseDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ThrInvWarehouseDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java index 60e923c..2f9bd80 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ThrProductsDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemBusApiDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemBusApiDao.java index 2001ded..9c2edce 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemBusApiDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemBusApiDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ThrSystemBusApiDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDao.java index ceb1e91..73e9639 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDao.java @@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrSystemEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface ThrSystemDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDetailDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDetailDao.java index 8504759..e4099ab 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDetailDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDetailDao.java @@ -2,8 +2,10 @@ package com.glxp.mipsdl.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrSystemDetailEntity; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +@Mapper public interface ThrSystemDetailDao extends BaseMapper { /** @@ -14,4 +16,4 @@ public interface ThrSystemDetailDao extends BaseMapper { * @return */ ThrSystemDetailEntity selectByKey(@Param("key") String key, @Param("hospCode") String hospCode); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/entity/njxyy/InvEntity.java b/src/main/java/com/glxp/mipsdl/entity/njxyy/InvEntity.java new file mode 100644 index 0000000..6bfc09a --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/njxyy/InvEntity.java @@ -0,0 +1,27 @@ +package com.glxp.mipsdl.entity.njxyy; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName(value = "A002") +public class InvEntity { + @TableField("DEPT_ID") + private String DEPT_ID; + @TableField("DEPT_CD") + private String DEPT_CD; + @TableField("DEPT_NAME") + private String DEPT_NAME; + @TableField("PY") + private String PY; + @TableField("WB") + private String WB; + @TableField("PARENT_DEPT_CD") + private String PARENT_DEPT_CD; + @TableField("DEPT_LEVEL") + private String DEPT_LEVEL; + @TableField("FDEPT_CD") + private String FDEPT_CD; + +} diff --git a/src/main/java/com/glxp/mipsdl/entity/njxyy/ProductEntity.java b/src/main/java/com/glxp/mipsdl/entity/njxyy/ProductEntity.java new file mode 100644 index 0000000..9f8f5b8 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/njxyy/ProductEntity.java @@ -0,0 +1,75 @@ +package com.glxp.mipsdl.entity.njxyy; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName(value = "A001") +public class ProductEntity { + + @TableField("lastUpdateTime") + private String lastUpdateTime; + @TableField("code") + private String code; + @TableField("name") + private String name; + @TableField("measname") + private String measname; + @TableField("standard") + private String standard; + @TableField("registerNo") + private String registerNo; + @TableField("manufactoryCode") + private String manufactoryCode; + @TableField("manufactory") + private String manufactory; + @TableField("supCode") + private String supCode; + @TableField("supName") + private String supName; + @TableField("cplb") + private String cplb; + @TableField("flbm") + private String flbm; + @TableField("qxlb") + private String qxlb; + @TableField("ybbm") + private String ybbm; + @TableField("sptm") + private String sptm; + @TableField("tyshxydm") + private String tyshxydm; + @TableField("ylqxzcrbarmc") + private String ylqxzcrbarmc; + @TableField("ylqxzcrbarywmc") + private String ylqxzcrbarywmc; + @TableField("cpms") + private String cpms; + @TableField("spmc") + private String spmc; + @TableField("qtbm") + private String qtbm; + @TableField("zczyxqz") + private String zczyxqz; + @TableField("price") + private BigDecimal price; + @TableField("deptCode") + private String deptCode; + @TableField("deptName") + private String deptName; + @TableField("remark") + private String remark; + @TableField("remark1") + private String remark1; + @TableField("remark2") + private String remark2; + @TableField("remark3") + private String remark3; + ; + + +} diff --git a/src/main/java/com/glxp/mipsdl/entity/njxyy/SickerEntity.java b/src/main/java/com/glxp/mipsdl/entity/njxyy/SickerEntity.java new file mode 100644 index 0000000..3a0ece3 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/njxyy/SickerEntity.java @@ -0,0 +1,91 @@ +package com.glxp.mipsdl.entity.njxyy; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("thr_sicker") +public class SickerEntity { + @TableField("HOSPITAL_CD") + private String HOSPITAL_CD; + @TableField("Patientidp") + private String Patientidp; + /** + * 病人住院号 + */ + @TableField("InpatientID") + private String InpatientID; + @TableField("MZ_ZY") + private String MZ_ZY; + @TableField("Name") + private String Name; + @TableField("Sex") + private String Sex; + @TableField("Age") + private String Age; + @TableField("InpatientDeptID") + private String InpatientDeptID; + @TableField("InpatientDept") + private String InpatientDept; + @TableField("InpatientDate") + private String InpatientDate; + @TableField("Diagnosis") + private String Diagnosis; + @TableField("BirthDate") + private String BirthDate; + @TableField("Address") + private String Address; + @TableField("IDType") + private String IDType; + @TableField("IdentityNo") + private String IdentityNo; + @TableField("CellPhoneNo") + private String CellPhoneNo; + @TableField("OtherContent") + private String OtherContent; + @TableField("OtherPhone") + private String OtherPhone; + @TableField("OperID") + private String OperID; + @TableField("OperName") + private String OperName; + @TableField("OperDoctorID") + private String OperDoctorID; + @TableField("OperDoctor") + private String OperDoctor; + @TableField("OPERDOCTORDEPT") + private String OPERDOCTORDEPT; + @TableField("OPERNURSE") + private String OPERNURSE; + @TableField("OperAddress") + private String OperAddress; + @TableField("ApplyDept") + private String ApplyDept; + @TableField("ApplyDeptName") + private String ApplyDeptName; + @TableField("ApplyStaffID") + private String ApplyStaffID; + @TableField("OperDept") + private String OperDept; + @TableField("OperDeptName") + private String OperDeptName; + @TableField("OperStaffID") + private String OperStaffID; + @TableField("operDate") + private String operDate; + @TableField("YLZDM") + private String YLZDM; + @TableField("InpatientBmID") + private String InpatientBmID; + @TableField("InpatientBmName") + private String InpatientBmName; + @TableField("HealthCardNum") + private String HealthCardNum; + @TableField("REMARK") + private String REMARK; + @TableField("curno") + private String curno; + + +} diff --git a/src/main/java/com/glxp/mipsdl/req/njxyy/PostThrProductRequest.java b/src/main/java/com/glxp/mipsdl/req/njxyy/PostThrProductRequest.java new file mode 100644 index 0000000..804527b --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/req/njxyy/PostThrProductRequest.java @@ -0,0 +1,37 @@ +package com.glxp.mipsdl.req.njxyy; + +import lombok.Data; + +@Data +public class PostThrProductRequest { + + private String code; + private String name; + /** + * DI + */ + private String nameCode; + private String measname; + private String standard; + private String registerNo; + private String manufactory; + private String supName; + private String cplb; + private String flbm; + private String qxlb; + private String ybbm; + private String sptm; + private String tyshxydm; + private String ylqxzcrbarmc; + private String ylqxzcrbarywmc; + private String cpms; + private String spmc; + private String qtbm; + private String zczyxqz; + private String price; + private String remark; + private String remark1; + private String remark2; + private String remark3; + +} diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkSickerResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkSickerResponse.java index c98ff2f..1646282 100644 --- a/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkSickerResponse.java +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkSickerResponse.java @@ -1,11 +1,20 @@ package com.glxp.mipsdl.res.udiwms; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class BasicSkSickerResponse { + + private String sickerId; + /** * 患者编码 */ diff --git a/src/main/java/com/glxp/mipsdl/service/system/SysParamConfigService.java b/src/main/java/com/glxp/mipsdl/service/system/SysParamConfigService.java index 4beb292..c9c575e 100644 --- a/src/main/java/com/glxp/mipsdl/service/system/SysParamConfigService.java +++ b/src/main/java/com/glxp/mipsdl/service/system/SysParamConfigService.java @@ -2,7 +2,6 @@ package com.glxp.mipsdl.service.system; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.mipsdl.util.IntUtil; -import org.apache.logging.log4j.spi.Terminable; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.mipsdl.dao.system.SysParamConfigMapper; diff --git a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrProductService.java b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrProductService.java index c0b6150..8351c58 100644 --- a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrProductService.java +++ b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrProductService.java @@ -3,7 +3,6 @@ package com.glxp.mipsdl.service.thrsys; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.dao.basic.BasicUdirelDao; import com.glxp.mipsdl.dao.thrsys.ThrProductsDao; diff --git a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSysBusTypeService.java b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSysBusTypeService.java index 3ca6d7a..bf2e1ac 100644 --- a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSysBusTypeService.java +++ b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSysBusTypeService.java @@ -2,7 +2,6 @@ package com.glxp.mipsdl.service.thrsys; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; diff --git a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java index 0d07d7b..2382142 100644 --- a/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java +++ b/src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java @@ -3,7 +3,6 @@ package com.glxp.mipsdl.service.thrsys; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.dao.thrsys.ThrSystemDetailDao; import com.glxp.mipsdl.entity.thrsys.ThrSystemDetailEntity; -import com.glxp.mipsdl.util.DictUtl; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrCorpMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrCorpMapper.java new file mode 100644 index 0000000..51ddb69 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrCorpMapper.java @@ -0,0 +1,17 @@ +package com.glxp.mipsdl.thirddao.njxyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; +import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +@DS("njsql") +public interface ThrCorpMapper extends BaseMapper { + + List filterThrCorps(UdiwmsUnitRequest udiwmsUnitRequest); + +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrInvWarehourseMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrInvWarehourseMapper.java new file mode 100644 index 0000000..73c0870 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrInvWarehourseMapper.java @@ -0,0 +1,11 @@ +package com.glxp.mipsdl.thirddao.njxyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +@DS("njsql") +public interface ThrInvWarehourseMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrProductsMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrProductsMapper.java new file mode 100644 index 0000000..dd714b0 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrProductsMapper.java @@ -0,0 +1,12 @@ +package com.glxp.mipsdl.thirddao.njxyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.njxyy.ProductEntity; +import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +@DS("njsql") +public interface ThrProductsMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java new file mode 100644 index 0000000..9ef810e --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java @@ -0,0 +1,12 @@ +package com.glxp.mipsdl.thirddao.njxyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.njxyy.SickerEntity; +import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +@DS("njsql") +public interface ThrSickerMapper extends BaseMapper { +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8e0c827..393b5d3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring: strict: false datasource: master: - url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver @@ -14,7 +14,17 @@ spring: maximum-pool-size: 60 minimum-idle: 10 njsql: + # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy + # username: SD_UDIJK + # password: SD_UDIJK + # driver-class-name: oracle.jdbc.driver.OracleDrive url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver +# thirdSql: +# url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +# username: root +# password: 123456 +# driver-class-name: com.p6spy.engine.spy.P6SpyDriver + diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 7a9a816..6171271 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -14,12 +14,8 @@ spring: maximum-pool-size: 60 minimum-idle: 10 njsql: - url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - connection-timeout: 60000 - maximum-pool-size: 60 - minimum-idle: 10 + jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy + username: SD_UDIJK + password: SD_UDIJK + driver-class-name: oracle.jdbc.driver.OracleDrive UDIWMS_IP: http://127.0.0.1:9991 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index baf0615..56d884d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -24,7 +24,7 @@ UDIWMS_IP: http://127.0.0.1:9991 #mybatis-plus配置 mybatis-plus: - mapper-locations: classpath:mybatis/mapper/*/*.xml + mapper-locations: classpath:mybatis/mapper/*/*/*.xml configuration: use-generated-keys: true use-column-label: true diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml b/src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml deleted file mode 100644 index 0635f75..0000000 --- a/src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packUnit, packLevel, - bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, - tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, - diType, ybbm, sptm, manufactory, measname, productType, scbssfbhph, scbssfbhxlh, - scbssfbhscrq, scbssfbhsxrq, cpms, allowNoBatch, allowNoExpire, allowNoProduct, spmc, - cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, basicPrductRemak3, - basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, basicPrductRemak8, - createTime, updateTime, `createUser`, updateUser, remark - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml b/src/main/resources/mybatis/mapper/master/auth/AuthLicenseDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml rename to src/main/resources/mybatis/mapper/master/auth/AuthLicenseDao.xml index 0216d04..f9b12bd 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml +++ b/src/main/resources/mybatis/mapper/master/auth/AuthLicenseDao.xml @@ -17,4 +17,4 @@ id, appid, `name`, apikey, secretkey, createDate, customerId, companyName - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/auth/AuthUserDao.xml b/src/main/resources/mybatis/mapper/master/auth/AuthUserDao.xml similarity index 97% rename from src/main/resources/mybatis/mapper/auth/AuthUserDao.xml rename to src/main/resources/mybatis/mapper/master/auth/AuthUserDao.xml index 9949199..030219e 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthUserDao.xml +++ b/src/main/resources/mybatis/mapper/master/auth/AuthUserDao.xml @@ -20,7 +20,7 @@ - id, userName, `passWord`, lastLoginIp, createTime, userFlag, lastModifyTime, comments, + id, userName, `passWord`, lastLoginIp, createTime, userFlag, lastModifyTime, comments, employeeName, CustomerId, lastLoginTime, locDeptCode, locInvCode - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/auth/AuthWarehouseDao.xml b/src/main/resources/mybatis/mapper/master/auth/AuthWarehouseDao.xml similarity index 97% rename from src/main/resources/mybatis/mapper/auth/AuthWarehouseDao.xml rename to src/main/resources/mybatis/mapper/master/auth/AuthWarehouseDao.xml index 1a55020..6e1aa35 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/master/auth/AuthWarehouseDao.xml @@ -19,7 +19,7 @@ - id, code, `name`, parentId, remark, defaultInv, thirdId, thirdId1, thirdId2, thirdId3, + id, code, `name`, parentId, remark, defaultInv, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, parentCode - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/auth/AuthWarehouseUserMapper.xml b/src/main/resources/mybatis/mapper/master/auth/AuthWarehouseUserMapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/auth/AuthWarehouseUserMapper.xml rename to src/main/resources/mybatis/mapper/master/auth/AuthWarehouseUserMapper.xml diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/master/basic/BasicBussinessTypeDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml rename to src/main/resources/mybatis/mapper/master/basic/BasicBussinessTypeDao.xml index 62be94c..11571f6 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/master/basic/BasicBussinessTypeDao.xml @@ -127,4 +127,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/master/basic/BasicCorpDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml rename to src/main/resources/mybatis/mapper/master/basic/BasicCorpDao.xml diff --git a/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml b/src/main/resources/mybatis/mapper/master/basic/BasicDestinyRelMapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml rename to src/main/resources/mybatis/mapper/master/basic/BasicDestinyRelMapper.xml diff --git a/src/main/resources/mybatis/mapper/master/basic/BasicProductsDao.xml b/src/main/resources/mybatis/mapper/master/basic/BasicProductsDao.xml new file mode 100644 index 0000000..0bcc66f --- /dev/null +++ b/src/main/resources/mybatis/mapper/master/basic/BasicProductsDao.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packUnit, packLevel, + bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, + tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, + diType, ybbm, sptm, manufactory, measname, productType, scbssfbhph, scbssfbhxlh, + scbssfbhscrq, scbssfbhsxrq, cpms, allowNoBatch, allowNoExpire, allowNoProduct, spmc, + cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, basicPrductRemak3, + basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, basicPrductRemak8, + createTime, updateTime, `createUser`, updateUser, remark + + diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkProjectMapper.xml b/src/main/resources/mybatis/mapper/master/basic/BasicSkProjectMapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basic/BasicSkProjectMapper.xml rename to src/main/resources/mybatis/mapper/master/basic/BasicSkProjectMapper.xml diff --git a/src/main/resources/mybatis/mapper/basic/BasicUdirelDao.xml b/src/main/resources/mybatis/mapper/master/basic/BasicUdirelDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basic/BasicUdirelDao.xml rename to src/main/resources/mybatis/mapper/master/basic/BasicUdirelDao.xml diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/master/basic/UdiRlSupDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml rename to src/main/resources/mybatis/mapper/master/basic/UdiRlSupDao.xml diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml b/src/main/resources/mybatis/mapper/master/inout/IoCodeDao.xml similarity index 97% rename from src/main/resources/mybatis/mapper/inout/IoCodeDao.xml rename to src/main/resources/mybatis/mapper/master/inout/IoCodeDao.xml index 1f06c3c..fe8d460 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml +++ b/src/main/resources/mybatis/mapper/master/inout/IoCodeDao.xml @@ -28,8 +28,8 @@ - id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate, - expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode, + id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate, + expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode, warehouseCode, updateTime, createTime - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml b/src/main/resources/mybatis/mapper/master/inout/IoCodeTempDao.xml similarity index 97% rename from src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml rename to src/main/resources/mybatis/mapper/master/inout/IoCodeTempDao.xml index 02c21f1..fadd1d3 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml +++ b/src/main/resources/mybatis/mapper/master/inout/IoCodeTempDao.xml @@ -28,8 +28,8 @@ - id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate, - expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode, + id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate, + expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode, warehouseCode, updateTime, createTime - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/master/inout/IoOrderDao.xml similarity index 96% rename from src/main/resources/mybatis/mapper/inout/IoOrderDao.xml rename to src/main/resources/mybatis/mapper/master/inout/IoOrderDao.xml index ec14b33..41ab372 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/master/inout/IoOrderDao.xml @@ -40,10 +40,10 @@ - id, billNo, corpOrderId, mainAction, `action`, fromCorp, fromDeptCode, fromInvCode, - fromType, `status`, dealStatus, `createUser`, createTime, updateUser, updateTime, - reviewUser, auditTime, customerId, deptCode, invCode, outChangeEnable, originUllageSupNo, - ullageSupNo, supplementNo, thirdBillNo, replicateNo, preOutBillNo, preInBillNo, errMsg, + id, billNo, corpOrderId, mainAction, `action`, fromCorp, fromDeptCode, fromInvCode, + fromType, `status`, dealStatus, `createUser`, createTime, updateUser, updateTime, + reviewUser, auditTime, customerId, deptCode, invCode, outChangeEnable, originUllageSupNo, + ullageSupNo, supplementNo, thirdBillNo, replicateNo, preOutBillNo, preInBillNo, errMsg, printRemark, remark, orderType, entrustEnd - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/master/inout/IoOrderDetailBizDao.xml similarity index 96% rename from src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml rename to src/main/resources/mybatis/mapper/master/inout/IoOrderDetailBizDao.xml index 0d33397..32fe950 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/master/inout/IoOrderDetailBizDao.xml @@ -36,9 +36,9 @@ - id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, - certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, - secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, + id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, + certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, + secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, remark2, remark3, remark4, remark5 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/master/inout/IoOrderDetailCodeDao.xml similarity index 96% rename from src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml rename to src/main/resources/mybatis/mapper/master/inout/IoOrderDetailCodeDao.xml index 86bd65b..aaba05b 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml +++ b/src/main/resources/mybatis/mapper/master/inout/IoOrderDetailCodeDao.xml @@ -36,9 +36,9 @@ - id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, - certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, - secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, + id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, + certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, + secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, remark2, remark3, remark4, remark5 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/master/inout/IoOrderDetailResultDao.xml similarity index 96% rename from src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml rename to src/main/resources/mybatis/mapper/master/inout/IoOrderDetailResultDao.xml index cc50da0..e737ae5 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/master/inout/IoOrderDetailResultDao.xml @@ -36,9 +36,9 @@ - id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, - certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, - secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, + id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, + certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, + secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, remark2, remark3, remark4, remark5 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml b/src/main/resources/mybatis/mapper/master/inout/IoOrderUploadLogDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml rename to src/main/resources/mybatis/mapper/master/inout/IoOrderUploadLogDao.xml index cd8bdb9..f286d1b 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml +++ b/src/main/resources/mybatis/mapper/master/inout/IoOrderUploadLogDao.xml @@ -18,4 +18,4 @@ id, billNo, billDate, billType, thrBillNo, submitTime, `status`, `result`, fromType - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml b/src/main/resources/mybatis/mapper/master/ptxyy/ThrHslbMapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml rename to src/main/resources/mybatis/mapper/master/ptxyy/ThrHslbMapper.xml diff --git a/src/main/resources/mybatis/mapper/pzhzd/YyUcloudV31SetDao.xml b/src/main/resources/mybatis/mapper/master/pzhzd/YyUcloudV31SetDao.xml similarity index 98% rename from src/main/resources/mybatis/mapper/pzhzd/YyUcloudV31SetDao.xml rename to src/main/resources/mybatis/mapper/master/pzhzd/YyUcloudV31SetDao.xml index 9a39e83..73db667 100644 --- a/src/main/resources/mybatis/mapper/pzhzd/YyUcloudV31SetDao.xml +++ b/src/main/resources/mybatis/mapper/master/pzhzd/YyUcloudV31SetDao.xml @@ -14,4 +14,4 @@ limit 1 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/system/SysErpLogDao.xml b/src/main/resources/mybatis/mapper/master/system/SysErpLogDao.xml similarity index 95% rename from src/main/resources/mybatis/mapper/system/SysErpLogDao.xml rename to src/main/resources/mybatis/mapper/master/system/SysErpLogDao.xml index e4b235a..75ea4a5 100644 --- a/src/main/resources/mybatis/mapper/system/SysErpLogDao.xml +++ b/src/main/resources/mybatis/mapper/master/system/SysErpLogDao.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/system/SysHospConfigDao.xml b/src/main/resources/mybatis/mapper/master/system/SysHospConfigDao.xml similarity index 100% rename from src/main/resources/mybatis/mapper/system/SysHospConfigDao.xml rename to src/main/resources/mybatis/mapper/master/system/SysHospConfigDao.xml diff --git a/src/main/resources/mybatis/mapper/system/SysParamConfigMapper.xml b/src/main/resources/mybatis/mapper/master/system/SysParamConfigMapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/system/SysParamConfigMapper.xml rename to src/main/resources/mybatis/mapper/master/system/SysParamConfigMapper.xml diff --git a/src/main/resources/mybatis/mapper/system/SysScheduledDao.xml b/src/main/resources/mybatis/mapper/master/system/SysScheduledDao.xml similarity index 98% rename from src/main/resources/mybatis/mapper/system/SysScheduledDao.xml rename to src/main/resources/mybatis/mapper/master/system/SysScheduledDao.xml index c3ac860..1db2a57 100644 --- a/src/main/resources/mybatis/mapper/system/SysScheduledDao.xml +++ b/src/main/resources/mybatis/mapper/master/system/SysScheduledDao.xml @@ -14,4 +14,4 @@ id, cronName, cron, customerId, remark - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/system/SysThirdSysApiDao.xml b/src/main/resources/mybatis/mapper/master/system/SysThirdSysApiDao.xml similarity index 98% rename from src/main/resources/mybatis/mapper/system/SysThirdSysApiDao.xml rename to src/main/resources/mybatis/mapper/master/system/SysThirdSysApiDao.xml index 0f55f3b..e55c48b 100644 --- a/src/main/resources/mybatis/mapper/system/SysThirdSysApiDao.xml +++ b/src/main/resources/mybatis/mapper/master/system/SysThirdSysApiDao.xml @@ -15,4 +15,4 @@ id, `name`, apiUrl, guideUrl, remark, `type` - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrBustypeOriginDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrBustypeOriginDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/thrsys/ThrBustypeOriginDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrBustypeOriginDao.xml index 97a275b..817dee9 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrBustypeOriginDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrBustypeOriginDao.xml @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrCorpDao.xml similarity index 97% rename from src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrCorpDao.xml index df08981..c0656ce 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrCorpDao.xml @@ -21,7 +21,7 @@ - id, unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, `name`, `createUser`, + id, unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, `name`, `createUser`, createTime, updateUser, updateTime, remark - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrDeptDao.xml similarity index 97% rename from src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrDeptDao.xml index 858cd66..ffd121c 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrDeptDao.xml @@ -19,7 +19,7 @@ - id, pId, code, `name`, advanceType, isDefault, `status`, updateTime, remark, `level`, + id, pId, code, `name`, advanceType, isDefault, `status`, updateTime, remark, `level`, pcode, thirdSysFk - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrInvWarehouseDao.xml similarity index 98% rename from src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrInvWarehouseDao.xml index 1d98ca3..dbcb8cf 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrInvWarehouseDao.xml @@ -15,4 +15,4 @@ id, code, `name`, parentId, remark, thirdSysFk - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrOrderUploadBustypesMapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrOrderUploadBustypesMapper.xml diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml similarity index 96% rename from src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml index 9aa4f9f..87f53b2 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml @@ -39,9 +39,9 @@ - id, code, `name`, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm, - qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, updateTime, - supName, model, `standard`, qtbm, zczyxqz, remark, remark1, remark2, remark3, price, + id, code, `name`, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm, + qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, updateTime, + supName, model, `standard`, qtbm, zczyxqz, remark, remark1, remark2, remark3, price, `createUser`, createTime, updateUser - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrSystemBusApiDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrSystemBusApiDao.xml index 20a8221..b4805c5 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrSystemBusApiDao.xml @@ -23,4 +23,4 @@ id, code, `name`, thirdBuyCode, thirdSys, url, `type`, remark, filed, filed1, filed2, filed3, filed4 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDao.xml similarity index 97% rename from src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDao.xml index 0e18484..527f013 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDao.xml @@ -16,8 +16,8 @@ - id, thirdId, thirdName, apikey, secretkey, mainSys, enabled, thridUrl, thirdSysUrl, + id, thirdId, thirdName, apikey, secretkey, mainSys, enabled, thridUrl, thirdSysUrl, guideUrl, remark - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDetailDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml rename to src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDetailDao.xml index 8042ebc..6284c84 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDetailDao.xml @@ -25,4 +25,4 @@ and thr_system_detail.`key` = #{key} and thr_system.enabled = 1 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/other/njxyy/ThrCorpMapper.xml b/src/main/resources/mybatis/mapper/other/njxyy/ThrCorpMapper.xml new file mode 100644 index 0000000..5d6bf3a --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/njxyy/ThrCorpMapper.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/other/njxyy/ThrInvWarehourseMapper.xml b/src/main/resources/mybatis/mapper/other/njxyy/ThrInvWarehourseMapper.xml new file mode 100644 index 0000000..cde03b0 --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/njxyy/ThrInvWarehourseMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/resources/mybatis/mapper/other/njxyy/ThrProductsMapper.xml b/src/main/resources/mybatis/mapper/other/njxyy/ThrProductsMapper.xml new file mode 100644 index 0000000..002cad7 --- /dev/null +++ b/src/main/resources/mybatis/mapper/other/njxyy/ThrProductsMapper.xml @@ -0,0 +1,4 @@ + + + +