diff --git a/pom.xml b/pom.xml index 11f8b51..a936209 100644 --- a/pom.xml +++ b/pom.xml @@ -105,6 +105,14 @@ ${mybatis-plus.version} + + + p6spy + p6spy + 3.9.1 + + + org.projectlombok diff --git a/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java b/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java index 8e94d38..d871af8 100644 --- a/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java +++ b/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java @@ -3,7 +3,6 @@ package com.glxp.udi.admin.controller.info; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.entity.info.PlatformEntity; @@ -123,7 +122,7 @@ public class PlatformController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - Page page = platformService.getLinkPlatformList(platformLinkRequest); + IPage page = platformService.getLinkPlatformList(platformLinkRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(page.getRecords()); diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java b/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java index 0627aa7..9e46002 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.controller.inout; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; @@ -306,7 +307,7 @@ public class StockQRCodeTextController { SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); systemPDFTemplateRelevanceRequest.setLocalAction(orderMdEntity.getAction()); systemPDFTemplateRelevanceRequest.setModuleId(inspectionPDFTemplateRequest.getModuleId()); - Page page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); + IPage page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); if (page.getTotal() == 0) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到模板文件"); } else { @@ -335,7 +336,7 @@ public class StockQRCodeTextController { SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId()); systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType()); - Page page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); + IPage page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); if (page.getTotal() == 0) { return; } diff --git a/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java b/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java index edcd33a..0714865 100644 --- a/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java +++ b/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java @@ -97,7 +97,7 @@ public class SystemPDFModuleController { systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); } - Page systemPDFTemplateRelevanceResponsePage = systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); + IPage systemPDFTemplateRelevanceResponsePage = systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); pageSimpleResponse.setList(systemPDFTemplateRelevanceResponsePage.getRecords()); pageSimpleResponse.setTotal(systemPDFTemplateRelevanceResponsePage.getTotal()); } diff --git a/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java b/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java index fe2a090..bcdfeea 100644 --- a/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java @@ -1,9 +1,9 @@ package com.glxp.udi.admin.dao.info; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.info.PlatformEntity; -import com.glxp.udi.admin.req.info.PlatformLinkRequest; import com.glxp.udi.admin.res.info.PlatformLinkResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -34,7 +34,7 @@ public interface PlatformDao extends BaseMapper { * @param platformLinkRequest * @return */ - Page getLinkPlatformList(Page page, @Param("platformLinkRequest") PlatformLinkRequest platformLinkRequest); + IPage getLinkPlatformList(IPage page, String customerId, String key); /** * 查询未被绑定的平台 diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java index ba25cd9..6e4d673 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java @@ -14,8 +14,6 @@ public interface SystemPDFModuleDao extends BaseMapper { Page listPDFModules(Page page); - SystemPDFModuleEntity findSystemPDFModule(SystemPDFModuleRequest systemPDFModuleRequest); - SystemPDFModuleEntity selectById(String id); boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java index b49e6d3..c1213a6 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java @@ -1,7 +1,7 @@ package com.glxp.udi.admin.dao.param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity; import com.glxp.udi.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; import com.glxp.udi.admin.res.param.SystemPDFTemplateRelevanceResponse; @@ -14,8 +14,6 @@ import java.util.List; public interface SystemPDFTemplateRelevanceDao extends BaseMapper { - Page filterList(Page page, SystemPDFTemplateRelevanceRequest systemPDFModuleRequest); - /** * 根据 customerId 查询 * @@ -59,4 +57,9 @@ public interface SystemPDFTemplateRelevanceDao extends BaseMapper filterList(IPage page, Integer moduleId, String localAction, String customerId); + + List filterAll(SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest); + } diff --git a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java index 6bb42e0..f00f269 100644 --- a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.entity.param; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -29,10 +30,13 @@ public class SystemPDFModuleEntity { private Integer templateType; + @TableField(exist = false) private String remark1; + @TableField(exist = false) private String remark2; + @TableField(exist = false) private String remark3; } diff --git a/src/main/java/com/glxp/udi/admin/req/param/SystemPDFModuleRequest.java b/src/main/java/com/glxp/udi/admin/req/param/SystemPDFModuleRequest.java index 40eb041..335fbc1 100644 --- a/src/main/java/com/glxp/udi/admin/req/param/SystemPDFModuleRequest.java +++ b/src/main/java/com/glxp/udi/admin/req/param/SystemPDFModuleRequest.java @@ -14,7 +14,7 @@ public class SystemPDFModuleRequest extends ListPageRequest { private String name; private String param; private String fieldExplain; - private int templateId; + private Integer templateId; private String remark; private Date create_time; private Date update_time; diff --git a/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java b/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java index 265d5dc..9d90f38 100644 --- a/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java +++ b/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java @@ -103,13 +103,13 @@ public class PlatformService { * @param customerId * @return */ - public Page getLinkPlatformList(PlatformLinkRequest platformLinkRequest) { + public IPage getLinkPlatformList(PlatformLinkRequest platformLinkRequest) { if (null == platformLinkRequest) { return new Page<>(); } - Page page = new Page<>(platformLinkRequest.getPage(), platformLinkRequest.getLimit()); - return platformDao.getLinkPlatformList(page, platformLinkRequest); + IPage page = new Page<>(platformLinkRequest.getPage(), platformLinkRequest.getLimit()); + return platformDao.getLinkPlatformList(page, platformLinkRequest.getCustomerId(), platformLinkRequest.getKey()); } /** diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java index 10fe4d1..7252487 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.service.param; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.param.SystemPDFModuleDao; import com.glxp.udi.admin.entity.param.SystemPDFModuleEntity; @@ -21,7 +23,10 @@ public class SystemPDFModuleService { public Page queryPage(SystemPDFModuleRequest systemPDFModuleRequest) { Page page = new Page<>(systemPDFModuleRequest.getPage(), systemPDFModuleRequest.getLimit()); - return systemPDFModuleDao.queryPage(page, systemPDFModuleRequest); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(null != systemPDFModuleRequest.getTemplateId(), "templateId", systemPDFModuleRequest.getTemplateId()) + .like(StrUtil.isNotBlank(systemPDFModuleRequest.getName()), "name", systemPDFModuleRequest.getName()); + return systemPDFModuleDao.selectPage(page, wrapper); } public Page listPDFModules(Integer page, Integer limit) { @@ -37,7 +42,6 @@ public class SystemPDFModuleService { } public boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest) { - return systemPDFModuleDao.updateById(systemPDFModuleSaveRequest); } diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java index 0fd15ed..c5d98cb 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.service.param; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.param.SystemPDFTemplateRelevanceDao; import com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity; @@ -21,15 +22,21 @@ public class SystemPDFTemplateRelevanceService { @Resource private SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao; - public Page filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest) { + public IPage filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest) { if (null == systemPDFModuleRequest) { return new Page<>(); } - Page page = new Page<>(-1, -1); + if (null != systemPDFModuleRequest.getPage() && null != systemPDFModuleRequest.getLimit()) { - page = new Page<>(systemPDFModuleRequest.getPage(), systemPDFModuleRequest.getLimit()); + IPage page = new Page<>(systemPDFModuleRequest.getPage(), systemPDFModuleRequest.getLimit()); + return systemPDFTemplateRelevanceDao.filterList(page, systemPDFModuleRequest.getModuleId(), systemPDFModuleRequest.getLocalAction(), systemPDFModuleRequest.getCustomerId()); + } else { + List responses = systemPDFTemplateRelevanceDao.filterAll(systemPDFModuleRequest); + IPage page = new Page<>(); + page.setTotal(responses.size()); + page.setRecords(responses); + return page; } - return systemPDFTemplateRelevanceDao.filterList(page, systemPDFModuleRequest); } /** diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9ae9ae4..a0714d4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -6,6 +6,7 @@ spring: url: jdbc:mysql://192.168.235.137:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: root + driver-class-name: com.mysql.cj.jdbc.Driver data: mongodb: uri: mongodb://192.168.0.66:27017/udiwms diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index bc57e82..4ce06c6 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,5 +1,6 @@ spring: datasource: + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: mysql@2020 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 1ef85dc..0cb286c 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -3,9 +3,11 @@ spring: pathmatch: matching-strategy: ant_path_matcher datasource: - url: jdbc:mysql://192.168.0.66:3360/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + driver-class-name: com.p6spy.engine.spy.P6SpyDriver + url: jdbc:p6spy:mysql://192.168.0.66:3360/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: root + data: mongodb: uri: mongodb://192.168.0.66:27017/udiwms diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 148b1ce..2bd4ccf 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,8 +4,7 @@ server: spring: profiles: active: test - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver + mybatis-plus: mapperPackage: com.glxp.udi.admin.dao.* diff --git a/src/main/resources/mybatis/mapper/info/PlatformDao.xml b/src/main/resources/mybatis/mapper/info/PlatformDao.xml index 37e0127..45a44d1 100644 --- a/src/main/resources/mybatis/mapper/info/PlatformDao.xml +++ b/src/main/resources/mybatis/mapper/info/PlatformDao.xml @@ -85,12 +85,12 @@ from io_unit_maintain u left join auth_platform p on u.platformId = p.id - customerId = #{platformLinkRequest.customerId} + customerId = #{customerId} and platformId is not null - - AND (u.unitId like concat('%', #{param1.key}, '%') - or u.name like concat('%', #{param1.key}, '%') - or u.pinyinCode like concat('%', #{param1.key}, '%') + + AND (u.unitId like concat('%', #{key}, '%') + or u.name like concat('%', #{key}, '%') + or u.pinyinCode like concat('%', #{key}, '%') ) diff --git a/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml index 15eedb8..3be1b03 100644 --- a/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml @@ -16,11 +16,6 @@ - - +