From fc8a0e6d90695f57b1dbac8f7fa229f068743978 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 15 Mar 2022 17:50:51 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/mybatis/MybatisPlusConfig.java | 12 +++++++-- .../tag/mapper/OnlCgformTagMapper.java | 5 ++-- .../tag/mapper/xml/OnlCgformTagMapper.xml | 25 +++++++++++++++++++ .../service/impl/OnlCgformTagServiceImpl.java | 20 +++++++++------ 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java index d90d84df8..aa9260fbb 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java @@ -1,18 +1,20 @@ package com.jero.config.mybatis; +import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; import com.baomidou.mybatisplus.core.parser.ISqlParser; import com.baomidou.mybatisplus.core.parser.ISqlParserFilter; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; +import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; +import com.jero.common.util.oConvertUtils; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; import net.sf.jsqlparser.expression.operators.relational.InExpression; import net.sf.jsqlparser.schema.Column; import org.apache.ibatis.reflection.MetaObject; -import com.jero.common.util.oConvertUtils; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -131,7 +133,7 @@ public class MybatisPlusConfig { } }); } -// /** + // /** // * mybatis-plus SQL执行效率插件【生产环境可以关闭】 // */ // @Bean @@ -139,4 +141,10 @@ public class MybatisPlusConfig { // return new PerformanceInterceptor(); // } + //将数据库中的数据输出时都转换成驼峰格式 + @Bean + public ConfigurationCustomizer mybatisConfigurationCustomizer(){ + return configuration -> configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory()); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java index 07aeea770..1616c72ec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -3,7 +3,6 @@ package com.jero.modules.tag.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.tag.entity.OnlCgformTag; -import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.springframework.data.repository.query.Param; @@ -16,7 +15,7 @@ import java.util.Map; * @Version: V1.0 */ public interface OnlCgformTagMapper extends BaseMapper { - @Select("select f.id,f.create_by,f.create_time,f.update_by,f.update_time,f.cgform_head_id,\n" + + /* @Select("select f.id,f.create_by,f.create_time,f.update_by,f.update_time,f.cgform_head_id,\n" + "f.is_model,f.db_field_txt,f.db_field_en_name,\n" + "f.field_show_type,i.item_text as field_show_type_name,\n" + "f.dict_id,f.db_length,f.order_num,f.field_must_input,\n" + @@ -30,7 +29,7 @@ public interface OnlCgformTagMapper extends BaseMapper { "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" + "and f.is_delete=0\n" + "and i.dict_id=1493098515761917954 \n" + - "order by f.order_num asc ") + "order by f.order_num asc ")*/ IPage queryPageList(IPage page,@Param("params") Map params); /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml index a98a3bc08..f711e5900 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml @@ -26,4 +26,29 @@ + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 32f0bf834..1d6fdb13f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -14,7 +14,6 @@ import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.system.service.impl.SysDictServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; -import com.jero.modules.tag.enums.FileTableIdEnum; import com.jero.modules.tag.mapper.OnlCgformTagMapper; import com.jero.modules.tag.service.IOnlCgformTagService; import com.jero.modules.utils.HanYuPinYinUtil; @@ -180,15 +179,22 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryPageList(Map params) { Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); - IPage page = new Page(pageNo, pageSize); + IPage page = new Page(pageNo, pageSize); + IPage result = onlCgformTagMapper.queryPageList(page,params); + List> records = result.getRecords(); + String cut = (String) params.get("cut"); //中英切换-属性类型+展示区域列 - if (CutEnum.EN.getValue().equals(params.get("cut").toString())) { - params.put("fieldShowType", params.get("fieldShowTypeEnName")); - params.put("showArea", params.get("showAreaEnName")); + if(CutEnum.EN.getValue().equals(cut)){ + for(Map data:records){ + System.out.println("这里这里fieldShowTypeEnName"+data.get("fieldShowTypeEnName")); + System.out.println("这里这里showAreaEnName"+data.get("showAreaEnName")); + data.put("fieldShowTypeName",data.get("fieldShowTypeEnName")); + data.put("showAreaName",data.get("showAreaEnName")); + } + } - IPage result = onlCgformTagMapper.queryPageList(page,params); - return result; + return result; } /**