Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/EngineerInfo.java

 package com.alibaba.cloud.integration.order.entity;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import lombok.Data;
 
 import java.sql.Timestamp;
@@ -22,7 +24,8 @@ public class EngineerInfo {
 	private String vehicle;
 	private String vehicleNo;
 	private String beanStatus;
-	private JsonNode tags;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private JSONObject tags;
 	private String memo;
 	private Timestamp createTime;
 	private Timestamp updateTime;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/EngineerServiceImpl.java

@@ -11,11 +11,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.databind.JsonNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
@@ -25,6 +27,8 @@ import java.util.stream.Collectors;
 @Service
 public class EngineerServiceImpl implements EngineerService {
 
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
 	@Autowired
 	private EngineerInfoMPDao engineerInfoMPDao;
 
@@ -381,18 +385,14 @@ public class EngineerServiceImpl implements EngineerService {
 
 			// 标签
 			List<String> tags = new ArrayList<>();
-			if (e.getTags() != null) {
-				Iterator<Map.Entry<String, JsonNode>> it = e.getTags().fields();
-				while(it.hasNext()){
-					Map.Entry<String, JsonNode> field = it.next();
-					String name = field.getKey();
-					JsonNode value = field.getValue();
-					tags.add(String.format("%s+%d",field.getKey(), field.getValue().intValue()));
+			logger.debug("XXXTENTACION: {}", e.getTags());
+			if (!e.getTags().isEmpty()) {
+				for(Map.Entry<String, Object> entry: e.getTags().entrySet()){
+					tags.add(String.format("%s+%d", entry.getKey(), entry.getValue()));
 				}
 			} else {
 				item.setTags(tags);
 			}
-
 			items.add(item);
 		}
 		return items;