Merge remote-tracking branch 'remotes/origin/dev_QuanGuoTongYongJcxx' into dev_QuanGuoTongYongJcxx

pom.xml

@@ -74,9 +74,24 @@
         <!-- 数据库驱动包 -->
 
         <dependency>
-            <groupId>org.oracle</groupId>
+            <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
-            <version>10</version>
+            <version>11.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>6.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>transport</artifactId>
+            <version>6.4.3</version>
         </dependency>
         <!-- alibaba的druid数据库连接池 -->
         <dependency>

src/main/java/com/founder/Application.java

 package com.founder;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 @EnableAsync
@@ -12,9 +16,12 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @ComponentScan(basePackages = {"com.founder.*"})
 public class Application {
 
+	@Autowired
+	private RestTemplateBuilder restTemplateBuilder;
 
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
-
+	@Bean
+	public RestTemplate restTemplate(){return restTemplateBuilder.build();}
 }

src/main/java/com/founder/model/AsjParam.java

+package com.founder.model;
+
+import lombok.Data;
+
+@Data
+public class AsjParam {
+
+    private String asjbh;
+
+    private String ajmc;
+
+    private String bzzt;
+
+    private String ajlbdm;
+
+    private String zatzJyqk;
+
+    private String ajxlb;
+
+    private String jyaq;
+
+    private String jyaqType;
+
+    private String afsjKssj;
+
+    private String afsjJssj;
+
+    private String ladwdm;
+
+    private String larqKssj;
+
+    private String larqJssj;
+
+}

src/main/java/com/founder/model/BaseModel.java

+package com.founder.model;
+
+
+@SuppressWarnings("serial")
+public class BaseModel {
+
+    protected String modelName;
+
+    protected String id = null;
+
+    protected String lrr = null;
+
+    protected String lrrLxdh = null;
+
+    protected String lrsj = null;
+
+    protected String gxr = null;
+
+    protected String gxrLxdh = null;
+
+    protected String gxsj = null;
+
+    protected String lrdwdm = null;
+
+    protected String lrdwmc = null;
+
+    private String scbz = "0";
+
+    protected String deleteFlag = "0";
+
+    protected String secrecy = null;
+
+    protected int functionLevel;
+
+    protected int startNum = 0;
+
+    protected int endNum = 0;
+
+    protected String conditionString = null;
+
+    protected String orderString = null;
+
+
+    protected String flag = null;
+
+    protected String ip = null;
+
+    protected String starttime = "";
+    protected String endtime = "";
+
+
+    protected String gxdwdm = null;
+
+    protected String gxdwmc = null;
+    private String gxdwdm_text = null;
+
+
+
+    protected String xxscPdbz = null;
+
+
+    protected String xxdjdwGajgjgdm = null;
+
+
+    protected String xxdjdwGajgmc = null;
+
+
+    protected String xxdjryXm = null;
+
+
+    protected String xxdjryGmsfhm = null;
+
+    protected String xxdjryLxdh = null;
+
+
+    protected String djsj = null;
+
+
+    protected String xxczdwGajgjgdm = null;
+
+
+    protected String xxczdwGajgmc = null;
+
+
+    protected String xxczryXm = null;
+
+
+    protected String xxczryGmsfhm = null;
+
+
+    protected String xxlyms = "刑侦信息专业应用系统";
+
+    protected String xxrsksj = null;
+
+
+    protected String xxrbksj = null;
+
+    protected String xxrskPdbz = null;
+
+
+    protected String xxrbkPdbz = null;
+    //查询分页开始结束
+    protected Integer begin = null;
+    protected Integer end = null;
+    protected String typeFlag = null;
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLrr() {
+        return lrr;
+    }
+
+    public void setLrr(String lrr) {
+        this.lrr = lrr;
+    }
+
+    public String getLrrLxdh() {
+        return lrrLxdh;
+    }
+
+    public void setLrrLxdh(String lrrLxdh) {
+        this.lrrLxdh = lrrLxdh;
+    }
+
+    public String getLrsj() {
+        return lrsj;
+    }
+
+    public void setLrsj(String lrsj) {
+        this.lrsj = lrsj;
+    }
+
+    public String getGxr() {
+        return gxr;
+    }
+
+    public void setGxr(String gxr) {
+        this.gxr = gxr;
+    }
+
+    public String getGxrLxdh() {
+        return gxrLxdh;
+    }
+
+    public void setGxrLxdh(String gxrLxdh) {
+        this.gxrLxdh = gxrLxdh;
+    }
+
+    public String getGxsj() {
+        return gxsj;
+    }
+
+    public void setGxsj(String gxsj) {
+        this.gxsj = gxsj;
+    }
+
+    public String getLrdwdm() {
+        return lrdwdm;
+    }
+
+    public void setLrdwdm(String lrdwdm) {
+        this.lrdwdm = lrdwdm;
+    }
+
+    public String getLrdwmc() {
+        return lrdwmc;
+    }
+
+    public void setLrdwmc(String lrdwmc) {
+        this.lrdwmc = lrdwmc;
+    }
+
+    public String getScbz() {
+        return scbz;
+    }
+
+    public void setScbz(String scbz) {
+        this.scbz = scbz;
+    }
+
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getSecrecy() {
+        return secrecy;
+    }
+
+    public void setSecrecy(String secrecy) {
+        this.secrecy = secrecy;
+    }
+
+    public int getFunctionLevel() {
+        return functionLevel;
+    }
+
+    public void setFunctionLevel(int functionLevel) {
+        this.functionLevel = functionLevel;
+    }
+
+    public int getStartNum() {
+        return startNum;
+    }
+
+    public void setStartNum(int startNum) {
+        this.startNum = startNum;
+    }
+
+    public int getEndNum() {
+        return endNum;
+    }
+
+    public void setEndNum(int endNum) {
+        this.endNum = endNum;
+    }
+
+    public String getConditionString() {
+        return conditionString;
+    }
+
+    public void setConditionString(String conditionString) {
+        this.conditionString = conditionString;
+    }
+
+    public String getOrderString() {
+        return orderString;
+    }
+
+    public void setOrderString(String orderString) {
+        this.orderString = orderString;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getStarttime() {
+        return starttime;
+    }
+
+    public void setStarttime(String starttime) {
+        this.starttime = starttime;
+    }
+
+    public String getEndtime() {
+        return endtime;
+    }
+
+    public void setEndtime(String endtime) {
+        this.endtime = endtime;
+    }
+
+    public String getGxdwdm() {
+        return gxdwdm;
+    }
+
+    public void setGxdwdm(String gxdwdm) {
+        this.gxdwdm = gxdwdm;
+    }
+
+    public String getGxdwmc() {
+        return gxdwmc;
+    }
+
+    public void setGxdwmc(String gxdwmc) {
+        this.gxdwmc = gxdwmc;
+    }
+
+    public String getGxdwdm_text() {
+        return gxdwdm_text;
+    }
+
+    public void setGxdwdm_text(String gxdwdm_text) {
+        this.gxdwdm_text = gxdwdm_text;
+    }
+
+    public String getXxscPdbz() {
+        return xxscPdbz;
+    }
+
+    public void setXxscPdbz(String xxscPdbz) {
+        this.xxscPdbz = xxscPdbz;
+    }
+
+    public String getXxdjdwGajgjgdm() {
+        return xxdjdwGajgjgdm;
+    }
+
+    public void setXxdjdwGajgjgdm(String xxdjdwGajgjgdm) {
+        this.xxdjdwGajgjgdm = xxdjdwGajgjgdm;
+    }
+
+    public String getXxdjdwGajgmc() {
+        return xxdjdwGajgmc;
+    }
+
+    public void setXxdjdwGajgmc(String xxdjdwGajgmc) {
+        this.xxdjdwGajgmc = xxdjdwGajgmc;
+    }
+
+    public String getXxdjryXm() {
+        return xxdjryXm;
+    }
+
+    public void setXxdjryXm(String xxdjryXm) {
+        this.xxdjryXm = xxdjryXm;
+    }
+
+    public String getXxdjryGmsfhm() {
+        return xxdjryGmsfhm;
+    }
+
+    public void setXxdjryGmsfhm(String xxdjryGmsfhm) {
+        this.xxdjryGmsfhm = xxdjryGmsfhm;
+    }
+
+    public String getXxdjryLxdh() {
+        return xxdjryLxdh;
+    }
+
+    public void setXxdjryLxdh(String xxdjryLxdh) {
+        this.xxdjryLxdh = xxdjryLxdh;
+    }
+
+    public String getDjsj() {
+        return djsj;
+    }
+
+    public void setDjsj(String djsj) {
+        this.djsj = djsj;
+    }
+
+    public String getXxczdwGajgjgdm() {
+        return xxczdwGajgjgdm;
+    }
+
+    public void setXxczdwGajgjgdm(String xxczdwGajgjgdm) {
+        this.xxczdwGajgjgdm = xxczdwGajgjgdm;
+    }
+
+    public String getXxczdwGajgmc() {
+        return xxczdwGajgmc;
+    }
+
+    public void setXxczdwGajgmc(String xxczdwGajgmc) {
+        this.xxczdwGajgmc = xxczdwGajgmc;
+    }
+
+    public String getXxczryXm() {
+        return xxczryXm;
+    }
+
+    public void setXxczryXm(String xxczryXm) {
+        this.xxczryXm = xxczryXm;
+    }
+
+    public String getXxczryGmsfhm() {
+        return xxczryGmsfhm;
+    }
+
+    public void setXxczryGmsfhm(String xxczryGmsfhm) {
+        this.xxczryGmsfhm = xxczryGmsfhm;
+    }
+
+    public String getXxlyms() {
+        return xxlyms;
+    }
+
+    public void setXxlyms(String xxlyms) {
+        this.xxlyms = xxlyms;
+    }
+
+    public String getXxrsksj() {
+        return xxrsksj;
+    }
+
+    public void setXxrsksj(String xxrsksj) {
+        this.xxrsksj = xxrsksj;
+    }
+
+    public String getXxrbksj() {
+        return xxrbksj;
+    }
+
+    public void setXxrbksj(String xxrbksj) {
+        this.xxrbksj = xxrbksj;
+    }
+
+    public String getXxrskPdbz() {
+        return xxrskPdbz;
+    }
+
+    public void setXxrskPdbz(String xxrskPdbz) {
+        this.xxrskPdbz = xxrskPdbz;
+    }
+
+    public String getXxrbkPdbz() {
+        return xxrbkPdbz;
+    }
+
+    public void setXxrbkPdbz(String xxrbkPdbz) {
+        this.xxrbkPdbz = xxrbkPdbz;
+    }
+
+    public Integer getBegin() {
+        return begin;
+    }
+
+    public void setBegin(Integer begin) {
+        this.begin = begin;
+    }
+
+    public Integer getEnd() {
+        return end;
+    }
+
+    public void setEnd(Integer end) {
+        this.end = end;
+    }
+
+    public String getTypeFlag() {
+        return typeFlag;
+    }
+
+    public void setTypeFlag(String typeFlag) {
+        this.typeFlag = typeFlag;
+    }
+}

src/main/java/com/founder/model/Qgckzp.java

+package com.founder.model;
+
+
+import com.founder.util.HttpUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+public class Qgckzp extends  BaseModel{
+    /**
+     * 根据ajhm查询人员的基本信息
+     * @param zjhm
+     * @return
+     */
+    public TbStRy getQgckAllxxXml(String zjhm){
+        String url=getConn()+"'"+zjhm+"'";
+        HttpUtil hu=new HttpUtil();
+        return getryJbxxxml(hu.doGet(url));
+    }
+    public static TbStRy getryJbxxxml(String esb_result){
+        TbStRy resulryxx=new TbStRy();
+        DateFormat fmt =new SimpleDateFormat("yyyyMMdd");
+        try {
+            Document document = DocumentHelper.parseText(esb_result);
+            Element root = document.getRootElement();
+            Element rmethedType = root.element("Method");
+            Element itemsType = rmethedType.element("Items");
+            Element itemType = itemsType.element("Item");
+            Element data = itemType.element("Value");
+            if(data!=null){
+                List<Element> dataElement = data.elements();
+                if(dataElement.size() > 2){
+                    List<Element> element =dataElement.get(2).elements();//得到人员对应值
+                    String JGSSX=element.get(1).getTextTrim();
+                    String XP=element.get(3).getTextTrim();
+                    String SFZH=element.get(6).getTextTrim();
+                    String XM=element.get(7).getTextTrim();
+                    String MZ=element.get(8).getTextTrim();
+                    String XB=element.get(9).getTextTrim();
+                    String HKSZD=element.get(10).getTextTrim();
+                    String CSDXZ=element.get(11).getTextTrim();
+                    String CSRQ=element.get(13).getTextTrim();
+                    String ZZXZ=element.get(14).getTextTrim();
+                    resulryxx.setJgssxdm(JGSSX);
+                    resulryxx.setEdzzplj(XP);
+                    resulryxx.setXm(XM);
+                    resulryxx.setXbdm(XB);
+                    resulryxx.setMzdm(MZ);
+                    resulryxx.setHjdzXzqhdm(HKSZD);
+                    resulryxx.setCsdDzmc(CSDXZ);
+                    resulryxx.setZjhm(SFZH);
+                    if(CSRQ != null && !CSRQ.trim().isEmpty()){
+                        resulryxx.setCsrqQsrq(fmt.parse(CSRQ));
+                    }else{
+                        resulryxx.setCsrqQsrq(null);
+                    }
+                    resulryxx.setXzzDzmc(ZZXZ);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return resulryxx;
+    }
+    private String getConn(){
+        String url="http://26.3.16.58:8080/NmgEsbQueryService/QueryLocalPersonForOther?conditions=sfzh=";
+        return url;
+    }
+    /**
+     * 根据ajhm查询人员照片信息
+     * @param zjhm
+     * @return
+     */
+    public String getQgckZpXml(String zjhm){
+        String zp64bite="";
+        String esbServiceReturn="";
+        String url=getConn()+"'"+zjhm+"'";
+        HttpUtil hu=new HttpUtil();
+        try {
+            esbServiceReturn=hu.doGet(url);
+            if(StringUtils.isNotEmpty(esbServiceReturn)){
+                zp64bite=getxml(esbServiceReturn);
+            }
+        } catch (Exception e) {
+        }
+        return zp64bite;
+    }
+    public static String getxml(String esb_result){
+        String resultStr="";
+        try {
+            Document document = DocumentHelper.parseText(esb_result);
+            Element root = document.getRootElement();
+            Element rmethedType = root.element("Method");
+            Element itemsType = rmethedType.element("Items");
+            Element itemType = itemsType.element("Item");
+            Element data = itemType.element("Value");
+            if(data!=null){
+                List<Element> dataElement = data.elements();
+                List<Element> element=dataElement.get(2).elements();
+                for(int i=0;i<element.size();i++){
+                    resultStr=element.get(3).getTextTrim();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return resultStr;
+    }
+}
+

src/main/java/com/founder/model/XyrParam.java

+package com.founder.model;
+
+
+
+import lombok.Data;
+
+
+@Data
+public class XyrParam {
+
+    private String xm;
+
+    private String zjhm;
+
+    private String xbdm;
+
+    private String zhrqKssj;
+
+    private String zhrqJssj;
+
+    private String zhdwdm;
+
+    private String xzzmc;
+
+    private String csrqKssj;
+
+    private String csrqJssj;
+
+    private String gjdm;
+
+    private String mzdm;
+
+    private String hjdqhdm;
+
+    private String hjdmc;
+    private int page;
+    private int limit;
+
+}
+

src/main/java/com/founder/service/XxcxService.java

@@ -12,7 +12,11 @@ public interface XxcxService {
     TbStAsjView queryTbStAsjByJjdbh(String jjdbh);
 
     List<TbXwRybhView> queryTbXwRybh(TbXwRybhView param);
+    String getEsAsjQryStr(XyrParam xyr);
 
+    String getCountByAsjbhNum1();
+
+    String getCountByAsjbhNum3();
     List<TbXwBaView> queryTbXwBa(TbXwBaView param);
 
     List<TbZhzxJjxxView> queryJjxx(TbZhzxJjxxView param);

src/main/resources/application.yml

@@ -52,4 +52,14 @@ hnxjzd:
   apiKey: AZNB46000000000000015
   kafka:
     server: 74.6.57.11:9092
-    groupId: hnxjzd001
+    groupId: hnxjzd001
\ No newline at end of file
+
+#公安部es案件请求hearders
+app_keyes: pSFRNTQQXDJKSjzL
+app_secretes: zdejRKFNCUSSAlJbvijEdRFxjnzKAI
+moduleId: ajsearch
+moduleName: ajsearch
+
+gabesUrl: http://68.3.37.119:7998/api/es/
+gabUrl: http://68.3.37.119:7998/api/search/
+gabBzhUrl: http://68.3.37.119:7998/api/bzh/
\ No newline at end of file