时间转换

src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

@@ -146,7 +146,7 @@ public class ApplicationEvent {
 //            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
 //            pointService.syncParentsDivorce(initDomain(List.of(117)));
 //            pointService.syncFamilyDie(initDomain(List.of(118)));
-//            pointService.syncFatherDie(initDomain(List.of(119)));
+            pointService.syncFatherDie(initDomain(List.of(119)));
             pointService.syncMotherDie(initDomain(List.of(120)));
             pointService.syncChildNo(initDomain(List.of(121)));
             pointService.syncXIDU(initDomain(List.of(122)));

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java

@@ -48,6 +48,16 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "</script>")
     List<GBaseCSCZRK> selectFamilyDiePeople(List<String> part);
 
+    @Select("select distinct a.gmsfhm, c.gmsfhm family_id from dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code "
+            + "inner join dwd_ry_kxgxzyk_csczrk c ON a.hh = c.hh "
+            + "where a.gmsfhm != c.gmsfhm and ("
+            + "( a.mqgmsfzhm IS NULL AND a.fqgmsfzhm IS NULL ) "
+            + "OR ( a.mqgmsfzhm IS NULL AND a.fqgmsfzhm != c.gmsfhm ) "
+            + "OR ( a.fqgmsfzhm IS NULL AND a.mqgmsfzhm != c.gmsfhm ) "
+            + "OR (a.fqgmsfzhm IS NOT NULL AND a.mqgmsfzhm IS NOT NULL AND a.fqgmsfzhm != c.gmsfhm AND a.mqgmsfzhm != c.gmsfhm) "
+            + ")")
+    List<GBaseCSCZRK> selectFamilyPeople();
+
     // 父亲是否健在
     @Select("<script>"
             + "select distinct gmsfhm from dwd_ry_kxgxzyk_csczrk where fqgmsfzhm in "

src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseCSCZRK.java

@@ -88,4 +88,7 @@ public class GBaseCSCZRK implements Serializable {
     // 打分（通用SQL计算结果）
     @TableField("score")
     Integer score;
+
+    @TableField(exist = false, value = "family_id")
+    String familyId;
 }

src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseJJD.java

@@ -2,6 +2,7 @@ package com.biutag.supervisiondata.pojo.entity.dwd;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -69,6 +70,7 @@ public class GBaseJJD implements Serializable {
     /**
      * 报警时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     @TableField("bjsj")
     private Date bjsj;
 }

src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseJszxxb.java

@@ -2,6 +2,7 @@ package com.biutag.supervisiondata.pojo.entity.dwd;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -33,11 +34,13 @@ public class GBaseJszxxb implements Serializable {
     /**
      * 有效期始
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     @TableField("yxqs")
     Date yxqs;
     /**
      * 有效期止
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     @TableField("yxqz")
     Date yxqz;