Merge remote-tracking branch 'remotes/master/master'

src/main/java/com/founder/interservice/mapper/xzxt/RelationMapper.java

@@ -30,6 +30,8 @@ public interface RelationMapper {
      */
     public List<Relation> getRelations(RelationFilter relationFilter) throws Exception;
 
+    public List<Relation> getRelation(Relation relation) throws Exception;
+
     /**
      * 查询IMSI集合
      * @param relationFilter

src/main/java/com/founder/interservice/ryhx/controller/RyhxController.java

@@ -3,7 +3,6 @@ package com.founder.interservice.ryhx.controller;
 import com.founder.interservice.model.AutoTbStRy;
 import com.founder.interservice.model.Relation;
 import com.founder.interservice.model.SysDictitem;
-import com.founder.interservice.querymodel.RelationFilter;
 import com.founder.interservice.service.DataService;
 import com.founder.interservice.service.SysDictService;
 import com.founder.interservice.util.Qgckzp;
@@ -24,9 +23,9 @@ public class RyhxController {
     private SysDictService sysDictService;
     @Autowired
     private DataService dataService;
-    List<RelationFilter> relationInList = new ArrayList<RelationFilter>();
-    RelationFilter relationFilter = new RelationFilter();
-    String flag = "0";
+    List<Relation> relationInList = new ArrayList<Relation>();
+    List<Relation> relationLaList = new ArrayList<Relation>();
+    Relation relation = new Relation();
     int z = 0;
 
     @RequestMapping(value = "/toRyhxJsp",method = {RequestMethod.GET,RequestMethod.POST})
@@ -37,6 +36,12 @@ public class RyhxController {
         try{
         Qgckzp getryxx = new Qgckzp();
         ryxx = getryxx.getQgckAllxxXml(zjhm);
+        System.out.print("ryxx========人员常口"+ryxx);
+            /*ryxx.setXbdm("0");
+            ryxx.setZylbdm("834");
+            ryxx.setJgdm("150627730000");
+            ryxx.setJyzkdm("10");
+            ryxx.setXldm("11");*/
         if(ryxx != null){
         //性别
         String xbdm = ryxx.getXbdm();
@@ -99,15 +104,15 @@ public class RyhxController {
         relationInList = getXnxxList(zjhm);
         ModelAndView modelAndView = new ModelAndView("ryhx/ryhx");
         modelAndView.addObject("relationInList",relationInList);
-        modelAndView.addObject("relationFilter",relationFilter);
+        modelAndView.addObject("relationFilter",relation);
         return modelAndView;
     }
 
-    public List<RelationFilter> getXnxxList(String zjhm){
+    public List<Relation> getXnxxList(String zjhm){
         int k = 0;
         int m = 0;
         z = z + 1;
-        RelationFilter relaFilter = new RelationFilter();
+        Relation relaFilter = new Relation();
         List<Relation> relationList = new ArrayList<Relation>();
         String oftvalue = "";
         String oftname = "";
@@ -115,68 +120,72 @@ public class RyhxController {
         String ottname = "";
         String firvalue = "";
         try {
-            if (flag == "0") {
-                relationFilter.setName("身份证号码");
-                relationFilter.setValue(zjhm);
-            }
             if(zjhm != null && !"".equals(zjhm)){
-            relationFilter.setObjectfromvalue(zjhm);
-            relationList = dataService.queryRelationsList(relationFilter);
-            if (relationList != null && relationList.size() > 0 && flag != "1") {
-                flag = "1";
+            relation.setObjectfromvalue(zjhm);
+            relationList = dataService.queryRelationList(relation);
+            if (relationList != null && relationList.size() > 0) {
                 for (int i = 0; i < relationList.size(); i++) {
                     //此时Objectfromvalue为身份证号码，则用ottvalue(Objecttovalue)作为查询条件继续查询
                     ottname = relationList.get(i).getObjecttotypename();
                     ottvalue = relationList.get(i).getObjecttovalue();
                     k = k + 1;
-                    m = relationList.size();
                     relaFilter.setObjecttovalue(ottvalue);
                     relaFilter.setObjecttotypename(ottname);
                     relationInList.add(relaFilter);
-                    System.out.print("relationInList111=====" + relationInList);
                 }
+                m = relationList.size();
                 if (relationInList.size() > 0) {
                     for (int n = 0; n < relationInList.size(); n++) {
-                        System.out.print("relationInList111的size=====" + relationInList.size());
-                        //for(int j = 0; j < relationList.size(); j++) {
-                        if (k == m) {
-                            firvalue = relationInList.get(n).getObjecttovalue();
-                            if (z < 6) {
-                                getXnxxList(firvalue);
+                            if (k == m) {
+                                for(Relation rela : relationInList) {
+                                    if(!relationLaList.contains(rela)){
+                                        relationLaList.add(rela);
+                                    }
+                                    firvalue = relationLaList.get(n).getObjecttovalue();
+                                    if (z < 6) {
+                                        getXnxxList(firvalue);
+                                    }
+                                }
                             }
-                        }
+                      /*  }*/
                     }
-                    // }
                 }
             } else {
-                relationFilter.setObjectfromvalue(null);
-                relationFilter.setObjecttovalue(zjhm);
-                relationList = dataService.queryRelationsList(relationFilter);
-                if (relationList != null && relationList.size() > 0 && flag != "2") {
-                    flag = "2";
+                relation.setObjectfromvalue(null);
+                relation.setObjecttovalue(zjhm);
+                relationList = dataService.queryRelationList(relation);
+                if (relationList != null && relationList.size() > 0) {
                     for (int i = 0; i < relationList.size(); i++) {
                         //此时Objecttovalue为身份证号码，则用oftvalue(Objectfromvalue)为条件进行查询
                         oftname = relationList.get(i).getObjectfromtypename();
                         oftvalue = relationList.get(i).getObjectfromvalue();
                         k = k + 1;
-                        m = relationList.size();
                         relaFilter.setObjectfromvalue(oftvalue);
                         relaFilter.setObjectfromtypename(oftname);
-                        relationInList.add(relaFilter);
-                        System.out.print("relationInList222=====" + relationInList);
+                        if(!relationInList.contains(ottvalue)){
+                            relationInList.add(relaFilter);
+                        }
                     }
+                    m = relationList.size();
                     if (relationInList.size() > 0) {
                         for (int n = 0; n < relationInList.size(); n++) {
-                            System.out.print("relationInList222的size=====" + relationInList.size());
-                            //for(int j = 0; j < relationList.size(); j++) {
-                            if (k == m) {
-                                firvalue = relationInList.get(n).getObjectfromvalue();
-                                if (z < 6) {
-                                    getXnxxList(firvalue);
+                           /* if(!relationInList.contains(relationList.get(n).getObjecttovalue())) {
+                                relationLaList.add(relationList.get(n));
+                                System.out.print("relationInList去重33=====" + relationInList);
+                                System.out.print("relationLaList去重33=====" + relationLaList);*/
+                                if (k == m) {
+                                    for(Relation rela : relationInList) {
+                                        if (!relationLaList.contains(rela)) {
+                                            relationLaList.add(rela);
+                                        }
+                                        firvalue = relationLaList.get(n).getObjectfromvalue();
+                                        if (z < 6) {
+                                            getXnxxList(firvalue);
+                                        }
+                                    }
                                 }
-                            }
+                            /*}*/
                         }
-                        // }
                     }
                 }
             }
@@ -184,7 +193,7 @@ public class RyhxController {
         }catch (Exception e){
             e.printStackTrace();
         }
-        System.out.print("relationInList888====="+relationInList);
+        System.out.print("relationLaList=====nnnnnnnnn"+relationLaList);
         return relationInList;
     }
 

src/main/java/com/founder/interservice/service/DataService.java

@@ -35,4 +35,6 @@ public interface DataService {
     public List<String> getRelationImsiList(RelationFilter relationFilter) throws InterServiceException;
 
     public int selectRelatNum(RelationFilter relationFilter) throws Exception;
+
+    public List<Relation> queryRelationList(Relation relation) throws Exception;
 }

src/main/java/com/founder/interservice/service/impl/DataServiceImpl.java

@@ -97,6 +97,11 @@ public class DataServiceImpl implements DataService {
         List<Relation> relations = relationMapper.getRelations(relationFilter);
         return relations;
     }
+    @Override
+    public List<Relation> queryRelationList(Relation relation) throws Exception {
+        List<Relation> relations = relationMapper.getRelation(relation);
+        return relations;
+    }
 
     public List<String> getRelationImsiList(RelationFilter relationFilter) throws InterServiceException{
         List<String> imsis = null;

src/main/resources/mybatis/mapper/xzxt/RelationMapper.xml

@@ -60,4 +60,34 @@
             </if>
         </where>
     </select>
+    <select id = "getRelation" parameterType="com.founder.interservice.model.Relation" resultType="com.founder.interservice.model.Relation">
+        select
+        r.xxzjbh as xxzjbh,
+        r.objectfromtype,
+        r.objectfromtypename,
+        r.objectfromvalue,
+        r.objecttotypename,
+        r.objecttotype,
+        r.objecttovalue,
+        r.timestamp,
+        r.first_timestamp
+        from relation r
+        <where>
+            <if test="xxzjbh != null and xxzjbh != ''">
+                and r.xxzjbh = #{xxzjbh}
+            </if>
+            <if test="objectfromtype != null and objectfromtype != ''">
+                and r.objectfromtype = #{objectfromtype}
+            </if>
+            <if test="objectfromvalue != null and objectfromvalue != ''">
+                and r.objectfromvalue = #{objectfromvalue}
+            </if>
+            <if test="objecttotype != null and objecttotype != ''">
+                and r.objecttotype = #{objecttotype}
+            </if>
+            <if test="objecttovalue != null and objecttovalue != ''">
+                and r.objecttovalue = #{objecttovalue}
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/static/css/base-ryhx.css

@@ -277,12 +277,14 @@ body .layui-layer-tips .layui-layer-content{/* color:#000; */}
 .layui-layer-tips .layui-layer-content{background:rgb(10, 135, 165) !important;color:#fff;}
 body .layui-layer-tips i.layui-layer-TipsB, .layui-layer-tips i.layui-layer-TipsT{border-top-color: transparent; !important;border-top-style: solid;border-right-color: transparent !important;border-right-style: inherit;line-height: 0;border-color: transparent transparent rgb(10, 135, 165) transparent;border-style: dashed dashed solid dashed;}
 body .layui-layer-tips i.layui-layer-TipsB{top:-16px;}
-#content2 .new1:nth-child(1){margin-left: -296px;margin-top: -202px;}
-#content2 .new1:nth-child(2){margin-left: -319px;margin-top: -80px;}
-#content2 .new1:nth-child(3){margin-left: 69px;margin-top: -202px;}
-#content2 .new1:nth-child(4){margin-left: 90px;margin-top: -69px;}
-#content2 .new1:nth-child(5){margin-left: -347px;margin-top: 49px;}
-#content2 .new1:nth-child(6){margin-left: 67px;margin-top: 68px;}
+#content2 .new1:nth-child(1){margin-left: -305px;margin-top: -234px;}
+#content2 .new1:nth-child(2){margin-left: -323px;margin-top: -116px;}
+#content2 .new1:nth-child(3){margin-left: 76px;margin-top: -234px;}
+#content2 .new1:nth-child(4){margin-left: 98px;margin-top: -116px;}
+#content2 .new1:nth-child(5){margin-left: -347px;margin-top: -1px;}
+#content2 .new1:nth-child(6){margin-left: 115px;margin-top: -1px;}
+#content2 .new1:nth-child(7){margin-left: -370px;margin-top: 118px;}
+#content2 .new1:nth-child(8){margin-left: 131px;margin-top: 118px;}
 /**/
 /* @media screen and (max-width: 1600px){ 
 body{font-size: 10px;}

src/main/webapp/WEB-INF/jsp/ryhx/ryhx.jsp

@@ -73,28 +73,25 @@
         <div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>
       </div>
       <div id="content2" class="content" style="display:none;">
-          <div class="new1 tabs-o animated pulse">
-              <span class="tbs-title">${relationFilter.name}</span>
-              <div class="tbs-cont">
-                  <div class="fl count" onclick="tips(this)">3</div>
-                  <div class="fl ajbh">${relationFilter.value}</div>
-              </div>
-          </div>
           <c:forEach var="xnxx" items="${relationInList}">
-          <div class="new1 tabs-o animated pulse">
-          <span class="tbs-title">${xnxx.objectfromtypename}</span>
-          <div class="tbs-cont">
-              <div class="fl count" onclick="tips(this)">3</div>
-              <div class="fl ajbh">${xnxx.objectfromvalue}</div>
-          </div>
-          </div>
-          <div class="new1 tabs-o animated pulse" style="margin-left: -298px;margin-top: -266px;">
-          <span class="tbs-title">${xnxx.objecttotypename}</span>
-          <div class="tbs-cont">
-              <div class="fl count" onclick="tips(this)">3</div>
-              <div class="fl ajbh">${xnxx.objecttovalue}</div>
-          </div>
-          </div>
+              <c:if test="${not empty xnxx.objectfromtypename}" >
+                  <div class="new1 tabs-o animated pulse">
+                  <span class="tbs-title">${xnxx.objectfromtypename}</span>
+                  <div class="tbs-cont">
+                      <div class="fl count" onclick="tips(this)">3</div>
+                      <div class="fl ajbh">${xnxx.objectfromvalue}</div>
+                  </div>
+                  </div>
+              </c:if>
+              <c:if test="${not empty xnxx.objecttotypename}" >
+                  <div class="new1 tabs-o animated pulse">
+                  <span class="tbs-title">${xnxx.objecttotypename}</span>
+                  <div class="tbs-cont">
+                      <div class="fl count" onclick="tips(this)">3</div>
+                      <div class="fl ajbh">${xnxx.objecttovalue}</div>
+                  </div>
+                  </div>
+              </c:if>
           </c:forEach>
       </div>
       <div id="content3" class="content" style="display:none;">