From 2a6d60e08c8bc3247b8874809d009c8bb9f40b62 Mon Sep 17 00:00:00 2001 From: zhangjing <924187658@qq.com> Date: Thu, 26 Mar 2026 12:17:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E5=8F=B8=E6=B3=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fkzy/warn/common/util/Demo.java | 6 +-- .../com/fkzy/warn/common/util/LawResearchUtil.java | 14 ++++--- src/main/java/com/fkzy/warn/model/AlarmCase.java | 11 +++++ src/main/java/com/fkzy/warn/model/CaseTree.java | 5 +++ src/main/java/com/fkzy/warn/model/LawCase.java | 49 ++++++++++++++++++++++ .../java/com/fkzy/warn/model/LitigantInfo.java | 4 ++ .../warn/service/impl/AlarmCaseServiceImpl.java | 2 +- .../fkzy/warn/service/impl/LawCaseServiceImpl.java | 1 + .../warn/service/impl/MonitorUsersServiceImpl.java | 10 +++-- 9 files changed, 90 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/fkzy/warn/common/util/Demo.java b/src/main/java/com/fkzy/warn/common/util/Demo.java index 8a35718..4527f7b 100644 --- a/src/main/java/com/fkzy/warn/common/util/Demo.java +++ b/src/main/java/com/fkzy/warn/common/util/Demo.java @@ -23,13 +23,13 @@ import java.util.*; public class Demo { public static void main(String[] args) { LawResearchUtil law = new LawResearchUtil(); -// law.querySxx(null, null); + law.querySxx("河南省资源环境调查五院", "12410000415802064U",null); // law.queryDishonest(null, null,null,null); // law.queryLimitConsumption(null, null,null,null); - law.monitorQuery(null, null); +// law.monitorQuery(null, null); // law.delcompany(null); // law.queryMonitorCases(null,null,null); -// law.addpublic(null); + law.addpublic(null); } diff --git a/src/main/java/com/fkzy/warn/common/util/LawResearchUtil.java b/src/main/java/com/fkzy/warn/common/util/LawResearchUtil.java index d128f56..d5a101d 100644 --- a/src/main/java/com/fkzy/warn/common/util/LawResearchUtil.java +++ b/src/main/java/com/fkzy/warn/common/util/LawResearchUtil.java @@ -65,7 +65,7 @@ public class LawResearchUtil { ); } //-------------------------------新接口-------------------- - public static InvocationRecord querySxx(String name, String creditCode) { + public static InvocationRecord querySxx(String name, String creditCode,String id) { //默认测试数据 if (name == null) { @@ -88,8 +88,12 @@ public class LawResearchUtil { JSONArray array = new JSONArray(); JSONObject jsonObject = new JSONObject(); jsonObject.put("name", name); -// jsonObject.put("creditCode", creditCode); - jsonObject.put("id", creditCode); + if (creditCode!=null){ + jsonObject.put("creditCode", creditCode); + } + if (id!=null){ + jsonObject.put("id", id); + } jsonObject.put("authorize", 1); array.add(jsonObject); return getData(LawResearchUrlConstants.BASE_URL + LawResearchUrlConstants.QUERY_SXX, @@ -742,7 +746,7 @@ public class LawResearchUtil { * @author zhangjing * @create 2024/9/19 **/ - public InvocationRecord addpublic(String name) { + public static InvocationRecord addpublic(String name) { //默认测试数据 if (name == null) { name = "丰县城市建设投资集团有限公司"; @@ -824,7 +828,7 @@ public class LawResearchUtil { //默认测试数据 if (queryDate == null) { // queryDate="2022-07-06"; - queryDate="2026-02-08"; + queryDate="2026-03-19"; // pageIndex = 1; // pageSize = 20; } diff --git a/src/main/java/com/fkzy/warn/model/AlarmCase.java b/src/main/java/com/fkzy/warn/model/AlarmCase.java index 0c9b9ec..a3f0068 100644 --- a/src/main/java/com/fkzy/warn/model/AlarmCase.java +++ b/src/main/java/com/fkzy/warn/model/AlarmCase.java @@ -1,6 +1,8 @@ package com.fkzy.warn.model; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +27,16 @@ public class AlarmCase extends BaseField{ * 案件标识 */ @ApiModelProperty("案件标识") + @JSONField(name = "n_ajbs") private String nAjbs; + + /** + * 案号 + */ + @ApiModelProperty("案号") + @TableField(value = "c_ah") + @JSONField(name = "c_ah") + private String cAh; /** * 企业名称 */ diff --git a/src/main/java/com/fkzy/warn/model/CaseTree.java b/src/main/java/com/fkzy/warn/model/CaseTree.java index 09bf76e..88e1cf4 100644 --- a/src/main/java/com/fkzy/warn/model/CaseTree.java +++ b/src/main/java/com/fkzy/warn/model/CaseTree.java @@ -1,5 +1,6 @@ package com.fkzy.warn.model; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -21,12 +22,14 @@ public class CaseTree extends BaseField{ */ @ApiModelProperty("ae0920edfe2a79216526fd45eaada6b8") @TableId(value = "n_ajbs",type = IdType.INPUT) + @JSONField(name = "n_ajbs") private String nAjbs; /** * */ @ApiModelProperty("1") @TableField(value = "stage_type") + @JSONField(name = "stage_type") private String stageType; /** @@ -34,12 +37,14 @@ public class CaseTree extends BaseField{ */ @ApiModelProperty("400") @TableField(value = "case_type") + @JSONField(name = "case_type") private String caseType; /** * */ @ApiModelProperty("(2018)京73行初3426号") @TableField(value = "c_ah") + @JSONField(name = "c_ah") private String cAh; /** diff --git a/src/main/java/com/fkzy/warn/model/LawCase.java b/src/main/java/com/fkzy/warn/model/LawCase.java index 1e3582f..b91e606 100644 --- a/src/main/java/com/fkzy/warn/model/LawCase.java +++ b/src/main/java/com/fkzy/warn/model/LawCase.java @@ -1,5 +1,6 @@ package com.fkzy.warn.model; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -26,6 +27,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("案件标识") @TableId(value = "n_ajbs", type = IdType.INPUT) + @JSONField(name = "n_ajbs") private String nAjbs; /** @@ -33,6 +35,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("案件唯一 ID") @TableField(value = "c_id") + @JSONField(name = "c_id") private String cId; /** @@ -40,6 +43,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("CRC 值") @TableField(value = "n_crc") + @JSONField(name = "n_crc") private String nCrc; /** @@ -47,6 +51,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("案件类型") @TableField(value = "n_ajlx") + @JSONField(name = "n_ajlx") private String nAjlx; /** @@ -54,6 +59,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("案号") @TableField(value = "c_ah") + @JSONField(name = "c_ah") private String cAh; /** @@ -61,6 +67,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("原审案号") @TableField(value = "c_ah_ys") + @JSONField(name = "c_ah_ys") private String cAhYs; /** @@ -68,6 +75,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("后续案号") @TableField(value = "c_ah_hx") + @JSONField(name = "c_ah_hx") private String cAhHx; /** @@ -75,6 +83,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("经办法院") @TableField(value = "n_jbfy") + @JSONField(name = "n_jbfy") private String nJbfy; /** @@ -87,6 +96,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("法院所属层级") @TableField(value = "n_jbfy_cj") + @JSONField(name = "n_jbfy_cj") private String nJbfyCj; /** @@ -94,6 +104,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("审理程序") @TableField(value = "n_slcx") + @JSONField(name = "n_slcx") private String nSlcx; /** @@ -101,6 +112,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("所属地域") @TableField(value = "c_ssdy") + @JSONField(name = "c_ssdy") private String cSsdy; /** @@ -108,6 +120,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("案件进展阶段") @TableField(value = "n_ajjzjd") + @JSONField(name = "n_ajjzjd") private String nAjjzjd; /** @@ -116,6 +129,7 @@ public class LawCase extends BaseField { @ApiModelProperty("立案时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField(value = "d_larq") + @JSONField(name = "d_larq") private Date dLarq; /** @@ -123,6 +137,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("立案案由") @TableField(value = "n_laay") + @JSONField(name = "n_laay") private String nLaay; /** @@ -130,6 +145,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("立案案由详细") @TableField(value = "n_laay_tree") + @JSONField(name = "n_laay_tree") private String nLaayTree; /** @@ -137,6 +153,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("起诉标的金额等级") @TableField(value = "n_qsbdje_level") + @JSONField(name = "n_qsbdje_level") private String nQsbdjeLevel; /** @@ -144,6 +161,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("起诉标的金额") @TableField(value = "n_qsbdje") + @JSONField(name = "n_qsbdje") private BigDecimal nQsbdje; /** @@ -151,6 +169,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("审理方式信息") @TableField(value = "c_slfsxx") + @JSONField(name = "c_slfsxx") private String cSlfsxx; /** @@ -159,6 +178,7 @@ public class LawCase extends BaseField { @ApiModelProperty("结案时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField(value = "d_jarq") + @JSONField(name = "d_jarq") private Date dJarq; /** @@ -166,6 +186,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("结案案由") @TableField(value = "n_jaay") + @JSONField(name = "n_jaay") private String nJaay; /** @@ -173,6 +194,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("结案案由详细") @TableField(value = "n_jaay_tree") + @JSONField(name = "n_jaay_tree") private String nJaayTree; /** @@ -180,6 +202,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("结案标的金额等级") @TableField(value = "n_jabdje_level") + @JSONField(name = "n_jabdje_level") private String nJabdjeLevel; /** @@ -187,6 +210,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("结案标的金额") @TableField(value = "n_jabdje") + @JSONField(name = "n_jabdje") private BigDecimal nJabdje; /** @@ -194,6 +218,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("结案方式") @TableField(value = "n_jafs") + @JSONField(name = "n_jafs") private String nJafs; /** @@ -201,6 +226,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("胜诉估计") @TableField(value = "n_pj_victory") + @JSONField(name = "n_pj_victory") private String nPjVictory; /** @@ -208,6 +234,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("诉讼地位") @TableField(value = "n_ssdw") + @JSONField(name = "n_ssdw") private String nSsdw; /** @@ -215,6 +242,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("一审诉讼地位") @TableField(value = "n_ssdw_ys") + @JSONField(name = "n_ssdw_ys") private String nSsdwYs; /** @@ -222,6 +250,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("公开文书 ID") @TableField(value = "c_gkws_id") + @JSONField(name = "c_gkws_id") private String cGkwsId; /** @@ -229,6 +258,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("相关案件号") @TableField(value = "c_gkws_glah") + @JSONField(name = "c_gkws_glah") private String cGkwsGlah; /** @@ -236,6 +266,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("当事人段落") @TableField(value = "c_gkws_dsr") + @JSONField(name = "c_gkws_dsr") private String cGkwsDsr; /** @@ -243,6 +274,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("判决结果段落") @TableField(value = "c_gkws_pjjg") + @JSONField(name = "c_gkws_pjjg") private String cGkwsPjjg; //**********刑事案件 @@ -251,6 +283,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("犯罪金额等级") @TableField(value = "n_fzje_level") + @JSONField(name = "n_fzje_level") private String nFzjeLevel; /** @@ -258,6 +291,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("犯罪金额") @TableField(value = "n_fzje") + @JSONField(name = "n_fzje") private BigDecimal nFzje; /** @@ -265,6 +299,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("被请求赔偿金额等级") @TableField(value = "n_bqqpcje_level") + @JSONField(name = "n_bqqpcje_level") private String nBqqpcjeLevel; /** @@ -272,6 +307,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("被请求赔偿金额") @TableField(value = "n_bqqpcje") + @JSONField(name = "n_bqqpcje") private BigDecimal nBqqpcje; /** @@ -279,6 +315,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("定罪罪名") @TableField(value = "n_dzzm") + @JSONField(name = "n_dzzm") private String nDzzm; /** @@ -286,6 +323,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("定罪罪名详细") @TableField(value = "n_dzzm_tree") + @JSONField(name = "n_dzzm_tree") private String nDzzmTree; /** @@ -293,6 +331,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("判处结果") @TableField(value = "n_pcjg") + @JSONField(name = "n_pcjg") private String nPcjg; /** @@ -300,6 +339,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("财产刑执行金额等级") @TableField(value = "n_ccxzxje_level") + @JSONField(name = "n_ccxzxje_level") private String nCcxzxjeLevel; /** @@ -307,6 +347,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("财产刑执行金额") @TableField(value = "n_ccxzxje") + @JSONField(name = "n_ccxzxje") private BigDecimal nCcxzxje; /** @@ -314,6 +355,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("判处赔偿金额等级") @TableField(value = "n_pcpcje_level") + @JSONField(name = "n_pcpcje_level") private String nPcpcjeLevel; /** @@ -321,6 +363,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("判处赔偿金额") @TableField(value = "n_pcpcje") + @JSONField(name = "n_pcpcje") private BigDecimal nPcpcje; //********非诉保全审查 @@ -329,6 +372,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("申请保全数额等级") @TableField(value = "n_sqbqse_level") + @JSONField(name = "n_sqbqse_level") private String nSqbqseLevel; /** @@ -336,6 +380,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("申请保全数额") @TableField(value = "n_sqbqse") + @JSONField(name = "n_sqbqse") private String nSqbqse; /** @@ -343,6 +388,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("申请保全标的物") @TableField(value = "c_sqbqbdw") + @JSONField(name = "c_sqbqbdw") private String cSqbqbdw; //***********执行案件 @@ -352,6 +398,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("申请执行标的金额") @TableField(value = "n_sqzxbdje") + @JSONField(name = "n_sqzxbdje") private BigDecimal nSqzxbdje; /** @@ -359,6 +406,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("实际到位金额") @TableField(value = "n_sjdwje") + @JSONField(name = "n_sjdwje") private BigDecimal nSjdwje; /** @@ -366,6 +414,7 @@ public class LawCase extends BaseField { */ @ApiModelProperty("未执行金额") @TableField(value = "n_wzxje") + @JSONField(name = "n_wzxje") private BigDecimal nWzxje; /** diff --git a/src/main/java/com/fkzy/warn/model/LitigantInfo.java b/src/main/java/com/fkzy/warn/model/LitigantInfo.java index 20d1971..071789e 100644 --- a/src/main/java/com/fkzy/warn/model/LitigantInfo.java +++ b/src/main/java/com/fkzy/warn/model/LitigantInfo.java @@ -1,5 +1,6 @@ package com.fkzy.warn.model; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -34,18 +35,21 @@ public class LitigantInfo extends BaseField{ * 名称 */ @ApiModelProperty("名称") + @JSONField(name = "c_mc") private String cMc; /** * 当事人类型 */ @ApiModelProperty("当事人类型") + @JSONField(name = "n_dsrlx") private String nDsrlx; /** * 诉讼地位 */ @ApiModelProperty("诉讼地位") + @JSONField(name = "n_ssdw") private String nSsdw; } diff --git a/src/main/java/com/fkzy/warn/service/impl/AlarmCaseServiceImpl.java b/src/main/java/com/fkzy/warn/service/impl/AlarmCaseServiceImpl.java index 5c4e7e8..722b9cf 100644 --- a/src/main/java/com/fkzy/warn/service/impl/AlarmCaseServiceImpl.java +++ b/src/main/java/com/fkzy/warn/service/impl/AlarmCaseServiceImpl.java @@ -89,7 +89,7 @@ public class AlarmCaseServiceImpl extends ServiceImpl { - InvocationRecord lawResult = LawResearchUtil.querySxx(item.getCompanyName(), item.getCreditCode()); + InvocationRecord lawResult = LawResearchUtil.querySxx(item.getCompanyName(), item.getCreditCode(),null); invocationRecordService.saveModel(result); JSONObject object = JSONObject.parseObject(lawResult.getApiResult()); lawCaseService.judicialModelSave(object); diff --git a/src/main/java/com/fkzy/warn/service/impl/LawCaseServiceImpl.java b/src/main/java/com/fkzy/warn/service/impl/LawCaseServiceImpl.java index f579fde..909b342 100644 --- a/src/main/java/com/fkzy/warn/service/impl/LawCaseServiceImpl.java +++ b/src/main/java/com/fkzy/warn/service/impl/LawCaseServiceImpl.java @@ -350,6 +350,7 @@ public class LawCaseServiceImpl extends ServiceImpl impl for (int j = 0; j < cDsrxx.size(); j++) { JSONObject obj = cDsrxx.getJSONObject(j); LitigantInfo litigantInfo = JSON.parseObject(obj.toString(), LitigantInfo.class); + litigantInfo.setCAh(lawCase.getCAh()); litigantInfo.setNAjbs(lawCase.getNAjbs()); litigantInfoList.add(litigantInfo); } diff --git a/src/main/java/com/fkzy/warn/service/impl/MonitorUsersServiceImpl.java b/src/main/java/com/fkzy/warn/service/impl/MonitorUsersServiceImpl.java index fa78014..622923f 100644 --- a/src/main/java/com/fkzy/warn/service/impl/MonitorUsersServiceImpl.java +++ b/src/main/java/com/fkzy/warn/service/impl/MonitorUsersServiceImpl.java @@ -81,6 +81,8 @@ public class MonitorUsersServiceImpl extends ServiceImpl{ + //添加至法研平台监控名单 + LawResearchUtil.addpublic(item.getCompanyName()); //生成授权-临时 setAuthorization(item); //查询企业信息 暂无 @@ -91,8 +93,7 @@ public class MonitorUsersServiceImpl extends ServiceImpl