湖南常口提交(湖南)

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/TbStRy.java

+package com.founder.commonutils.model.newPublicEntity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 人员基本信息
+ * </p>
+ *
+ * @author liuyx
+ * @since 2021-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TB_ST_RY")
+@ApiModel(value="TbStRy对象", description="人员基本信息")
+public class TbStRy implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "案事件相关人员编号")
+    @TableField("ASJXGRYBH")
+    private String asjxgryh;
+
+    @ApiModelProperty(value = "姓名")
+    @TableField("XM")
+    private String xm;
+
+    @ApiModelProperty(value = "曾用名")
+    @TableField("CYM")
+    private String cym;
+
+    @ApiModelProperty(value = "别名/绰号")
+    @TableField("BMCH")
+    private String bmch;
+
+    @ApiModelProperty(value = "常用证件_常用证件代码")
+    @TableField("CYZJ_CYZJDM")
+    private String cyzjCyzjdm;
+
+    @ApiModelProperty(value = "常用证件_代码补充描述")
+    @TableField("CYZJ_DMBCMS")
+    private String cyzjDmbcms;
+
+    @ApiModelProperty(value = "常用证件_证件号码")
+    @TableField("CYZJ_ZJHM")
+    private String cyzjZjhm;
+
+    @ApiModelProperty(value = "出生日期_日期估值下限")
+    @TableField("CSRQ_RQGZXX")
+    private Date csrqRqgzxx;
+
+    @ApiModelProperty(value = "出生日期_日期估值上限")
+    @TableField("CSRQ_RQGZSX")
+    private Date csrqRqgzsx;
+
+    @ApiModelProperty(value = "性别代码")
+    @TableField("XBDM")
+    private String xbdm;
+
+    @ApiModelProperty(value = "国籍代码")
+    @TableField("GJDM")
+    private String gjdm;
+
+    @ApiModelProperty(value = "籍贯省市县代码")
+    @TableField("JGDM")
+    private String jgdm;
+
+    @ApiModelProperty(value = "民族代码")
+    @TableField("MZDM")
+    private String mzdm;
+
+    @ApiModelProperty(value = "出生地_国家和地区代码")
+    @TableField("CSD_GJHDQDM")
+    private String csdGjhdqdm;
+
+    @ApiModelProperty(value = "出生地_行政区划代码")
+    @TableField("CSD_XZQHDM")
+    private String csdXzqhdm;
+
+    @ApiModelProperty(value = "出生地_地址名称")
+    @TableField("CSD_DZMC")
+    private String csdDzmc;
+
+    @ApiModelProperty(value = "户籍地址_行政区划代码")
+    @TableField("HJDZ_XZQHDM")
+    private String hjdzXzqhdm;
+
+    @ApiModelProperty(value = "户籍地址_地址名称")
+    @TableField("HJDZ_DZMC")
+    private String hjdzDzmc;
+
+    @ApiModelProperty(value = "现住址_行政区划代码")
+    @TableField("XZZ_XZQHDM")
+    private String xzzXzqhdm;
+
+    @ApiModelProperty(value = "现住址_地址名称")
+    @TableField("XZZ_DZMC")
+    private String xzzDzmc;
+
+    @ApiModelProperty(value = "境外住址_国家和地区代码")
+    @TableField("JWZZ_GJHDQDM")
+    private String jwzzGjhdqdm;
+
+    @ApiModelProperty(value = "境外住址_地址名称")
+    @TableField("JWZZ_DZMC")
+    private String jwzzDzmc;
+
+    @ApiModelProperty(value = "身高上限")
+    @TableField("SGSX")
+    private Integer sgsx;
+
+    @ApiModelProperty(value = "身高下限")
+    @TableField("SGXX")
+    private Integer sgxx;
+
+    @ApiModelProperty(value = "体重上限")
+    @TableField("TZSX")
+    private Double tzsx;
+
+    @ApiModelProperty(value = "体重下限")
+    @TableField("TZXX")
+    private Double tzxx;
+
+    @ApiModelProperty(value = "足长上限")
+    @TableField("ZCSX")
+    private Integer zcsx;
+
+    @ApiModelProperty(value = "足长下限")
+    @TableField("ZCXX")
+    private Integer zcxx;
+
+    @ApiModelProperty(value = "体貌特征描述")
+    @TableField("TMTZMS")
+    private String tmtzms;
+
+    @ApiModelProperty(value = "体表标记描述")
+    @TableField("TBBJMS")
+    private String tbbjms;
+
+    @ApiModelProperty(value = "人其他特征_简要情况")
+    @TableField("RQTTZ_JYQK")
+    private String rqttzJyqk;
+
+    @ApiModelProperty(value = "工作单位")
+    @TableField("GZDW")
+    private String gzdw;
+
+    @ApiModelProperty(value = "联系电话")
+    @TableField("LXDH")
+    private String lxdh;
+
+    @ApiModelProperty(value = "血型代码")
+    @TableField("XXDM")
+    private String xxdm;
+
+    @ApiModelProperty(value = "宗教信仰代码")
+    @TableField("ZJXYDM")
+    private String zjxydm;
+
+    @ApiModelProperty(value = "政治面貌代码")
+    @TableField("ZZMMDM")
+    private String zzmmdm;
+
+    @ApiModelProperty(value = "学历代码")
+    @TableField("XLDM")
+    private String xldm;
+
+    @ApiModelProperty(value = "婚姻状况代码")
+    @TableField("JYZKDM")
+    private String jyzkdm;
+
+    @ApiModelProperty(value = "兵役状况代码")
+    @TableField("BYZKDM")
+    private String byzkdm;
+
+    @ApiModelProperty(value = "职业_职业类别代码")
+    @TableField("ZY_ZYLBDM")
+    private String zyZylbdm;
+
+    @ApiModelProperty(value = "职业_代码补充描述")
+    @TableField("ZY_DMBCMS")
+    private String zyDmbcms;
+
+    @ApiModelProperty(value = "案事件相关人员身份_案事件相关人员身份代码")
+    @TableField("ASJXGRYSF_ASJXGRYSFDM")
+    private String asjxgrysfAsjxgrysfdm;
+
+    @ApiModelProperty(value = "案事件相关人员身份_代码补充描述")
+    @TableField("ASJXGRYSF_DMBCMS")
+    private String asjxgrysfDmbcms;
+
+    @ApiModelProperty(value = "犯罪嫌疑人特殊专长_犯罪嫌疑人特殊专长代码")
+    @TableField("FZXYRTSZC_FZXYRTSZCDM")
+    private String fzxyrtszcFzxyrtszcdm;
+
+    @ApiModelProperty(value = "犯罪嫌疑人特殊专长_代码补充描述")
+    @TableField("FZXYRTSZC_DMBCMS")
+    private String fzxyrtszcDmbcms;
+
+    @ApiModelProperty(value = "简历")
+    @TableField("JL")
+    private String jl;
+
+    @ApiModelProperty(value = "个人爱好及活动特点_简要情况")
+    @TableField("GRAHJHDTD_JYQK")
+    private String grahjhdtdJyqk;
+
+    @ApiModelProperty(value = "个人收入支出_简要情况")
+    @TableField("GRSRZC_JYQK")
+    private String grsrzcJyqk;
+
+    @ApiModelProperty(value = "社会交往_简要情况")
+    @TableField("SHJW_JYQK")
+    private String shjwJyqk;
+
+    @ApiModelProperty(value = "违法犯罪经历描述")
+    @TableField("WFFZJLMS")
+    private String wffzjlms;
+
+    @ApiModelProperty(value = "是否有吸毒史_判断标识")
+    @TableField("SFYXDS_PDBZ")
+    private String sfyxdsPdbz;
+
+    @ApiModelProperty(value = "是否艾滋病病毒携带者_判断标识")
+    @TableField("SFAZBBDXDZ_PDBZ")
+    private String sfazbbdxdzPdbz;
+
+    @ApiModelProperty(value = "是否精神病人_判断标识")
+    @TableField("SFJSBR_PDBZ")
+    private String sfjsbrPdbz;
+
+    @ApiModelProperty(value = "十指指纹编号")
+    @TableField("SZZWBH")
+    private String szzwbh;
+
+    @ApiModelProperty(value = "人员DNA编号")
+    @TableField("RYDNABH")
+    private String rydnabh;
+
+    @ApiModelProperty(value = "死亡时间")
+    @TableField("SWSJ")
+    private Date swsj;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("BZ")
+    private String bz;
+
+    @ApiModelProperty(value = "信息删除_判断标识")
+    @TableField("XXSC_PDBZ")
+    private String xxscPdbz;
+
+    @ApiModelProperty(value = "信息登记单位_公安机关机构代码")
+    @TableField("XXDJDW_GAJGJGDM")
+    private String xxdjdwGajgjgdm;
+
+    @ApiModelProperty(value = "信息登记单位_公安机关名称")
+    @TableField("XXDJDW_GAJGMC")
+    private String xxdjdwGajgmc;
+
+    @ApiModelProperty(value = "信息登记人员_姓名")
+    @TableField("XXDJRY_XM")
+    private String xxdjryXm;
+
+    @ApiModelProperty(value = "信息登记人员_公民身份号码")
+    @TableField("XXDJRY_GMSFHM")
+    private String xxdjryGmsfhm;
+
+    @ApiModelProperty(value = "信息登记人员_联系电话")
+    @TableField("XXDJRY_LXDH")
+    private String xxdjryLxdh;
+
+    @ApiModelProperty(value = "登记时间")
+    @TableField("DJSJ")
+    private Date djsj;
+
+    @ApiModelProperty(value = "信息操作单位_公安机关机构代码")
+    @TableField("XXCZDW_GAJGJGDM")
+    private String xxczdwGajgjgdm;
+
+    @ApiModelProperty(value = "信息操作单位_公安机关名称")
+    @TableField("XXCZDW_GAJGMC")
+    private String xxczdwGajgmc;
+
+    @ApiModelProperty(value = "信息操作人员_姓名")
+    @TableField("XXCZRY_XM")
+    private String xxczryXm;
+
+    @ApiModelProperty(value = "信息操作人员_公民身份号码")
+    @TableField("XXCZRY_GMSFHM")
+    private String xxczryGmsfhm;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("GXSJ")
+    private Date gxsj;
+
+    @ApiModelProperty(value = "信息来源描述")
+    @TableField("XXLYMS")
+    private String xxlyms;
+
+    @ApiModelProperty(value = "信息入省库时间")
+    @TableField("XXRSKSJ")
+    private Date xxrsksj;
+
+    @ApiModelProperty(value = "信息入部库时间")
+    @TableField("XXRBKSJ")
+    private Date xxrbksj;
+
+    @ApiModelProperty(value = "信息入省库_判断标识")
+    @TableField("XXRSK_PDBZ")
+    private String xxrskPdbz;
+
+    @ApiModelProperty(value = "信息入部库_判断标识")
+    @TableField("XXRBK_PDBZ")
+    private String xxrbkPdbz;
+
+    @ApiModelProperty(value = "信息封存_判断标识")
+    @TableField("XXFC_PDBZ")
+    private String xxfcPdbz;
+
+    @ApiModelProperty(value = "警综人员编号")
+    @TableField("JZRYBH")
+    private String jzrybh;
+
+    @ApiModelProperty(value = "部省业务联动服务公安部下发  0:否   1:是")
+    @TableField("GABXF")
+    private String gabxf;
+
+    @TableField("RYSX")
+    private String rysx;
+
+    @TableField("BCRYBH")
+    private String bcrybh;
+
+    private String xbdmStr;
+    private String mzdmStr;
+	private String jyzkdmStr;
+	private String jgssxdm;
+    private String hjdzXzqhdmStr;
+    private String jgssxdmStr;
+	//文化程度
+	private String whcd ;
+	private String edzzplj;
+	private String fwcs;
+	private String zjhm;
+	private Date csrqQsrq;
+
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/RyxxQgInterface.java

 package com.founder.publicapi.controller.SkInterface;
 
+import com.alibaba.fastjson.JSONObject;
 import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsPerson;
+import com.founder.commonutils.model.newPublicEntity.TbStRy;
 import com.founder.commonutils.util.HttpUtil;
 import com.founder.publicapi.mapper.mysqlMapper.SysDictitemMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
@@ -13,9 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 全国人员常口接口
@@ -34,19 +37,70 @@ public class RyxxQgInterface {
         SkRegionalsPerson ryxx=new SkRegionalsPerson();
         String esbServiceReturn="";
         //String url="http://10.100.17.115:8080/NmgEsbQueryService/QueryLocalPersonForOther?conditions=sfzh="+"'"+zjhm+"'";
-        String url=getConn()+"'"+zjhm+"'";
-        HttpUtil hu=new HttpUtil();
+//        String url=getConn()+"'"+zjhm+"'";
+//        HttpUtil hu=new HttpUtil();
+//        try {
+//            esbServiceReturn=hu.doGet(url);
+//        } catch (Exception e) {
+//            return MapRestResult.error("失败"+e);
+//        }
+        Map<String,String> map=new HashMap();
+        map.put("zjhm",zjhm);
+        String resultStr="";
         try {
-            esbServiceReturn=hu.doGet(url);
+            System.out.println("常口调用开始==============="+zjhm);
+            resultStr=HttpUtil.doPost("http://65.26.2.184:1005/getRyxxByQgck",map);
+            if(StringUtils.isNotBlank(resultStr)){
+                System.out.println("常口调用成功==============="+zjhm);
+                JSONObject jsonObject=JSONObject.parseObject(resultStr);
+                if(jsonObject!=null&&jsonObject.containsKey("data")){
+                    JSONObject jsonObject1=jsonObject.getJSONObject("data");
+                    if(jsonObject1!=null&&jsonObject1.containsKey("ryxx")){
+                        TbStRy tbStRy=jsonObject1.getObject("ryxx", TbStRy.class);
+                        if(tbStRy!=null){
+                            ryxx=getQgxx(tbStRy);
+                        }
+                    }
+                }
+            }
         } catch (Exception e) {
-            return MapRestResult.error("失败"+e);
+            e.printStackTrace();
         }
-        ryxx=getryJbxxxmls(esbServiceReturn);
+        //ryxx=getryJbxxxmls(esbServiceReturn);
         listSkRegionalsPerson.add(ryxx);
         return MapRestResult.build(200, "OK",listSkRegionalsPerson.size(),listSkRegionalsPerson);
 
     }
 
+    private SkRegionalsPerson getQgxx(TbStRy tbStRy) {
+        SkRegionalsPerson qgRyJbXx= null;
+        try {
+            qgRyJbXx = new SkRegionalsPerson();
+            qgRyJbXx.setXm(tbStRy.getXm());
+            qgRyJbXx.setXb(tbStRy.getXbdmStr());
+            qgRyJbXx.setMz(tbStRy.getMzdmStr());
+            qgRyJbXx.setSfzhm(tbStRy.getZjhm());
+            qgRyJbXx.setHjdqhdz(tbStRy.getHjdzXzqhdmStr());
+            qgRyJbXx.setCsdzmc(tbStRy.getCsdDzmc());
+            qgRyJbXx.setImg("data:image/jpg;base64,"+tbStRy.getEdzzplj());
+            qgRyJbXx.setXzzdzmc(tbStRy.getXzzDzmc());
+            Date csrq=tbStRy.getCsrqQsrq();
+            String csrqQsrq = null;
+            if(csrq != null) {
+                DateFormat fmt = new SimpleDateFormat("yyyyMMdd");
+                try {
+                    csrqQsrq=fmt.format(csrq);
+                    qgRyJbXx.setCsrq(csrqQsrq);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return qgRyJbXx;
+    }
+
     public  SkRegionalsPerson getQgckAllxx(String zjhm){
         List<SkRegionalsPerson> listSkRegionalsPerson = new ArrayList<>();
         SkRegionalsPerson ryxx=new SkRegionalsPerson();