cc 4 months ago
parent
commit
4d4b775575

+ 2 - 1
.claude/settings.local.json

@@ -16,7 +16,8 @@
       "mcp__idea__search_file",
       "WebSearch",
       "Bash(mvn compile *)",
-      "Bash(sort -t\\\\\\( -k2 -n)"
+      "Bash(sort -t\\\\\\( -k2 -n)",
+      "Bash(python3)"
     ]
   }
 }

+ 27 - 6
src/main/java/com/qingjian/common/model/external/entity/CertInfo.java

@@ -2,14 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 出入境证件信息
@@ -32,7 +33,7 @@ public class CertInfo extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 证件类型
@@ -86,23 +87,43 @@ public class CertInfo extends Cleaned implements Serializable {
      * 签发日期
      */
     @TableField("issDate")
-    private LocalDate issDate;
+    private String issDate;
 
     /**
      * 截止日期
      */
     @TableField("expDate")
-    private LocalDate expDate;
+    private String expDate;
 
     /**
      * 入库时间
      */
     @TableField("storeTime")
-    private LocalDateTime storeTime;
+    private String storeTime;
 
     /**
      * 照片
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        cid
+                , birth
+                , certType
+                , certNo
+                , bplace
+                , regAddr
+                , pcs
+                , dplace
+                , issOrg
+                , exitReason
+                , issDate
+                , expDate
+                , storeTime
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 35 - 4
src/main/java/com/qingjian/common/model/external/entity/CoResident.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 同住址
@@ -37,7 +39,7 @@ public class CoResident extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 身份证号
@@ -73,7 +75,7 @@ public class CoResident extends Cleaned implements Serializable {
      * 年龄
      */
     @TableField("age")
-    private Integer age;
+    private String age;
 
     /**
      * 身高
@@ -151,11 +153,40 @@ public class CoResident extends Cleaned implements Serializable {
      * 死亡日期
      */
     @TableField("deathDate")
-    private LocalDate deathDate;
+    private String deathDate;
 
     /**
      * 照片
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        name
+                , gender
+                , birth
+                , cid
+                , ethnicity
+                , origin
+                , regAddr
+                , aka
+                , age
+                , height
+                , job
+                , edu
+                , status
+                , originCountry
+                , company
+                , relation
+                , regDist
+                , birthCountry
+                , birthDist
+                , milStatus
+                , marital
+                , deathDate
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 15 - 1
src/main/java/com/qingjian/common/model/external/entity/CoVehViol.java

@@ -2,12 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 同车违章
@@ -42,11 +45,22 @@ public class CoVehViol extends Cleaned implements Serializable {
      * 同次数
      */
     @TableField("coCount")
-    private Integer coCount;
+    private String coCount;
 
     /**
      * 照片
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        name
+                , cid
+                , plateNo
+                , coCount
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 40 - 4
src/main/java/com/qingjian/common/model/external/entity/Criminal.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 违法犯罪人员信息
@@ -55,7 +57,7 @@ public class Criminal extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 身高
@@ -133,7 +135,7 @@ public class Criminal extends Cleaned implements Serializable {
      * 抓获/入所日期
      */
     @TableField("catchDate")
-    private LocalDate catchDate;
+    private String catchDate;
 
     /**
      * 刑期
@@ -145,7 +147,7 @@ public class Criminal extends Cleaned implements Serializable {
      * 出所日期
      */
     @TableField("outDate")
-    private LocalDate outDate;
+    private String outDate;
 
     /**
      * 出所去向
@@ -188,4 +190,38 @@ public class Criminal extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        name
+                , alias
+                , gender
+                , cid
+                , ethnicity
+                , birth
+                , height
+                , footLen
+                , edu
+                , regDist
+                , bodyMark
+                , skill
+                , identity
+                , caseType
+                , caseBrief
+                , result
+                , unit
+                , docNo
+                , catchDate
+                , sentence
+                , outDate
+                , outTo
+                , outReason
+                , inReason
+                , regDetail
+                , curAddr
+                , remark
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 26 - 3
src/main/java/com/qingjian/common/model/external/entity/EntryRec.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 出入境记录信息
@@ -61,13 +63,13 @@ public class EntryRec extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 出入日期
      */
     @TableField("ioDate")
-    private LocalDate ioDate;
+    private String ioDate;
 
     /**
      * 出入时间
@@ -110,4 +112,25 @@ public class EntryRec extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        certType
+                , certNo
+                , gender
+                , nation
+                , visaType
+                , cid
+                , birth
+                , ioDate
+                , ioTime
+                , port
+                , transport
+                , vehicle
+                , visaNo
+                , country
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 52 - 3
src/main/java/com/qingjian/common/model/external/entity/FugiCo.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 在逃同案人员
@@ -37,7 +39,7 @@ public class FugiCo extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 证件号码
@@ -157,7 +159,7 @@ public class FugiCo extends Cleaned implements Serializable {
      * 立案日期
      */
     @TableField("caseDate")
-    private LocalDate caseDate;
+    private String caseDate;
 
     /**
      * 立案单位分类
@@ -266,4 +268,51 @@ public class FugiCo extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        name
+                , gender
+                , birth
+                , certNo
+                , ethnicity
+                , origin
+                , regAddr
+                , warrantNo
+                , fugiNo
+                , caseNo
+                , regName
+                , regPerson
+                , regOrg
+                , regTime
+                , approveTime
+                , rejectReason
+                , heightMax
+                , heightMin
+                , regDist
+                , accent
+                , fprintNo
+                , bounty
+                , caseDate
+                , caseUnitType
+                , caseUnit
+                , officer
+                , mainUnitType
+                , mainOrg
+                , phone
+                , caseBrief
+                , curDist
+                , curAddr
+                , caseType
+                , huntLevel
+                , jobType
+                , personType
+                , modTime
+                , dnaNo
+                , fleeTime
+                , fleeDir
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 61 - 4
src/main/java/com/qingjian/common/model/external/entity/FugiCoRevoke.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 在逃同案撤销人员
@@ -37,7 +39,7 @@ public class FugiCoRevoke extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 证件号码
@@ -175,7 +177,7 @@ public class FugiCoRevoke extends Cleaned implements Serializable {
      * 立案日期
      */
     @TableField("caseDate")
-    private LocalDate caseDate;
+    private String caseDate;
 
     /**
      * 立案单位分类
@@ -277,7 +279,7 @@ public class FugiCoRevoke extends Cleaned implements Serializable {
      * 抓获日期
      */
     @TableField("catchDate")
-    private LocalDate catchDate;
+    private String catchDate;
 
     /**
      * 抓获方式
@@ -314,4 +316,59 @@ public class FugiCoRevoke extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        name
+                , gender
+                , birth
+                , certNo
+                , ethnicity
+                , origin
+                , regAddr
+                , revokeTime
+                , revokeProcTime
+                , revokeName
+                , warrantNo
+                , fugiNo
+                , caseNo
+                , regName
+                , regPerson
+                , regOrg
+                , regTime
+                , approveTime
+                , rejectReason
+                , heightMax
+                , heightMin
+                , regDist
+                , accent
+                , fprintNo
+                , bounty
+                , caseDate
+                , caseUnitType
+                , caseUnit
+                , officer
+                , mainUnitType
+                , mainUnit
+                , phone
+                , curDist
+                , fleeTime
+                , curAddr
+                , caseType
+                , huntLevel
+                , jobType
+                , personType
+                , modTime
+                , dnaNo
+                , revokeApprover
+                , catchDate
+                , catchWay
+                , catchUnit
+                , catchPlace
+                , fleeDir
+                , caseBrief
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 57 - 4
src/main/java/com/qingjian/common/model/external/entity/FugiRevoke.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 在逃人员撤销信息
@@ -48,7 +50,7 @@ public class FugiRevoke extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 籍贯
@@ -150,7 +152,7 @@ public class FugiRevoke extends Cleaned implements Serializable {
      * 立案日期
      */
     @TableField("caseDate")
-    private LocalDate caseDate;
+    private String caseDate;
 
     /**
      * 抓逃奖金
@@ -162,7 +164,7 @@ public class FugiRevoke extends Cleaned implements Serializable {
      * 抓获日期
      */
     @TableField("catchDate")
-    private LocalDate catchDate;
+    private String catchDate;
 
     /**
      * 抓获地点区划
@@ -289,4 +291,55 @@ public class FugiRevoke extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        name
+                , gender
+                , ethnicity
+                , certNo
+                , birth
+                , origin
+                , heightMax
+                , heightMin
+                , fugiNo
+                , personType
+                , jobType
+                , accent
+                , fprintNo
+                , dnaNo
+                , warrantNo
+                , caseNo
+                , caseType
+                , fleeTime
+                , fleeDir
+                , caseUnitType
+                , caseUnit
+                , caseDate
+                , bounty
+                , catchDate
+                , catchDist
+                , catchWay
+                , catchUnit
+                , regName
+                , regTime
+                , regOrg
+                , revokeName
+                , revokeTime
+                , revokeApprover
+                , mainUnitType
+                , mainUnit
+                , officer
+                , phone
+                , catchDistCode
+                , code
+                , regDist
+                , regAddr
+                , curDist
+                , curAddr
+                , caseBrief
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 49 - 3
src/main/java/com/qingjian/common/model/external/entity/Fugitive.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 在逃人员登记信息
@@ -48,7 +50,7 @@ public class Fugitive extends Cleaned implements Serializable {
      * 出生日期
      */
     @TableField("birth")
-    private LocalDate birth;
+    private String birth;
 
     /**
      * 职业类别
@@ -138,7 +140,7 @@ public class Fugitive extends Cleaned implements Serializable {
      * 立案日期
      */
     @TableField("caseDate")
-    private LocalDate caseDate;
+    private String caseDate;
 
     /**
      * 督捕级别
@@ -247,4 +249,48 @@ public class Fugitive extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        name
+                , gender
+                , ethnicity
+                , certNo
+                , birth
+                , jobType
+                , heightMax
+                , heightMin
+                , accent
+                , fugiNo
+                , personType
+                , fprintNo
+                , dnaNo
+                , fleeTime
+                , warrantNo
+                , caseNo
+                , caseType
+                , caseUnitType
+                , caseUnit
+                , caseDate
+                , huntLevel
+                , bounty
+                , regName
+                , regTime
+                , modTime
+                , mainUnitType
+                , officer
+                , phone
+                , regOrg
+                , mainOrg
+                , regDist
+                , regAddr
+                , curDist
+                , curAddr
+                , origin
+                , fleeDir
+                , caseBrief
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 26 - 3
src/main/java/com/qingjian/common/model/external/entity/Household.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 同户人
@@ -24,7 +26,7 @@ public class Household extends Cleaned implements Serializable {
      * 年龄
      */
     @TableField("age")
-    private Integer age;
+    private String age;
 
     /**
      * 身高
@@ -102,11 +104,32 @@ public class Household extends Cleaned implements Serializable {
      * 死亡日期
      */
     @TableField("deathDate")
-    private LocalDate deathDate;
+    private String deathDate;
 
     /**
      * 照片
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        age
+                , height
+                , job
+                , edu
+                , status
+                , originCountry
+                , company
+                , relation
+                , regDist
+                , birthCountry
+                , birthDist
+                , milStatus
+                , marital
+                , deathDate
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 26 - 4
src/main/java/com/qingjian/common/model/external/entity/LicInfo.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 驾驶证信息
@@ -30,7 +32,7 @@ public class LicInfo extends Cleaned implements Serializable {
      * 初次领证日期
      */
     @TableField("firstDate")
-    private LocalDate firstDate;
+    private String firstDate;
 
     /**
      * 暂住证编号
@@ -72,13 +74,13 @@ public class LicInfo extends Cleaned implements Serializable {
      * 驾驶证超分日期
      */
     @TableField("overScoreDate")
-    private LocalDate overScoreDate;
+    private String overScoreDate;
 
     /**
      * 累积记分
      */
     @TableField("score")
-    private Integer score;
+    private String score;
 
     /**
      * 登记住所详址
@@ -103,4 +105,24 @@ public class LicInfo extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        nation
+                , firstDate
+                , tmpResNo
+                , vehType
+                , origType
+                , issOrg
+                , licTerm
+                , status
+                , overScoreDate
+                , score
+                , regAddr
+                , fileNo
+                , contactAddr
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 19 - 0
src/main/java/com/qingjian/common/model/external/entity/VehViolation.java

@@ -2,12 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 机动车违章信息
@@ -79,4 +82,20 @@ public class VehViolation extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        person
+                , licNo
+                , plateType
+                , plateNo
+                , violTime
+                , violAddr
+                , dealTime
+                , dealOrg
+                , violAct
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }

+ 21 - 3
src/main/java/com/qingjian/common/model/external/entity/VehicleInfo.java

@@ -2,13 +2,15 @@ package com.qingjian.common.model.external.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.qingjian.common.base.Cleaned;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 机动车信息
@@ -54,13 +56,13 @@ public class VehicleInfo extends Cleaned implements Serializable {
      * 机动车核定载客人数
      */
     @TableField("seatCnt")
-    private Integer seatCnt;
+    private String seatCnt;
 
     /**
      * 出厂日期
      */
     @TableField("madeDate")
-    private LocalDate madeDate;
+    private String madeDate;
 
     /**
      * 住所地址
@@ -79,4 +81,20 @@ public class VehicleInfo extends Cleaned implements Serializable {
      */
     @TableField("photo")
     private String photo;
+
+    public String str() {
+        List<String> list = Lists.newArrayList(
+        engModel
+                , fuelType
+                , engCc
+                , engPwr
+                , loadCap
+                , seatCnt
+                , madeDate
+                , addr
+                , tmpAddr
+                , photo
+        );
+        return Joiner.on("\u001F").skipNulls().join(list);
+    }
 }