Merge branch 'feature' into 'release'

2024/12/03 分支版本恢复

See merge request !149

middleware-automatic-center-client/pom.xml

@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>middleware-automatic-center-client</artifactId>
-    <version>1.0.0.7-SNAPSHOT</version>
+    <version>${automatic.version}</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/pojo/CidRecord.java → middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/pojo/CidRecordData.java

 package com.zhiwei.middleware.automatic.server.pojo;
 
-public class CidRecord {
-
+public class CidRecordData {
     private String id;
 
     private Long c4;
@@ -101,20 +100,4 @@ public class CidRecord {
     public void setCid(Long cid) {
         this.cid = cid;
     }
-
-    @Override
-    public String toString() {
-        return "CidRecord{" +
-                "id='" + id + '\'' +
-                ", c4=" + c4 +
-                ", c5=" + c5 +
-                ", foreign=" + foreign +
-                ", url='" + url + '\'' +
-                ", time=" + time +
-                ", ctime=" + ctime +
-                ", stime=" + stime +
-                ", esId='" + esId + '\'' +
-                ", cid=" + cid +
-                ",version=20241201}";
-    }
 }

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/pojo/CidRecord.java → middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/pojo/CidRecordInfo.java

-package com.zhiwei.middleware.automatic.son.pojo;
+package com.zhiwei.middleware.automatic.server.pojo;
 
-public class CidRecord {
+public class CidRecordInfo {
 
     private String id;
 
@@ -101,20 +101,4 @@ public class CidRecord {
     public void setCid(Long cid) {
         this.cid = cid;
     }
-
-    @Override
-    public String toString() {
-        return "CidRecord{" +
-                "id='" + id + '\'' +
-                ", c4=" + c4 +
-                ", c5=" + c5 +
-                ", foreign=" + foreign +
-                ", url='" + url + '\'' +
-                ", time=" + time +
-                ", ctime=" + ctime +
-                ", stime=" + stime +
-                ", esId='" + esId + '\'' +
-                ", cid=" + cid +
-                '}';
-    }
 }

middleware-automatic-center-son/pom.xml

@@ -28,7 +28,6 @@
         <filter.version>1.1.6-SNAPSHOT</filter.version>
         <nlp-aggree.version>0.0.5-SNAPSHOT</nlp-aggree.version>
         <dubbo-server.version>2.7.4.1</dubbo-server.version>
-        <automatic.client.version>1.0.0.7-SNAPSHOT</automatic.client.version>
     </properties>
 
 

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/dao/CidRecordDao.java

 package com.zhiwei.middleware.automatic.son.dao;
 
-import com.zhiwei.middleware.automatic.son.pojo.CidRecord;
+import com.zhiwei.middleware.automatic.server.pojo.CidRecordData;
 
 public interface CidRecordDao {
 
-    void insert(CidRecord cidRecord);
+    void insert(CidRecordData cidRecord);
 }

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/dao/impl/CidRecordDaoImpl.java

 package com.zhiwei.middleware.automatic.son.dao.impl;
 
-import com.zhiwei.middleware.automatic.son.pojo.CidRecord;
+import com.zhiwei.middleware.automatic.server.pojo.CidRecordData;
 import com.zhiwei.middleware.automatic.son.dao.CidRecordDao;
 import com.zhiwei.middleware.automatic.son.util.Tools;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -19,7 +19,7 @@ public class CidRecordDaoImpl implements CidRecordDao {
     }
 
     @Override
-    public void insert(CidRecord cidRecord) {
+    public void insert(CidRecordData cidRecord) {
         mongoTemplate.insert(cidRecord, COLLECTION_NAME + Tools.TIME_FORMAT_COMMON.format(cidRecord.getStime()));
     }
 }

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceCidRecord.java

@@ -3,10 +3,10 @@ package com.zhiwei.middleware.automatic.son.task.service;
 import com.alibaba.excel.util.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.middleware.automatic.server.pojo.AutoTask;
+import com.zhiwei.middleware.automatic.server.pojo.CidRecordData;
 import com.zhiwei.middleware.automatic.server.pojo.enums.TaskType;
 import com.zhiwei.middleware.automatic.server.util.RedissonUtil;
 import com.zhiwei.middleware.automatic.son.dao.CidRecordDao;
-import com.zhiwei.middleware.automatic.son.pojo.CidRecord;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -41,11 +41,10 @@ public class TaskServiceCidRecord extends AbstractTaskService {
             }
             for (String s : data) {
                 try {
-                    CidRecord cidRecord = JSONObject.parseObject(s, CidRecord.class);
+                    CidRecordData cidRecord = JSONObject.parseObject(s, CidRecordData.class);
                     if (!test) {
                         test = true;
-                        com.zhiwei.middleware.automatic.server.pojo.CidRecord record = JSONObject.parseObject(s, com.zhiwei.middleware.automatic.server.pojo.CidRecord.class);
-                        log.info("日志打印，源数据：{}，实体：{},version:{}", s, JSONObject.toJSONString(record), record.toString());
+                        log.info("日志打印，源数据：{}，实体：{}", s, JSONObject.toJSONString(cidRecord));
                     }
                     cidRecordDao.insert(cidRecord);
                 } catch (Exception e) {