fastjson升级到fastjson2

cf-dependencies/pom.xml

@@ -58,6 +58,7 @@
         <velocity.version>2.4.1</velocity.version>
         <screw.version>1.0.5</screw.version>
         <fastjson.version>1.2.83</fastjson.version>
+        <fastjson2.version>2.0.61</fastjson2.version>
         <guava.version>33.4.8-jre</guava.version>
         <guice.version>5.1.0</guice.version>
         <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
@@ -515,9 +516,9 @@
             </dependency>
 
             <dependency>
-                <groupId>com.alibaba</groupId>
+                <groupId>com.alibaba.fastjson2</groupId>
-                <artifactId>fastjson</artifactId>
+                <artifactId>fastjson2</artifactId>
-                <version>${fastjson.version}</version>
+                <version>2.0.61</version>
             </dependency>
 
             <dependency>

cf-framework/cf-spring-boot-starter-biz-ip/pom.xml

@@ -48,8 +48,8 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson</artifactId>
+            <artifactId>fastjson2</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

cf-framework/cf-spring-boot-starter-biz-ip/src/main/java/com/cf/imes/framework/ip/core/service/imp/IPQueryServiceImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpStatus;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.framework.common.exception.ErrorCode;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.ip.core.enums.ErrorCodeConstants;

cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml

@@ -155,8 +155,8 @@
 
         <!-- JSON -->
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson</artifactId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
         <dependency>
             <groupId>com.cf.imes</groupId>

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/plan/OrderPlanApiImpl.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.executor.api.plan;
 
 import cn.hutool.core.collection.CollUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.json.JsonUtils;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.executor.controller.admin.order;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.CommonResult;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.executor.controller.admin.plan;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.module.executor.controller.admin.plan.bo.OrderSource;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.executor.dal.dataobject.ordermodel;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.executor.util.deviseData.structure.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderPlateList.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.executor.dal.dataobject.ordermodel;
 
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.executor.util.deviseData.structure.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java

@@ -6,7 +6,7 @@ import cn.hutool.core.lang.Pair;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.DigestUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.cf.imes.framework.common.enums.DeletedCodeEnum;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.executor.service.customplateno;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.CommonResult;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.executor.service.customplatenorule;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.executor.service.customplatenorule;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.executor.service.customplatenorule;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.executor.service.customplatenorule;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.util.json.JsonUtils;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.executor.service.optimizeplan;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.module.executor.controller.admin.plan.bo.OrderSource;
 import com.cf.imes.module.executor.controller.admin.plan.bo.PlanProcessSchemeList;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -5,9 +5,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.cloud.commons.lang.StringUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.executor.service.order;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.module.executor.controller.admin.manage.pack.vo.PackOrdersInfoRespVO;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -4,9 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.executor.util.deviseData.structure;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiDataAchieve.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.executor.util.fileConversion.admin.api.webcad;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.module.system.api.application.ApplicationApi;
 import lombok.extern.slf4j.Slf4j;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiDataProduction.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.executor.util.fileConversion.admin.api.webcad;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.web.bind.annotation.*;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.executor.util.fileConversion.admin.api.webcad;//package com.cf.imes.module.executor.util.fileConversion.admin.api.webcad;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.id.core.util.SnowflakeIdWorker3rd;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java

@@ -8,7 +8,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.mybatis.core.generator.SnowFlakeGenerator;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.executor.util.fileConversion.admin.files.excel;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java

@@ -6,7 +6,7 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.dict.core.util.DictFrameworkUtils;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java

@@ -2,8 +2,8 @@ package com.cf.imes.module.executor.util.fileConversion.admin.files.xml;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.cf.imes.framework.id.core.util.SnowflakeIdWorker3rd;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderimport/webcad/vo/WebCadDataBlockRemarkVO.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.plan.controller.admin.orderimport.webcad.vo;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderModelDO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.plan.dal.dataobject.ordermodel;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.plan.dal.elasticsearch.BasePosition;
 import com.cf.imes.module.plan.dal.elasticsearch.HoleDetail;
 import com.cf.imes.module.plan.dal.elasticsearch.ModelDetail;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/dataobject/ordermodel/OrderPlateList.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.plan.dal.dataobject.ordermodel;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.plan.dal.elasticsearch.BasePosition;
 import com.cf.imes.module.plan.dal.elasticsearch.HoleDetail;
 import com.cf.imes.module.plan.dal.elasticsearch.ModelDetail;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/elasticsearch/PlateDetail.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.plan.dal.elasticsearch;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplateno/CustomPlateNoGenerateServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.plan.service.customplateno;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/BodyNoGenerateRuleServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.plan.service.customplatenorule;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/OrderNoGenerateRuleServiceImpl.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.plan.service.customplatenorule;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/PlateNoGenerateRuleServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.plan.service.customplatenorule;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/customplatenorule/RoomNoGenerateRuleServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.plan.service.customplatenorule;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.util.json.JsonUtils;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultExcelOrderImportConsumer.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.plan.service.orderImport.consumer;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/DefaultXmlOrderImportConsumer.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.plan.service.orderImport.consumer;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.PageUtil;
 import cn.hutool.json.JSONObject;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java

@@ -5,8 +5,8 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/ProducingOrderImportFactory.java

@@ -8,9 +8,9 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java

@@ -8,10 +8,11 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONException;
-import com.alibaba.fastjson.JSONReader;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONReader;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -243,13 +244,14 @@ public class WebCadOrderImportAsyncFactory {
 
     public void analyzeTempData(Long taskId, String webcadJsonCachePath) throws FileNotFoundException {
         tempFilePath = webcadJsonCachePath + File.separator + taskId + ".json";
-        try (JSONReader reader = new JSONReader(new FileReader(tempFilePath))) {
+        try (JSONReader reader = JSONReader.of(new FileReader(tempFilePath))) {
-            reader.startObject();
+            if (!reader.nextIfObjectStart()) {
-            while (reader.hasNext()) {
+                throw new JSONException("期望 JSON 对象");
-                String fieldName = reader.readString();
+            }
+            while (!reader.nextIfObjectEnd()) {
+                String fieldName = reader.readFieldName();
                 processFieldData(fieldName, reader);
             }
-            reader.endObject();
 
             performPostProcessing(taskId);
         } catch (Exception e) {
@@ -292,7 +294,7 @@ public class WebCadOrderImportAsyncFactory {
                 processParts(reader);
                 break;
             case "CadViewFileId":
-                cadViewFileId = reader.readLong();
+                cadViewFileId = reader.readInt64();
                 AssertUtils.notEmpty(cadViewFileId, ErrorCodeConstants.WEBCAD_ORDER_IMPORT_CAD_VIEW_FILE_ID_EMPTY_ERROR);
                 break;
             case "ComponentGroupTree":
@@ -300,7 +302,7 @@ public class WebCadOrderImportAsyncFactory {
                 break;
             default:
                 // 跳过未知字段
-                reader.readObject();
+                reader.skipValue();
                 break;
         }
     }
@@ -446,10 +448,12 @@ public class WebCadOrderImportAsyncFactory {
      * @param reader
      */
     private void analyzeMaterials(JSONReader reader) {
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-        while (reader.hasNext()) {
+            throw new JSONException("期望 JSON 数组");
+        }
+        while (!reader.nextIfArrayEnd()) {
             // 读取json内容序列化
-            WebCadDataMaterialReqVO materialReqVO = reader.readObject(WebCadDataMaterialReqVO.class);
+            WebCadDataMaterialReqVO materialReqVO = reader.read(WebCadDataMaterialReqVO.class);
 
             String plateGoodsGoodsId = materialReqVO.getGoodsId();
 
@@ -512,9 +516,7 @@ public class WebCadOrderImportAsyncFactory {
                 // 缓存goodCode和orderGoodsId的对应关系
                 materialMap.put(plateGoodsGoodsId, goodsDO);
             }
-
         }
-        reader.endArray();
     }
 
     /**
@@ -523,9 +525,11 @@ public class WebCadOrderImportAsyncFactory {
      * @param reader
      */
     private void analyzeGroups(JSONReader reader) {
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-        while (reader.hasNext()) {
+            throw new JSONException("期望 JSON 数组");
-            WebCadDataProcessGroupReqVO processGroup = reader.readObject(WebCadDataProcessGroupReqVO.class);
+        }
+        while (!reader.nextIfArrayEnd()) {
+            WebCadDataProcessGroupReqVO processGroup = reader.read(WebCadDataProcessGroupReqVO.class);
             String groupTypeName = processGroup.getType();
             Long groupTypeId = (Long) snowFlakeGenerator.nextId(null);
             List<WebCadDataProcessGroupReqVO.ProjectsDTO> projects = processGroup.getProjects();
@@ -543,7 +547,6 @@ public class WebCadOrderImportAsyncFactory {
                 }
             }
         }
-        reader.endArray();
     }
 
     /**
@@ -552,31 +555,34 @@ public class WebCadOrderImportAsyncFactory {
      * @param reader
      */
     private void analyzeRoomBody(JSONReader reader) {
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-        while (reader.hasNext()) {
+            throw new JSONException("期望 JSON 数组");
-            reader.startObject();
+        }
+        while (!reader.nextIfArrayEnd()) {
+            if (!reader.nextIfObjectStart()) {
+                throw new JSONException("期望 JSON 对象");
+            }
 
             String roomName = null;
-            while (reader.hasNext()) {
+            while (!reader.nextIfObjectEnd()) {
-                String key = reader.readString();
+                String key = reader.readFieldName();
                 if ("name".equals(key)) {
                     roomName = reader.readString();
                 } else if ("count".equals(key)) {
                     // 无用count
-                    reader.readObject();
+                    reader.skipValue();
                 } else if (CHILDREN_FIELD.equals(key)) {
-                    reader.startArray();
+                    if (!reader.nextIfArrayStart()) {
-                    while (reader.hasNext()) {
+                        throw new JSONException("期望 JSON 数组");
-                        WebCadDataDoubleRoomTreeReqVO.ChildrenDTO childrenDTO = reader.readObject(WebCadDataDoubleRoomTreeReqVO.ChildrenDTO.class);
+                    }
+                    while (!reader.nextIfArrayEnd()) {
+                        WebCadDataDoubleRoomTreeReqVO.ChildrenDTO childrenDTO = reader.read(WebCadDataDoubleRoomTreeReqVO.ChildrenDTO.class);
                         // 缓存柜体成倍信息
                         roomBodyMap.put(roomName + childrenDTO.getName(), childrenDTO.getCount());
                     }
-                    reader.endArray();
                 }
             }
-            reader.endObject();
         }
-        reader.endArray();
     }
 
     /**
@@ -585,11 +591,12 @@ public class WebCadOrderImportAsyncFactory {
      * @param reader
      */
     private void analyzeBlockRoomList(JSONReader reader) {
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-        while (reader.hasNext()) {
+            throw new JSONException("期望 JSON 数组");
+        }
+        while (!reader.nextIfArrayEnd()) {
             processBlockRoom(reader);
         }
-        reader.endArray();
         orderPlateBatchInsertWithinThreshold(plateDOS, true);
     }
 
@@ -597,22 +604,23 @@ public class WebCadOrderImportAsyncFactory {
      * 处理单个房间的板件数据
      */
     private void processBlockRoom(JSONReader reader) {
-        reader.startObject();
+        if (!reader.nextIfObjectStart()) {
+            throw new JSONException("期望 JSON 对象");
+        }
         String roomName = null;
         Long roomId = null;
 
-        while (reader.hasNext()) {
+        while (!reader.nextIfObjectEnd()) {
-            String key = reader.readString();
+            String key = reader.readFieldName();
             if ("name".equals(key)) {
                 roomName = reader.readString();
                 roomId = getOrCreateRoomId(roomName);
             } else if (CHILDREN_FIELD.equals(key)) {
                 processBlockChildren(reader, roomName, roomId);
             } else {
-                reader.readObject();
+                reader.skipValue();
             }
         }
-        reader.endObject();
     }
 
     /**
@@ -653,11 +661,12 @@ public class WebCadOrderImportAsyncFactory {
      * 处理房间下的柜体列表
      */
     private void processBlockChildren(JSONReader reader, String roomName, Long roomId) {
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-        while (reader.hasNext()) {
+            throw new JSONException("期望 JSON 数组");
+        }
+        while (!reader.nextIfArrayEnd()) {
             analyzeBlockBodyList(reader, roomName, roomId);
         }
-        reader.endArray();
     }
 
     /**
@@ -668,12 +677,14 @@ public class WebCadOrderImportAsyncFactory {
      * @param roomId
      */
     private void analyzeBlockBodyList(JSONReader reader, String roomName, Long roomId) {
-        reader.startObject();
+        if (!reader.nextIfObjectStart()) {
+            throw new JSONException("期望 JSON 对象");
+        }
 
         String boxName = null;
         Integer count = 1;
-        while (reader.hasNext()) {
+        while (!reader.nextIfObjectEnd()) {
-            String key = reader.readString();
+            String key = reader.readFieldName();
             if ("name".equals(key)) {
                 boxName = reader.readString();
 
@@ -682,16 +693,16 @@ public class WebCadOrderImportAsyncFactory {
 
             } else if ("blockList".equals(key)) {
                 // Blocks.children.blockList开始
-                reader.startArray();
+                if (!reader.nextIfArrayStart()) {
-                while (reader.hasNext()) {
+                    throw new JSONException("期望 JSON 数组");
-                    WebCadDataBlockReqVO block = reader.readObject(WebCadDataBlockReqVO.class);
+                }
+                while (!reader.nextIfArrayEnd()) {
+                    WebCadDataBlockReqVO block = reader.read(WebCadDataBlockReqVO.class);
                     // 成倍创建
                     multiCreateBodyPlate(count, roomId, roomName, boxName, block);
                 }
-                reader.endArray();
             }
         }
-        reader.endObject();
     }
 
     /**
@@ -1415,11 +1426,12 @@ public class WebCadOrderImportAsyncFactory {
      * @param reader
      */
     private void analyzePartsRoomList(JSONReader reader) {
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-        while (reader.hasNext()) {
+            throw new JSONException("期望 JSON 数组");
+        }
+        while (!reader.nextIfArrayEnd()) {
             processPartsRoom(reader);
         }
-        reader.endArray();
         orderPartBatchInsertWithinThreshold(orderPartsDOS, true);
     }
 
@@ -1427,44 +1439,48 @@ public class WebCadOrderImportAsyncFactory {
      * 处理单个房间的配件数据
      */
     private void processPartsRoom(JSONReader reader) {
-        reader.startObject();
+        if (!reader.nextIfObjectStart()) {
+            throw new JSONException("期望 JSON 对象");
+        }
         String roomName = null;
         Long roomId = null;
 
-        while (reader.hasNext()) {
+        while (!reader.nextIfObjectEnd()) {
-            String key = reader.readString();
+            String key = reader.readFieldName();
             if ("name".equals(key)) {
                 roomName = reader.readString();
                 roomId = getOrCreateRoomId(roomName);
             } else if (CHILDREN_FIELD.equals(key)) {
                 processPartsChildren(reader, roomName, roomId);
             } else {
-                reader.readObject();
+                reader.skipValue();
             }
         }
-        reader.endObject();
     }
 
     /**
      * 处理房间下的配件列表
      */
     private void processPartsChildren(JSONReader reader, String roomName, Long roomId) {
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-        while (reader.hasNext()) {
+            throw new JSONException("期望 JSON 数组");
+        }
+        while (!reader.nextIfArrayEnd()) {
             analyzePartsBodyList(reader, roomName, roomId);
         }
-        reader.endArray();
     }
 
 
     private void analyzePartsBodyList(JSONReader reader, String roomName, Long roomId) {
-        reader.startObject();
+        if (!reader.nextIfObjectStart()) {
+            throw new JSONException("期望 JSON 对象");
+        }
 
         String boxName = null;
         String roomBoxKey = null;
         Integer count = 1;
-        while (reader.hasNext()) {
+        while (!reader.nextIfObjectEnd()) {
-            String key = reader.readString();
+            String key = reader.readFieldName();
             if ("name".equals(key)) {
                 boxName = reader.readString();
 
@@ -1474,9 +1490,11 @@ public class WebCadOrderImportAsyncFactory {
 
             } else if ("objList".equals(key)) {
                 // Blocks.children.objList开始
-                reader.startArray();
+                if (!reader.nextIfArrayStart()) {
-                while (reader.hasNext()) {
+                    throw new JSONException("期望 JSON 数组");
-                    WebCadDataPartsReqVO.BlockObjectListDTO part = reader.readObject(WebCadDataPartsReqVO.BlockObjectListDTO.class);
+                }
+                while (!reader.nextIfArrayEnd()) {
+                    WebCadDataPartsReqVO.BlockObjectListDTO part = reader.read(WebCadDataPartsReqVO.BlockObjectListDTO.class);
                     // 成倍创建
                     if (ObjectUtil.isNull(count)) {
                         // 房间+柜体不在成倍缓存中, 再检查bodyMap, 再没有创建房间，缓存房间到bodyMap
@@ -1485,10 +1503,8 @@ public class WebCadOrderImportAsyncFactory {
                         multipleCreateProcessGroup(count, roomBoxKey, part);
                     }
                 }
-                reader.endArray();
             }
         }
-        reader.endObject();
     }
 
     /**
@@ -1890,13 +1906,13 @@ public class WebCadOrderImportAsyncFactory {
 
         List<OrderComponentTreeCompareVO> roots = new ArrayList<>();
 
-        reader.startArray();
+        if (!reader.nextIfArrayStart()) {
-
+            throw new JSONException("期望 JSON 数组");
-        while (reader.hasNext()) {
-            roots.add(readNode(reader));
         }
 
-        reader.endArray();
+        while (!reader.nextIfArrayEnd()) {
+            roots.add(readNode(reader));
+        }
 
         return roots;
     }
@@ -1915,16 +1931,18 @@ public class WebCadOrderImportAsyncFactory {
 
         List<OrderComponentTreeCompareVO> children = new ArrayList<>();
 
-        reader.startObject();
+        if (!reader.nextIfObjectStart()) {
+            throw new JSONException("期望 JSON 对象");
+        }
 
-        while (reader.hasNext()) {
+        while (!reader.nextIfObjectEnd()) {
 
-            String key = reader.readString();
+            String key = reader.readFieldName();
 
             switch (key) {
 
                 case "groupID":
-                    groupId = reader.readInteger();
+                    groupId = reader.readInt32();
                     break;
 
                 case "name":
@@ -1932,27 +1950,25 @@ public class WebCadOrderImportAsyncFactory {
                     break;
 
                 case "boxSize":
-                    boxSize = reader.readObject(WebCadDataComponentGroupReqVO.BoxSizeDTO.class);
+                    boxSize = reader.read(WebCadDataComponentGroupReqVO.BoxSizeDTO.class);
                     break;
 
                 case "children":
 
-                    reader.startArray();
+                    if (!reader.nextIfArrayStart()) {
-
+                        throw new JSONException("期望 JSON 数组");
-                    while (reader.hasNext()) {
-                        children.add(readNode(reader));
                     }
 
-                    reader.endArray();
+                    while (!reader.nextIfArrayEnd()) {
+                        children.add(readNode(reader));
+                    }
                     break;
 
                 default:
-                    reader.readObject();
+                    reader.skipValue();
             }
         }
 
-        reader.endObject();
-
         OrderComponentTreeCompareVO node = new OrderComponentTreeCompareVO();
         node.setId(groupId == null ? null : groupId);
         node.setName(name);

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java

@@ -8,9 +8,9 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingImportBlockRemark.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.plan.service.orderImport.producing.dto;
 
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java

@@ -9,8 +9,8 @@ import cn.hutool.core.util.URLUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.ContentType;
 import cn.hutool.http.Header;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.bstek.common.exception.ReportDesignException;
 import com.bstek.designer.bean.PreviewParameters;

cf-module-system/cf-module-system-api/pom.xml

@@ -49,8 +49,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson</artifactId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
 
         <!-- Test 测试相关 -->

cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/application/ApplicationApi.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.api.application;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/application/ApplicationApiImpl.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.system.api.application;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.module.system.dal.dataobject.application.ApplicationDO;
 import com.cf.imes.module.system.service.application.ApplicationService;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.controller.admin.label.vo;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.controller.admin.label.vo;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.controller.admin.labeltemplate.vo;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.controller.admin.labeltemplate.vo;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.system.controller.admin.machine.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.controller.admin.machine.vo;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.validation.machine.MachineTypeValid;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateRespVO.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.system.controller.admin.machine.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.controller.admin.machine.vo;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.validation.machine.MachineTypeValid;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.system.controller.admin.setting.vo;
 
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.ToString;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.convert.machine;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingSaveReqVO;
 import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineTemplateConvert.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.convert.machine;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingTemplateRespVO;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingTemplateSaveReqVO;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.system.dal.redis.oauth2;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.framework.common.util.collection.CollectionUtils;
 import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/trans/config/TransApi.java

@@ -1,9 +1,9 @@
 package com.cf.imes.module.system.framework.trans.config;
 
 import cn.hutool.core.text.UnicodeUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.cf.imes.module.system.framework.trans.core.HttpGet;
 import com.cf.imes.module.system.framework.trans.core.MD5;
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.DigestUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.enums.DeletedCodeEnum;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/customplateno/CustomPlateNoSeqServiceImpl.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.system.service.customplateno;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictDataServiceImpl.java

@@ -3,9 +3,9 @@ package com.cf.imes.module.system.service.dict;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.UnicodeUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/invoice/InvoiceServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java

@@ -1,7 +1,7 @@
 package com.cf.imes.module.system.service.machine;
 
 import cn.hutool.core.collection.CollUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.cf.imes.framework.common.enums.MachineTypeEnum;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/parser/ParserTemplateServiceImpl.java

@@ -2,7 +2,7 @@ package com.cf.imes.module.system.service.parser;
 
 
 import cn.hutool.core.collection.CollUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/alipay/AlipayPcPayHandler.java

@@ -5,7 +5,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.Method;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.AlipayTradeCloseModel;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/MenuServiceImpl.java

@@ -3,9 +3,9 @@ package com.cf.imes.module.system.service.permission;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.UnicodeUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.util.object.BeanUtils;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java

@@ -2,9 +2,9 @@ package com.cf.imes.module.system.service.systemconfig.factory.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.exception.ErrorCode;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/SealedgeServiceHandler.java

@@ -2,9 +2,9 @@ package com.cf.imes.module.system.service.systemconfig.factory.service.impl;
 
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.util.object.BeanUtils;

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAOTest.java

@@ -1,6 +1,6 @@
 package com.cf.imes.module.system.dal.redis.oauth2;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.cf.imes.framework.test.core.ut.BaseRedisUnitTest;
 import com.cf.imes.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
 import com.cf.imes.module.system.dal.redis.RedisKeyConstants;