提交,实体层编码结束

ibzdata-core/src/main/java/cn/ibizlab/core/data/model/POSchema.java

@@ -719,6 +719,17 @@ public class POSchema {
         }
     }
 
+    public List<BaseData> trans(List<BaseData> source)
+    {
+        if(!needTrans)
+            return source;
+        else {
+            List<BaseData> target = new ArrayList<>();
+            source.forEach(item->target.add(trans(item)));
+            return target;
+        }
+    }
+
 
     public POSchema writeTo(Path path)
     {

ibzdata-core/src/main/java/cn/ibizlab/core/data/service/impl/DbDataServiceImpl.java

@@ -219,7 +219,7 @@ public class DbDataServiceImpl implements IDataService {
             rt.addAll(dbDataMapper.getBatchData(link.getName(),poSchema,batch));
             batch.clear();
         }
-        return rt;
+        return poSchema.trans(rt);
     }
 
     @Override
@@ -321,7 +321,7 @@ public class DbDataServiceImpl implements IDataService {
         if(StringUtils.isEmpty(datasource))datasource=model.getDefaultDataSource();
         DSLink link=dsSettingService.getDataSource(datasource);
         POSchema poSchema=model.getPOSchema(link.getType());
-        return dbDataMapper.selectData(link.getName(),poSchema,et);
+        return poSchema.trans(dbDataMapper.selectData(link.getName(),poSchema,et));
     }
 
     @Override
@@ -331,7 +331,7 @@ public class DbDataServiceImpl implements IDataService {
         DSLink link=dsSettingService.getDataSource(datasource);
         POSchema poSchema=model.getPOSchema(link.getType());
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseData> pages=dbDataMapper.selectData(link.getName(),poSchema,et,FilterData.getPages(poSchema,pageable));
-        return new PageImpl<BaseData>(pages.getRecords(), pageable, pages.getTotal());
+        return new PageImpl<BaseData>(poSchema.trans(pages.getRecords()), pageable, pages.getTotal());
     }
 
     @Override
@@ -341,7 +341,7 @@ public class DbDataServiceImpl implements IDataService {
         DSLink link=dsSettingService.getDataSource(datasource);
         POSchema poSchema=model.getPOSchema(link.getType());
         context.setPOSchema(poSchema);
-        return dbDataMapper.queryData(link.getName(),poSchema,context.getSql("-dq-"+dataQuery+"-"),context,context.getSearchCond());
+        return poSchema.trans(dbDataMapper.queryData(link.getName(),poSchema,context.getSql("-dq-"+dataQuery+"-"),context,context.getSearchCond()));
     }
 
     @Override
@@ -357,7 +357,7 @@ public class DbDataServiceImpl implements IDataService {
             pageable=context.getPageable();
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseData> pages=
                 dbDataMapper.queryData(link.getName(),poSchema,context.getSql("-dq-"+dataQuery+"-"),context,context.getSearchCond(),context.getPages());
-        return new PageImpl<BaseData>(pages.getRecords(), pageable, pages.getTotal());
+        return new PageImpl<BaseData>(poSchema.trans(pages.getRecords()), pageable, pages.getTotal());
     }
 
     @Override
@@ -385,7 +385,7 @@ public class DbDataServiceImpl implements IDataService {
         DSLink link=dsSettingService.getDataSource(datasource);
         POSchema poSchema=model.getPOSchema(link.getType());
         context.setPOSchema(poSchema);
-        return dbDataMapper.queryData(link.getName(),poSchema,context.getSql("-ds-"+dataSet+"-"),context,context.getSearchCond());
+        return poSchema.trans(dbDataMapper.queryData(link.getName(),poSchema,context.getSql("-ds-"+dataSet+"-"),context,context.getSearchCond()));
     }
 
     @Override
@@ -401,7 +401,7 @@ public class DbDataServiceImpl implements IDataService {
             pageable=context.getPageable();
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseData> pages=
                 dbDataMapper.queryData(link.getName(),poSchema,context.getSql("-ds-"+dataSet+"-"),context,context.getSearchCond(),context.getPages());
-        return new PageImpl<BaseData>(pages.getRecords(), pageable, pages.getTotal());
+        return new PageImpl<BaseData>(poSchema.trans(pages.getRecords()), pageable, pages.getTotal());
     }
 
     @Override

ibzdata-core/src/main/resources/mapper/data/DbData/DbDataMapper.xml

@@ -63,7 +63,7 @@
     </select>
 
     <select id="getBatchKey"  parameterType="java.util.List" resultType="cn.ibizlab.core.data.dto.BaseData">
-        select <foreach collection="schema.keyMap" item="value" index="key" separator=",">${key}</foreach> from ${schema.name} t1 where
+        select <foreach collection="schema.keyMap" item="value" index="key" separator=",">${key} as ${value}</foreach> from ${schema.name} t1 where
         <if test="schema.logicValidColumn!=null">
             ${schema.logicValidCond} and
         </if>