Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/util/ServiceExceptionUtil.java

@@ -3,7 +3,6 @@ package com.cf.imes.framework.common.exception.util;
 import com.cf.imes.framework.common.exception.ErrorCode;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants;
-import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
@@ -95,7 +94,6 @@ public class ServiceExceptionUtil {
      * @param params         参数
      * @return 格式化后的提示
      */
-    @VisibleForTesting
     public static String doFormat(int code, String messagePattern, Object... params) {
         StringBuilder sbuf = new StringBuilder(messagePattern.length() + 50);
         int i = 0;

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/pojo/CommonResult.java

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.springframework.util.Assert;
 
+import java.io.IOException;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;
 
@@ -109,4 +111,19 @@ public class CommonResult<T> implements Serializable {
         return error(serviceException.getCode(), serviceException.getMessage());
     }
 
+
+    @Serial
+    private void writeObject(java.io.ObjectOutputStream stream)
+            throws IOException {
+        stream.defaultWriteObject();
+    }
+
+    @Serial
+    private void readObject(java.io.ObjectInputStream stream)
+            throws IOException, ClassNotFoundException {
+        stream.defaultReadObject();
+    }
+
+
+
 }

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/pojo/PageResult.java

@@ -3,6 +3,8 @@ package com.cf.imes.framework.common.pojo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.IOException;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,4 +42,16 @@ public final class PageResult<T> implements Serializable {
         return new PageResult<>(total);
     }
 
+    @Serial
+    private void writeObject(java.io.ObjectOutputStream stream)
+            throws IOException {
+        stream.defaultWriteObject();
+    }
+
+    @Serial
+    private void readObject(java.io.ObjectInputStream stream)
+            throws IOException, ClassNotFoundException {
+        stream.defaultReadObject();
+    }
+
 }

cf-framework/cf-spring-boot-starter-biz-data-permission/src/main/java/com/cf/imes/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java

@@ -9,6 +9,9 @@ import org.springframework.aop.support.AbstractPointcutAdvisor;
 import org.springframework.aop.support.ComposablePointcut;
 import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
 
+import java.io.IOException;
+import java.io.Serial;
+
 /**
  * {@link DataPermission} 注解的 Advisor 实现类
  *
@@ -33,4 +36,18 @@ public class DataPermissionAnnotationAdvisor extends AbstractPointcutAdvisor {
         return new ComposablePointcut(classPointcut).union(methodPointcut);
     }
 
+
+    @Serial
+    private void writeObject(java.io.ObjectOutputStream stream)
+            throws IOException {
+        stream.defaultWriteObject();
+    }
+
+    @Serial
+    private void readObject(java.io.ObjectInputStream stream)
+            throws IOException, ClassNotFoundException {
+        stream.defaultReadObject();
+    }
+
+
 }

cf-framework/cf-spring-boot-starter-biz-organ/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java

@@ -260,10 +260,6 @@ public class InvocableHandlerMethod extends HandlerMethod {
             return this.returnType.getType();
         }
 
-        @Override
-        public AsyncResultMethodParameter clone() {
-            return new AsyncResultMethodParameter(this);
-        }
     }
 
 }

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

@@ -1,13 +1,17 @@
 package com.cf.imes.module.executor.controller.admin.plan.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author Beal
  */
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class Point {
     private Double x;
     private Double y;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/logger/OperateLogDO.java

@@ -1,17 +1,19 @@
 package com.cf.imes.module.system.dal.dataobject.logger;
 
-import com.cf.imes.framework.common.enums.UserTypeEnum;
-import com.cf.imes.framework.common.pojo.CommonResult;
-import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
-import com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.cf.imes.framework.common.enums.UserTypeEnum;
+import com.cf.imes.framework.common.pojo.CommonResult;
+import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
+import com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.IOException;
+import java.io.Serial;
 import java.time.LocalDateTime;
 import java.util.Map;
 
@@ -141,4 +143,17 @@ public class OperateLogDO extends BaseDO {
      */
     private String resultData;
 
+
+    @Serial
+    private void writeObject(java.io.ObjectOutputStream stream)
+            throws IOException {
+        stream.defaultWriteObject();
+    }
+
+    @Serial
+    private void readObject(java.io.ObjectInputStream stream)
+            throws IOException, ClassNotFoundException {
+        stream.defaultReadObject();
+    }
+
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/mail/MailLogDO.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
+import java.io.IOException;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Map;
@@ -118,4 +120,18 @@ public class MailLogDO extends BaseDO implements Serializable {
      */
     private String sendException;
 
+
+    @Serial
+    private void writeObject(java.io.ObjectOutputStream stream)
+            throws IOException {
+        stream.defaultWriteObject();
+    }
+
+    @Serial
+    private void readObject(java.io.ObjectInputStream stream)
+            throws IOException, ClassNotFoundException {
+        stream.defaultReadObject();
+    }
+
+
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/notify/NotifyMessageDO.java

@@ -1,15 +1,17 @@
 package com.cf.imes.module.system.dal.dataobject.notify;
 
-import com.cf.imes.framework.common.enums.UserTypeEnum;
-import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.cf.imes.framework.common.enums.UserTypeEnum;
+import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 
+import java.io.IOException;
+import java.io.Serial;
 import java.time.LocalDateTime;
 import java.util.Map;
 
@@ -99,4 +101,18 @@ public class NotifyMessageDO extends BaseDO {
     @Transient
     private LocalDateTime readTime;
 
+
+    @Serial
+    private void writeObject(java.io.ObjectOutputStream stream)
+            throws IOException {
+        stream.defaultWriteObject();
+    }
+
+    @Serial
+    private void readObject(java.io.ObjectInputStream stream)
+            throws IOException, ClassNotFoundException {
+        stream.defaultReadObject();
+    }
+
+
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/sms/SmsLogDO.java

@@ -1,15 +1,17 @@
 package com.cf.imes.module.system.dal.dataobject.sms;
 
-import com.cf.imes.framework.common.enums.UserTypeEnum;
-import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
-import com.cf.imes.module.system.enums.sms.SmsReceiveStatusEnum;
-import com.cf.imes.module.system.enums.sms.SmsSendStatusEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.cf.imes.framework.common.enums.UserTypeEnum;
+import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
+import com.cf.imes.module.system.enums.sms.SmsReceiveStatusEnum;
+import com.cf.imes.module.system.enums.sms.SmsSendStatusEnum;
 import lombok.*;
 
+import java.io.IOException;
+import java.io.Serial;
 import java.time.LocalDateTime;
 import java.util.Map;
 
@@ -158,4 +160,18 @@ public class SmsLogDO extends BaseDO {
      */
     private String apiReceiveMsg;
 
+
+    @Serial
+    private void writeObject(java.io.ObjectOutputStream stream)
+            throws IOException {
+        stream.defaultWriteObject();
+    }
+
+    @Serial
+    private void readObject(java.io.ObjectInputStream stream)
+            throws IOException, ClassNotFoundException {
+        stream.defaultReadObject();
+    }
+
+
 }