From 30da4e2a5c39684e102c00dd803d52045f384b0a Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Wed, 4 Dec 2024 16:19:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/wdpc/WdpcGrjdXfsjCsMapper.java | 12 +++++++++++ .../mapper/wdpc/WdpcGrjdXfsjMapper.java | 12 +++++++++++ .../pojo/entity/wdpc/WdpcGrjdXfsj.java | 20 +++++++++++++++++++ .../pojo/entity/wdpc/WdpcGrjdXfsjCs.java | 20 +++++++++++++++++++ .../pojo/entity/wdpc/WdpcJJDAi.java | 5 +++++ .../repository/WdpcGrjdXfsjCsRepository.java | 15 ++++++++++++++ .../repository/WdpcGrjdXfsjRepository.java | 15 ++++++++++++++ .../supervisiondata/rest/ApiController.java | 6 ++++-- 8 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java create mode 100644 src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java create mode 100644 src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsj.java create mode 100644 src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsjCs.java create mode 100644 src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjCsRepository.java create mode 100644 src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjRepository.java diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java new file mode 100644 index 0000000..dbeda52 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java @@ -0,0 +1,12 @@ +package com.biutag.supervisiondata.mapper.wdpc; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsjCs; + +/** + * @author kami on 2024-12-03 16:47:43 + * @version 0.0.1 + * @since 1.8 + */ +public interface WdpcGrjdXfsjCsMapper extends BaseMapper { +} diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java new file mode 100644 index 0000000..de1c512 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java @@ -0,0 +1,12 @@ +package com.biutag.supervisiondata.mapper.wdpc; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj; + +/** + * @author kami on 2024-12-03 16:47:43 + * @version 0.0.1 + * @since 1.8 + */ +public interface WdpcGrjdXfsjMapper extends BaseMapper { +} diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsj.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsj.java new file mode 100644 index 0000000..62569d7 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsj.java @@ -0,0 +1,20 @@ +package com.biutag.supervisiondata.pojo.entity.wdpc; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @author kami on 2024-12-04 16:16:01 + * @version 0.0.1 + * @since 1.8 + */ +@Data +@TableName("`wdpc_grjd_xfsj`") +public class WdpcGrjdXfsj { + + @TableField("`name`") + String name; + @TableField("`id_code`") + String idCode; +} diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsjCs.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsjCs.java new file mode 100644 index 0000000..974ea62 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdXfsjCs.java @@ -0,0 +1,20 @@ +package com.biutag.supervisiondata.pojo.entity.wdpc; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @author kami on 2024-12-04 16:16:01 + * @version 0.0.1 + * @since 1.8 + */ +@Data +@TableName("`wdpc_grjd_xfsj_cs`") +public class WdpcGrjdXfsjCs { + + @TableField("`name`") + String name; + @TableField("`id_code`") + String idCode; +} diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcJJDAi.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcJJDAi.java index 9d53eed..32e9ec9 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcJJDAi.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcJJDAi.java @@ -34,6 +34,11 @@ public class WdpcJJDAi { @TableField("bjsj") Date bjsj; + @TableField("id_codes") + String idCodes; + @TableField("mobiles") + String mobiles; + @TableField("syrk_name") String syrkName; @TableField("syrk_id_code") diff --git a/src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjCsRepository.java b/src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjCsRepository.java new file mode 100644 index 0000000..8fdef23 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjCsRepository.java @@ -0,0 +1,15 @@ +package com.biutag.supervisiondata.repository; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervisiondata.mapper.wdpc.WdpcGrjdXfsjCsMapper; +import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsjCs; +import org.springframework.stereotype.Service; + +/** + * @author kami on 2024-12-04 16:18:26 + * @version 0.0.1 + * @since 1.8 + */ +@Service +public class WdpcGrjdXfsjCsRepository extends ServiceImpl { +} diff --git a/src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjRepository.java b/src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjRepository.java new file mode 100644 index 0000000..e8af222 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/repository/WdpcGrjdXfsjRepository.java @@ -0,0 +1,15 @@ +package com.biutag.supervisiondata.repository; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervisiondata.mapper.wdpc.WdpcGrjdXfsjMapper; +import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj; +import org.springframework.stereotype.Service; + +/** + * @author kami on 2024-12-04 16:18:26 + * @version 0.0.1 + * @since 1.8 + */ +@Service +public class WdpcGrjdXfsjRepository extends ServiceImpl { +} diff --git a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java index 28075e3..fd164b2 100644 --- a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java +++ b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java @@ -68,13 +68,13 @@ public class ApiController { JSONObject obj = JSON.parseObject(data); List mobiles = obj.getList("mobiles", String.class); List idCodes = obj.getList("idCodes", String.class); - return String.format(Prompt.CONTENT, obj.getString("name"), + return JSONObject.of("id", obj.getString("id"), "data", String.format(Prompt.CONTENT, obj.getString("name"), obj.getString("idCode"), obj.getString("mobile"), String.join(",", mobiles), String.join(",", idCodes), obj.getString("bjnr"), - obj.getString("cjqk")); + obj.getString("cjqk"))).toJSONString(); } private final GBaseSYRKXXRepository repository; @@ -114,6 +114,8 @@ public class ApiController { ai.setName(Optional.ofNullable(obj.getString("name")).orElse("")); ai.setIdCode(Optional.ofNullable(obj.getString("idCode")).orElse("")); ai.setReason(obj.getString("reason")); + ai.setIdCodes(String.join(",",obj.getList("idCodes", String.class))); + ai.setMobiles(String.join(",",obj.getList("mobiles", String.class))); if(!ai.getIdCode().isEmpty() && !ai.getIdCode().equals("暂无")) { idCodes.add(ai.getIdCode()); }