From 0ec3380be210e94ff6f23c6bc1a618f4e0bbb950 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 13 May 2024 15:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../whdc/service/impl/AbUdRServiceImpl.java | 3 ++- .../service/impl/AddressBookServiceImpl.java | 2 +- .../service/impl/OrganizationServiceImpl.java | 3 ++- .../service/impl/UnitDictServiceImpl.java | 3 ++- src/main/resources/application.yml | 20 +++++++++---------- src/main/resources/mapper/AdinfoMapper.xml | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java b/src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java index 2b28a70..cb698ed 100644 --- a/src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java @@ -1,10 +1,11 @@ package com.whdc.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.AbUdRMapper; import com.whdc.model.entity.AbUdR; import com.whdc.service.IAbUdRService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java index 7f27245..3dc933d 100644 --- a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java @@ -23,7 +23,7 @@ public class AddressBookServiceImpl extends ServiceImpl page(AddressBootDto dto) { - return baseMapper.page(new Page<>(), dto); + return baseMapper.page(dto.getPage(), dto); } diff --git a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java index 36e7ff5..f10c6c8 100644 --- a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java @@ -1,10 +1,11 @@ package com.whdc.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.OrganizationMapper; import com.whdc.model.entity.Organization; import com.whdc.service.IOrganizationService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java index 09fff7b..03e1c4f 100644 --- a/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java @@ -1,10 +1,11 @@ package com.whdc.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.UnitDictMapper; import com.whdc.model.entity.UnitDict; import com.whdc.service.IUnitDictService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ae45208..a12956a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,12 +6,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver - url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL - username: SYSDBA - password: SYSDBA001 -# url: jdbc:dm://10.42.6.247:5236?schema=SHZH -# username: SHZH -# password: Shzh_890 +# url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL +# username: SYSDBA +# password: SYSDBA001 + url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL + username: SHZH + password: Shzh_890 druid: initialSize: 5 minIdle: 5 @@ -35,11 +35,11 @@ spring: # Redis redis: database: 5 -# host: 10.42.6.75 - host: 127.0.0.1 + host: 10.42.6.75 +# host: 127.0.0.1 port: 6379 - password: -# password: Whdc_890 +# password: + password: Whdc_890 servlet: multipart: diff --git a/src/main/resources/mapper/AdinfoMapper.xml b/src/main/resources/mapper/AdinfoMapper.xml index a94ced0..67fad3e 100644 --- a/src/main/resources/mapper/AdinfoMapper.xml +++ b/src/main/resources/mapper/AdinfoMapper.xml @@ -11,7 +11,7 @@ - select t.adcd, t.adnm from FXKH_TXL.ADINFO t where t.del = 0 and ( t.adcd like CONCAT('%', #{adcd}, '%'))