Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java

@@ -122,7 +122,11 @@ public class HistoryDeviceServiceImpl implements IHistoryDeviceService {
 		if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){
 			return new ArrayList<>();
 		}
-		return result.getData();
+		return result.getData().stream().peek(fac->{
+			fac.setName(Arrays.stream(fac.getName().split("\\."))
+					.reduce((first, second) -> second)
+					.orElse(fac.getName()));
+		}).collect(Collectors.toList());
 	}
 
 	/**

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/constants/ErrorCode.java

@@ -21,7 +21,8 @@ public enum ErrorCode implements IResultCode {
     UNKNOWN_ANALYSIS_TYPE(1888000007, "未知的识别类型"),
     NO_COMPARATOR(1888000008, "未获取到对比对象"),
     NO_COMPARISON_TYPE(1888000009, "未获取到对比类型"),
-    GET_RESULT_FAIL(1888000010, "获取结果失败"),;
+    GET_RESULT_FAIL(1888000010, "获取结果失败"),
+    NO_ANSWER_FROM_PLATFORM(1888000011, "未从平台获取到答案");
 
     private final int code;
     private final String msg;

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/constants/ResultDataType.java

@@ -1,31 +1,41 @@
 package com.hnac.hzims.bigmodel.zhipuai.constants;
 
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.data.BooleanParser;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.data.IntegerParser;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.data.ResultDataParser;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.data.StringParser;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Author: ypj
  * @Date: 2024/8/14 8:28
  */
 @Getter
+@Slf4j
 public enum ResultDataType implements BaseEnum {
-    OBJECT("Object", "Object类型", Object.class.getName(), null),
+    STRING("String", "String类型", StringParser.class),
-    STRING("String", "String类型", String.class.getName(), null),
+    BOOLEAN("Boolean", "Boolean类型", BooleanParser.class),
-    BOOLEAN("Boolean","Boolean类型",Boolean.class.getName(),"parseBoolean"),
+    INTEGER("Integer", "Integer类型", IntegerParser.class);
-    INTEGER("Integer","Integer类型",Integer.class.getName(),"parseInt");
 
     private final String code;
 
     private final String msg;
 
-    private final String className;
+    private final Class<? extends ResultDataParser> parser;
 
-    private final String method;
+    ResultDataType(String code, String msg, Class<? extends ResultDataParser> parser) {
-
-    ResultDataType(String code, String msg, String className, String method) {
         this.code = code;
         this.msg = msg;
-        this.className = className;
+        this.parser = parser;
-        this.method = method;
     }
 
+    public ResultDataParser getParser() {
+        try {
+            return parser.newInstance();
+        } catch (Exception e) {
+            log.error("get result data parse fail", e);
+        }
+        return null;
+    }
 }

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/constants/ResultStrategyType.java

@@ -1,8 +1,8 @@
 package com.hnac.hzims.bigmodel.zhipuai.constants;
 
-import com.hnac.hzims.bigmodel.zhipuai.handler.ResultBooleanStrategy;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.ResultBooleanStrategy;
-import com.hnac.hzims.bigmodel.zhipuai.handler.ResultCommonStrategy;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.ResultCommonStrategy;
-import com.hnac.hzims.bigmodel.zhipuai.handler.ResultStrategy;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.ResultStrategy;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/ZhipuAnalysisHandlerGlm4v.java

@@ -73,7 +73,7 @@ public class ZhipuAnalysisHandlerGlm4v extends AbstractZhipuAnalysisHandler {
         ModelApiResponse response = sendRequest(text, url);
         log.info("get zhi pu ai response : {}", Optional.ofNullable(response).map(JsonUtil::toJson).orElse("null"));
         Assert.<HzServiceException>isTrue(Objects.nonNull(response) && response.isSuccess(), () -> {
-            throw ErrorCode.throwCommonException(Optional.ofNullable(response).map(ModelApiResponse::getMsg).orElse("没有收到大模型平台响应"));
+            throw ErrorCode.throwCommonException(Optional.ofNullable(response).map(ModelApiResponse::getMsg).orElse(ErrorCode.NO_ANSWER_FROM_PLATFORM.getMsg()));
         });
         try {
             String resultJson = response.getData().getChoices().get(0).getMessage().getContent().toString();

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/result/ResultBooleanStrategy.java

@@ -1,10 +1,11 @@
-package com.hnac.hzims.bigmodel.zhipuai.handler;
+package com.hnac.hzims.bigmodel.zhipuai.handler.result;
 
 import com.hnac.hzims.bigmodel.zhipuai.constants.BaseEnum;
 import com.hnac.hzims.bigmodel.zhipuai.constants.ComparisonType;
 import com.hnac.hzims.bigmodel.zhipuai.constants.ErrorCode;
 import com.hnac.hzims.bigmodel.zhipuai.constants.ResultStrategyType;
 import com.hnac.hzims.bigmodel.zhipuai.entity.ZhipuAnalysisInfoEntity;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.ResultStrategy;
 import org.springframework.util.Assert;
 
 import java.util.Objects;

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/result/ResultCommonStrategy.java

@@ -1,7 +1,8 @@
-package com.hnac.hzims.bigmodel.zhipuai.handler;
+package com.hnac.hzims.bigmodel.zhipuai.handler.result;
 
 import com.hnac.hzims.bigmodel.zhipuai.constants.ResultStrategyType;
 import com.hnac.hzims.bigmodel.zhipuai.entity.ZhipuAnalysisInfoEntity;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.ResultStrategy;
 
 /**
  * @Author: ypj
@@ -13,7 +14,6 @@ public class ResultCommonStrategy implements ResultStrategy<Object> {
         return ResultStrategyType.COMMON.getCode();
     }
 
-
     @Override
     public Object getResult(ZhipuAnalysisInfoEntity info, Object data) {
         return data;

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/result/ResultStrategy.java

@@ -1,13 +1,11 @@
-package com.hnac.hzims.bigmodel.zhipuai.handler;
+package com.hnac.hzims.bigmodel.zhipuai.handler.result;
 
 import com.hnac.hzims.bigmodel.zhipuai.constants.BaseEnum;
 import com.hnac.hzims.bigmodel.zhipuai.constants.ResultDataType;
 import com.hnac.hzims.bigmodel.zhipuai.entity.ZhipuAnalysisInfoEntity;
-import org.slf4j.Logger;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.data.ResultDataParser;
-import org.slf4j.LoggerFactory;
-import org.springblade.core.tool.utils.StringUtil;
 
-import java.lang.reflect.Method;
+import java.util.Optional;
 
 /**
  * @Author: ypj
@@ -23,15 +21,9 @@ public interface ResultStrategy<T> {
 
     default Object convertOriginalData(String originalData, String className) {
         ResultDataType type = BaseEnum.getInstance(className, ResultDataType.class);
-        if (null != type && StringUtil.isNotBlank(type.getMethod())) {
+        if (null != type) {
-            try {
+            ResultDataParser parser = type.getParser();
-                Class<?> clazz = Class.forName(type.getClassName());
+            return Optional.ofNullable(parser).map(p -> p.parse(originalData)).orElse(originalData);
-                Method method = clazz.getMethod(type.getMethod(), String.class);
-                return method.invoke(null, originalData);
-            } catch (Exception ignore) {
-                Logger logger = LoggerFactory.getLogger(ResultStrategy.class);
-                logger.info("parse data error", ignore);
-            }
         }
         return originalData;
     }

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/result/data/BooleanParser.java

@@ -0,0 +1,12 @@
+package com.hnac.hzims.bigmodel.zhipuai.handler.result.data;
+
+/**
+ * @Author: ypj
+ * @Date: 2024/8/28 16:12
+ */
+public class BooleanParser implements ResultDataParser<Boolean> {
+    @Override
+    public Boolean parse(String originalData) {
+        return Boolean.parseBoolean(originalData);
+    }
+}

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/result/data/IntegerParser.java

@@ -0,0 +1,12 @@
+package com.hnac.hzims.bigmodel.zhipuai.handler.result.data;
+
+/**
+ * @Author: ypj
+ * @Date: 2024/8/28 16:46
+ */
+public class IntegerParser implements ResultDataParser<Integer> {
+    @Override
+    public Integer parse(String originalData) {
+        return Integer.parseInt(originalData);
+    }
+}

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/result/data/ResultDataParser.java

@@ -0,0 +1,9 @@
+package com.hnac.hzims.bigmodel.zhipuai.handler.result.data;
+
+/**
+ * @Author: ypj
+ * @Date: 2024/8/28 16:04
+ */
+public interface ResultDataParser<T> {
+    T parse(String originalData);
+}

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/handler/result/data/StringParser.java

@@ -0,0 +1,12 @@
+package com.hnac.hzims.bigmodel.zhipuai.handler.result.data;
+
+/**
+ * @Author: ypj
+ * @Date: 2024/8/28 16:11
+ */
+public class StringParser implements ResultDataParser<String> {
+    @Override
+    public String parse(String originalData) {
+        return originalData;
+    }
+}

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/service/impl/ZhipuAnalysisServiceImpl.java

@@ -7,7 +7,7 @@ import com.hnac.hzims.bigmodel.zhipuai.constants.BaseEnum;
 import com.hnac.hzims.bigmodel.zhipuai.constants.ErrorCode;
 import com.hnac.hzims.bigmodel.zhipuai.constants.ResultStrategyType;
 import com.hnac.hzims.bigmodel.zhipuai.entity.ZhipuAnalysisInfoEntity;
-import com.hnac.hzims.bigmodel.zhipuai.handler.ResultStrategy;
+import com.hnac.hzims.bigmodel.zhipuai.handler.result.ResultStrategy;
 import com.hnac.hzims.bigmodel.zhipuai.handler.ZhipuAnalyser;
 import com.hnac.hzims.bigmodel.zhipuai.handler.ZhipuAnalysisFactory;
 import com.hnac.hzims.bigmodel.zhipuai.service.ZhipuAnalysisInfoService;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/impl/HazardWorkServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.safeproduct.risk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -104,14 +105,14 @@ public class HazardWorkServiceImpl extends ServiceImpl<HazardWorkMapper, HazardW
             Long headId = record.getHead();
             if (headId != null) {
                 R<User> header = userClient.userInfoById(headId);
-                if (header.isSuccess()) {
+                if (header.isSuccess() && ObjectUtils.isNotEmpty(header.getData())) {
                     hazardWorkVO.setHeadName(header.getData().getRealName());
                 }
             }
             Long manageId = record.getManage();
             if (manageId != null) {
                 R<User> manager = userClient.userInfoById(manageId);
-                if (manager.isSuccess()) {
+                if (manager.isSuccess() && ObjectUtils.isNotEmpty(manager.getData())) {
                     hazardWorkVO.setManagerName(manager.getData().getRealName());
                 }
             }