浏览代码

fix 自动生成出生年月和性别

Administrator 4 年之前
父节点
当前提交
44748a4028

+ 6 - 1
boman-modules/boman-file/src/main/java/com/boman/file/controller/ExcelController.java

@@ -49,7 +49,12 @@ public class ExcelController {
     public AjaxResult importExcelCommon(@RequestBody ImportExcelDto dto) {
         MultipartFile multipartFile = dto.getMultipartFile();
         String tableName = dto.getTableName();
-        List<JSONObject> result = fileService.importExcelCommon(multipartFile, tableName);
+        List<JSONObject> result = null;
+        try {
+            result = fileService.importExcelCommon(multipartFile, tableName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return AjaxResult.success(result);
     }
 

+ 3 - 2
boman-web-core/src/main/java/com/boman/web/core/service/fieldTranslator/FieldTranslatorServiceImpl.java

@@ -1,6 +1,7 @@
 package com.boman.web.core.service.fieldTranslator;
 
 import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.fieldTranslator.IdCardUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -18,11 +19,11 @@ public class FieldTranslatorServiceImpl implements IFieldTranslatorService{
     public JSONObject idCardTranslator(JSONObject commitData) {
         Object idCard = commitData.get("id_card");
         Set<String> columnNameSet = commitData.keySet();
-        if (columnNameSet.contains("birthday_user")){
+        if (columnNameSet.contains("birthday_user") && StringUtils.isBlank(String.valueOf(commitData.get("birthday_user")))){
             String birthday = IdCardUtils.getBirthday(String.valueOf(idCard));
             commitData.put("birthday_user",birthday);
         }
-        if (columnNameSet.contains("gender_user")){
+        if (columnNameSet.contains("gender_user") && StringUtils.isBlank(String.valueOf(commitData.get("gender_user")))){
             String sex = IdCardUtils.getSex(String.valueOf(idCard));
             commitData.put("gender_user",sex);
         }

+ 3 - 1
boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -410,7 +410,9 @@ public class ColumnUtils {
         for (GenTableColumn genTableColumn : genTableColumnList) {
             String fieldTranslator = genTableColumn.getFieldTranslator();
             if (StringUtils.isNotBlank(fieldTranslator)){
-                commitData = SpringUtils.getBean(RestTemplate.class).postForObject("http://" + fieldTranslator, commitData, JSONObject.class);
+                String url = "http://" + fieldTranslator;
+                System.out.println("访问地址:"+url);
+                commitData = SpringUtils.getBean(RestTemplate.class).postForObject(url, commitData, JSONObject.class);
             }
         }
         context.setCommitData(commitData);