fix(jyjc):检验结果

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -46,6 +46,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionDetectionSaveToDbEv
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.BizEmqPublisher;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jyjc.biz.util.CompareUtils;
 import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
@@ -60,7 +61,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -440,7 +440,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                 paramObj.forEach((k, v) -> {
                     DynamicColumnDto columnDto = new DynamicColumnDto();
                     columnDto.setColumnName(String.format("\"%s\"", StrUtil.toUnderlineCase(k).toUpperCase()));
-                    columnDto.setColumnValue(v == null ? null : String.valueOf(v));
+                    columnDto.setColumnValue(v == null ? null : nullIfNullOrEmpty(String.valueOf(v)));
                     columns.add(columnDto);
                 });
                 String tableName = this.getTableName(param.getParamType());
@@ -449,6 +449,16 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         }
     }
 
+    /**
+     * 处理将空转null 防止技术参数，数字类型在查询详情时，映射错误
+     *
+     * @param str 字符串
+     * @return null or 非空的字符串
+     */
+    private String nullIfNullOrEmpty(String str) {
+        return CompareUtils.isNullOrEmpty(str) ? null : str;
+    }
+
     private String getTableName(String paramType) {
         return String.format("\"%s\"", StrUtil.toUnderlineCase(paramType));
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/CompareUtils.java

 package com.yeejoin.amos.boot.module.jyjc.biz.util;
 
-public class CompareUtils {
+public final class CompareUtils {
 
     public static boolean isNullOrEmpty(String str) {
-        return str == null || str.trim().isEmpty() || "null".equals(str);
+        return str == null || str.trim().isEmpty() || "null".equalsIgnoreCase(str);
     }
 }