1.修改循环调用平台获取字段

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

@@ -7,6 +7,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -1649,7 +1650,20 @@ public class CommonServiceImpl implements ICommonService {
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
-        return jgRegistrationHistory != null ? JSON.parseArray(jgRegistrationHistory.getChangeData()) : new JSONArray();
+        if(jgRegistrationHistory != null){
+            String changeData = jgRegistrationHistory.getChangeData();
+            try {
+                // 尝试解析为JSONArray
+                return JSON.parseArray(changeData);
+            } catch (JSONException e) {
+                // 解析失败，尝试将对象转换为JSONArray
+                JSONObject jsonObject = JSON.parseObject(changeData);
+                JSONArray jsonArray = new JSONArray();
+                jsonArray.add(jsonObject);
+                return jsonArray;
+            }
+        }
+        return new JSONArray();
     }
 
     @Override

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

@@ -32,9 +32,11 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -44,6 +46,8 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.http.HttpStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -57,6 +61,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -121,6 +126,9 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     @Autowired
     private ESEquipmentCategory esEquipmentCategory;
 
+    private Map<String, Object> fillingMediumMap;
+
+
     /**
      * 新增（提交）车用气瓶
      *
@@ -486,7 +494,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                                     .map(JgVehicleInformationEq::getEquId)
                                     .collect(Collectors.toList())
                     ).stream()
-                            .peek(v -> v.put("chargingMedium", Systemctl.dictionarieClient.value("FILLING_MEDIUM", v.get("chargingMedium") + "").getResult().getDictDataValue()))
+                            .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
                             .collect(Collectors.toList())
             );
         } else {
@@ -500,7 +508,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                                         .map(JgVehicleInformationEq::getEquId)
                                         .collect(Collectors.toList())
                         ).stream()
-                                .peek(v -> v.put("chargingMedium", Systemctl.dictionarieClient.value("FILLING_MEDIUM", v.get("chargingMedium") + "").getResult().getDictDataValue()))
+                                .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium","") + "")))
                                 .collect(Collectors.toList())
                 );
             } else {
@@ -1175,4 +1183,20 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         taskMap.put("model", taskMessageDto);
         commonService.updateTaskModel(taskMap);
     }
+
+    public Map<String ,Object> getFillingMediumMap(){
+        synchronized (this){
+            if(fillingMediumMap != null){
+                return fillingMediumMap;
+            } else {
+                if(fillingMediumMap != null){
+                    return fillingMediumMap;
+                }
+                List<DictionarieValueModel> fillingMedium = FeignUtil.remoteCall(()->Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM"));
+                fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
+                return fillingMediumMap;
+            }
+        }
+    }
+
 }
\ No newline at end of file