Merge branch 'master' of http://47.92.108.28/caopeng/bigdatainterservice

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

+package com.founder.interservice.mapper.xzxt;
+
+import com.founder.interservice.ryhx.model.TbStCqhotel;
+import com.founder.interservice.ryhx.model.TbStCqwbdata;
+import com.founder.interservice.ryhx.vo.TbStCqwbdataVOS;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+import com.founder.interservice.ryhx.model.TbStCqhotelData;
+
+@Mapper
+@Repository
+public interface RyhxMapper {
+
+    TbStCqhotel queryHotelAddr(String hotelno) throws Exception;
+
+    TbStCqhotelData queryHotelDetail(String hotelno) throws Exception;
+
+    TbStCqwbdataVOS queryWbxx(String zjhm) throws Exception;
+}

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

@@ -3,6 +3,11 @@ 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.ryhx.model.TbStCqhotel;
+import com.founder.interservice.ryhx.model.TbStCqhotelData;
+import com.founder.interservice.ryhx.model.TbStCqwbdata;
+import com.founder.interservice.ryhx.service.RyhxService;
+import com.founder.interservice.ryhx.vo.TbStCqwbdataVOS;
 import com.founder.interservice.service.DataService;
 import com.founder.interservice.service.SysDictService;
 import com.founder.interservice.util.Qgckzp;
@@ -23,12 +28,14 @@ public class RyhxController {
     private SysDictService sysDictService;
     @Autowired
     private DataService dataService;
-    List<Relation> relationInList = new ArrayList<Relation>();
-    List<Relation> relationLaList = new ArrayList<Relation>();
+    @Autowired
+    private RyhxService ryhxService;
     Relation relation = new Relation();
     Relation relaFilter = new Relation();
     private AutoTbStRy ryxx;
-    int z = 0;
+    /*List<Relation> relationInList = new ArrayList<Relation>();
+    List<Relation> relationLaList = new ArrayList<Relation>();
+    int z = 0;*/
 
     @RequestMapping(value = "/toRyhxJsp",method = {RequestMethod.GET,RequestMethod.POST})
     public ModelAndView toRyhxJsp(String zjhm){
@@ -53,12 +60,12 @@ public class RyhxController {
         }
         //户籍地
         code = ryxx.getHjdzXzqhdm();
-        sysDictitem.setCode(code);
-        sysDictitem.setGroupid("CODE_UNIT");
-        if(code != null && !"".equals(code)){
-             String hjdzDzmc = sysDictService.getCodeName(sysDictitem);
-             ryxx.setHjmc(hjdzDzmc);
-        }
+            sysDictitem.setCode(code);
+            sysDictitem.setGroupid("CODE_UNIT");
+            if(code != null && !"".equals(code)){
+                String hjdzDzmc = sysDictService.getCodeName(sysDictitem);
+                ryxx.setHjmc(hjdzDzmc);
+            }
         //民族
         code = ryxx.getMzdm();
         sysDictitem.setCode(code);
@@ -99,6 +106,52 @@ public class RyhxController {
         modelAndView.addObject("zjhm",zjhm);
         return modelAndView;
     }
+    /*旅店信息查询
+    查询表为TB_ST_CQHOTELDATA
+    网吧信息查询
+    查询表为TB_ST_CQWBDATA
+    * */
+    @RequestMapping(value = "/getLdjbxx",method = {RequestMethod.GET,RequestMethod.POST})
+    public ModelAndView getLdjbxx(String zjhm){
+        TbStCqhotelData tbStCqhotelData =  null;
+        TbStCqhotel tbStCqhotel = null;
+        SysDictitem sysDictitem = new SysDictitem();
+        TbStCqwbdataVOS tbStCqwbdataVOS = null;
+        try{
+            if(zjhm != null &&  !"".equals(zjhm)){
+                String idcode = zjhm;
+                //旅店信息
+                tbStCqhotelData = ryhxService.queryHotelxx(idcode);
+                String hotelno = tbStCqhotelData.getHotelno();
+                //疑似落脚点
+                if(hotelno != null && !"".equals(hotelno)){
+                    tbStCqhotel = ryhxService.queryHotelAddr(hotelno);
+                }
+                //网吧信息
+                tbStCqwbdataVOS = ryhxService.queryWbxx(zjhm);
+                if(tbStCqwbdataVOS !=null) {
+                    String wbxzqh = tbStCqwbdataVOS.getWbxzqh();
+                    sysDictitem.setCode(wbxzqh);
+                    sysDictitem.setGroupid("CODE_UNIT");
+                    if (wbxzqh != null && !"".equals(wbxzqh)) {
+                        String wbxzqhmc = sysDictService.getCodeName(sysDictitem);
+                        tbStCqwbdataVOS.setWbxzqhmc(wbxzqhmc);
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        ModelAndView modelAndView = new ModelAndView("ryhx/ryhx");
+        modelAndView.addObject("zjhm",zjhm);
+        modelAndView.addObject("hotel",tbStCqhotelData);
+        modelAndView.addObject("hotela",tbStCqhotel);
+        modelAndView.addObject("wbxx",tbStCqwbdataVOS);
+        return modelAndView;
+    }
+
+
+    /*轨迹信息查询*/
 
     /*暂时不用该方法
     虚拟信息查询

src/main/java/com/founder/interservice/ryhx/model/TbStCqhotel.java

+package com.founder.interservice.ryhx.model;
+
+import lombok.Data;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Entity
+@DynamicUpdate
+@Data
+public class TbStCqhotel {
+    @Id
+    private String hno;//旅店编号，主键
+
+    private String hname;//旅店名称
+
+    private String haddress;//旅店详细地址
+
+    private String telphone;//旅店电话
+
+    private String hroomnum;//旅店房间总数
+
+    private String legalperson;//法人名称
+
+    private String principal;//主要负责人名称
+
+    private String socialduty;//负责人名称
+
+    private String hlat;//旅店位置纬度
+
+    private String hlong;//旅店位置经度
+
+    private String pcscode;//派出所代码
+
+    private String pcsname;//派出所名称
+
+    private String pcsdh;//派出所电话
+
+    private Date gxsj;//更新时间
+
+    private Date rksj;//入库时间
+}

src/main/java/com/founder/interservice/ryhx/model/TbStCqhotelData.java

+package com.founder.interservice.ryhx.model;
+
+import lombok.Data;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Entity
+@DynamicUpdate
+@Data
+public class TbStCqhotelData {
+    @Id
+    private String xxzjbh;//旅店编号，主键
+
+    private String xm;//姓名
+
+    private String py;//拼音
+
+    private String idcode;//身份证号
+
+    private String csrq;//出生日期
+
+    private String xb;//性别
+
+    private String mz;//名族
+
+    private String address;//户籍地址
+
+    private String hotelno;//旅店编号
+
+    private String roomno;//房间号码
+
+    private String createtime;//创建时间
+
+    private String rksj;//入库时间
+
+    private String gxsj;//更新时间
+
+}
\ No newline at end of file

src/main/java/com/founder/interservice/ryhx/model/TbStCqwbdata.java

+package com.founder.interservice.ryhx.model;
+
+import lombok.Data;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@DynamicUpdate
+@Data
+public class TbStCqwbdata {
+    @Id
+    private String xxzjbh;//信息主键编号，主键
+
+    private String wbdm;//网吧代码
+
+    private String wbmc;//网吧名称
+
+    private String wbxzqh;//网吧行政区划代码
+
+    private String wbdz;//网吧地址
+
+    private String xm;//姓名
+
+    private String sex;//性别
+
+    private String csrq;//出生日期
+
+    private String zjhm;//证件号码
+
+    private String gj;//国籍
+
+    private String mz;//民族
+
+    private String address;//户籍地址
+
+    private String swkssj;//上网开始时间
+
+    private String swjssj;//上网结束时间
+
+    private String swzwh;//上网座位号
+
+    private String createtime;//创建时间
+
+    private String rksj;//入库时间
+
+    private String gxsj;//更新时间
+
+    private String wbxzqhmc;//网吧行政区划名称
+}

src/main/java/com/founder/interservice/ryhx/model/TbStCqwbxx.java

+package com.founder.interservice.ryhx.model;
+
+import lombok.Data;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@DynamicUpdate
+@Data
+public class TbStCqwbxx {
+    @Id
+    private String wbno;//网吧编号，主键
+
+    private String wbname;//网吧名称
+
+    private String wbaddress;//网吧详细地址
+
+    private String telphone;//网吧电话
+
+    private String boss;//老板姓名
+
+    private String wblat;//网吧位置纬度
+
+    private String wblong;//网吧位置经度
+
+    private String pcscode;//派出所代码
+
+    private String pcsname;//派出所名称
+
+    private String gxsj;//更新时间
+
+    private String rksj;//入库时间
+}

src/main/java/com/founder/interservice/ryhx/service/RyhxService.java

+package com.founder.interservice.ryhx.service;
+
+import com.founder.interservice.ryhx.model.TbStCqhotel;
+import com.founder.interservice.ryhx.model.TbStCqhotelData;
+import com.founder.interservice.ryhx.model.TbStCqwbdata;
+import com.founder.interservice.ryhx.vo.TbStCqwbdataVOS;
+import org.apache.poi.ss.formula.functions.T;
+
+/**
+ * @ClassName： RyhxService
+ * @Auther： 朱琳瑛
+ * @Description: java类作用描述
+ * @CreateDate： 2019-04-27 14:16
+ * @Version: 1.0
+ */
+public interface RyhxService {
+
+    TbStCqhotel queryHotelAddr(String hotelno) throws Exception;
+
+    TbStCqhotelData queryHotelxx(String idcode) throws Exception;
+
+    TbStCqwbdataVOS queryWbxx(String zjhm) throws Exception;
+}

src/main/java/com/founder/interservice/ryhx/service/impl/RyhxServiceImpl.java

+package com.founder.interservice.ryhx.service.impl;
+
+import com.founder.interservice.mapper.xzxt.RyhxMapper;
+import com.founder.interservice.ryhx.model.TbStCqhotel;
+import com.founder.interservice.ryhx.model.TbStCqhotelData;
+import com.founder.interservice.ryhx.model.TbStCqwbdata;
+import com.founder.interservice.ryhx.service.RyhxService;
+import com.founder.interservice.ryhx.vo.TbStCqwbdataVOS;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class RyhxServiceImpl implements RyhxService {
+    @Autowired
+    private RyhxMapper ryhxMapper;
+
+    /*根据证旅店编号查询旅店地址*/
+   @Override
+    public TbStCqhotel queryHotelAddr(String hotelno)throws Exception {
+       TbStCqhotel tbStCqhotel = ryhxMapper.queryHotelAddr(hotelno);
+        return tbStCqhotel;
+    }
+    /*根据旅店编号查找旅店详细信息*/
+    @Override
+    public TbStCqhotelData  queryHotelxx(String idcode) throws Exception{
+        TbStCqhotelData tbStCqhotelData = ryhxMapper.queryHotelDetail(idcode);
+        return tbStCqhotelData;
+    }
+    /*根据证件号码查询网吧表网吧信息*/
+    @Override
+    public TbStCqwbdataVOS queryWbxx(String zjhm) throws Exception{
+        TbStCqwbdataVOS tbStCqwbdataVOS = ryhxMapper.queryWbxx(zjhm);
+        return  tbStCqwbdataVOS;
+    }
+}

src/main/java/com/founder/interservice/ryhx/vo/TbStCqwbdataVOS.java

+package com.founder.interservice.ryhx.vo;
+
+import lombok.Data;
+
+@Data
+public class TbStCqwbdataVOS {
+    private String xxzjbh;//信息主键编号，主键
+
+    private String wbdm;//网吧代码
+
+    private String wbmc;//网吧名称
+
+    private String wbxzqh;//网吧行政区划代码
+
+    private String wbdz;//网吧地址
+
+    private String xm;//姓名
+
+    private String sex;//性别
+
+    private String csrq;//出生日期
+
+    private String zjhm;//证件号码
+
+    private String gj;//国籍
+
+    private String mz;//民族
+
+    private String address;//户籍地址
+
+    private String swkssj;//上网开始时间
+
+    private String swjssj;//上网结束时间
+
+    private String swzwh;//上网座位号
+
+    private String createtime;//创建时间
+
+    private String rksj;//入库时间
+
+    private String gxsj;//更新时间
+
+    private String wbxzqhmc;//网吧行政区划名称
+}

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.founder.interservice.mapper.xzxt.RyhxMapper">
+    <sql id = "getHoteldetail_where">
+        <if test="xxzjbh != null and xxzjbh != ''">
+            and xxzjbh = #{xxzjbh}
+        </if>
+        <if test="xm != null and xm != ''">
+            and xm = #{xm}
+        </if>
+        <if test="py != null and py != ''">
+            and py = #{py}
+        </if>
+        <if test="idcode != null and idcode != ''">
+            and idcode = #{idcode}
+        </if>
+        <if test="csrq != null and csrq != ''">
+            and csrq = #{csrq}
+        </if>
+        <if test="xb != null and xb != ''">
+            and xb = #{xb}
+        </if>
+        <if test="mz != null and mz != ''">
+            and mz = #{mz}
+        </if>
+        <if test="address != null and address != ''">
+            and address = #{address}
+        </if>
+        <if test="hotelno != null and hotelno != ''">
+            and hotelno = #{hotelno}
+        </if>
+        <if test="roomno != null and roomno != ''">
+            and roomno = #{roomno}
+        </if>
+        <if test="createtime != null and createtime != ''">
+            and createtime = #{createtime}
+        </if>
+        <if test="rksj != null and rksj != ''">
+            and rksj = #{rksj}
+        </if>
+        <if test="gxsj != null and gxsj != ''">
+            and gxsj = #{gxsj}
+        </if>
+    </sql>
+    <select id="queryHotelAddr" parameterType="java.lang.String" resultType="com.founder.interservice.ryhx.model.TbStCqhotel">
+        select
+        hno as hno,
+        hname as hname,
+        haddress as haddress,
+        telphone as telphone,
+        hroomnum as hroomnum,
+        legalperson as legalperson,
+        principal as principal,
+        socialduty as socialduty,
+        hlat as hlat,
+        hlong as hlong,
+        pcscode as pcscode,
+        pcsname as pcsname,
+        pcsdh as pcsdh,
+        gxsj as gxsj,
+        rksj as rksj
+        from TB_ST_CQHOTEL
+        where HNO = #{hotelno}
+    </select>
+    <select id="queryHotelDetail" parameterType="String" resultType="com.founder.interservice.ryhx.model.TbStCqhotelData">
+        select
+        hotelno as hotelno,
+        createtime as createtime,
+        rksj as rksj,
+        gxsj as gxsj
+        from TB_ST_CQHOTELDATA
+        where IDCODE = #{idcode}
+    </select>
+    <select id="queryWbxx" parameterType="String" resultType="com.founder.interservice.ryhx.vo.TbStCqwbdataVOS">
+        select
+        wbmc as wbmc,
+        wbxzqh as wbxzqh,
+        wbdz as wbdz
+        from TB_ST_CQWBDATA
+        where ZJHM = #{zjhm}
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -285,14 +285,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: -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;}
+#content2 .new1:nth-child(1),#content3 .new1:nth-child(1){margin-left: -305px;margin-top: -234px;}
+#content2 .new1:nth-child(2),#content3 .new1:nth-child(2){margin-left: -323px;margin-top: -116px;}
+#content2 .new1:nth-child(3),#content3 .new1:nth-child(3){margin-left: 76px;margin-top: -234px;}
+#content2 .new1:nth-child(4),#content3 .new1:nth-child(4){margin-left: 98px;margin-top: -116px;}
+#content2 .new1:nth-child(5),#content3 .new1:nth-child(5){margin-left: -347px;margin-top: -1px;}
+#content2 .new1:nth-child(6),#content3 .new1:nth-child(6){margin-left: 115px;margin-top: -1px;}
+#content2 .new1:nth-child(7),#content3 .new1:nth-child(7){margin-left: -370px;margin-top: 118px;}
+#content2 .new1:nth-child(8),#content3 .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/jbxx.jsp

+<div id="content1" class="content">
+    <div id ="zjhm">${zjhm}</div>
+    <div class="new1 animated pulse"><span class="zdm"><span class="birthdate">姓名：${ryxx.xm}</span></div>
+    <!--一条折线对应一条内容，左侧-->
+    <div class="new2 animated pulse"><span class="address">性别：${ryxx.xbdm}</span></div>
+    <!--一条折线对应一条内容，左侧-->
+    <div class="new3 animated pulse"><span class="hjxx">电话：${ryxx.lxdh}</span></div>
+    <!--一条折线对应一条内容，左侧-->
+    <div class="new4 animated pulse"><span class="others1">民族：${ryxx.mzdmmc}</span></div>
+    <!--一条折线对应一条内容，左侧-->
+    <div class="new5 animated pulse"><span class="others2">户籍地：${ryxx.csdDzmc}</span></div>
+    <!--一条折线对应一条内容，左侧-->
+    <div class="new6 animated pulse"><span class="others3">现住地：${ryxx.xzzDzmc}</span></div>
+    <div class="new7 animated pulse w69"><span class="others4">常用证件号码：${ryxx.cyzjZjhm}</span></div>
+    <%--<div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>--%>
+</div>
+<script type="text/javascript" src="/js/jquery-1.11.3.js"></script>
\ No newline at end of file

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

@@ -26,9 +26,9 @@
     <!--title start-->
     <!--菜单-->
     <ul class="hx-menu">
-      <li onclick="toggle(this)" class="current"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>基本信息</li>
+      <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>基本信息</li>
       <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>虚拟信息</li>
-      <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>轨迹信息</li>
+      <li onclick="toggle(this)" class="current"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>轨迹信息</li>
       <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>背景信息</li>
       <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>涉案信息</li>
       <li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>生物信息</li>
@@ -49,16 +49,8 @@
     <!--title start-->
     <div class="right-people">
       <img src="/images/people.png" class="people" style=""/>
-      <div id="content1" class="content">
-        <%--<div class="tabs-o animated pulse">
-          <span class="tbs-title">轨迹</span>
-          <div class="tbs-cont">
-              <div class="fl count" onclick="tips(this)">3</div>
-              <div class="fl ajbh">A1404245921558722</div>
-          </div>
-        </div>--%>
-        <!--一条折线对应一条内容，左侧-->
-            <div id ="zjhm">${zjhm}</div>
+     <div id="content1" class="content">
+            <div id ="zjhm" style="display:none">${zjhm}</div>
         <div class="new1 animated pulse"><span class="zdm"><span class="birthdate">姓名：${ryxx.xm}</span></div>
         <!--一条折线对应一条内容，左侧-->
         <div class="new2 animated pulse"><span class="address">性别：${ryxx.xbdm}</span></div>
@@ -71,7 +63,7 @@
         <!--一条折线对应一条内容，左侧-->
         <div class="new6 animated pulse"><span class="others3">现住地：${ryxx.xzzDzmc}</span></div>
         <div class="new7 animated pulse w69"><span class="others4">常用证件号码：${ryxx.cyzjZjhm}</span></div>
-        <%--<div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>--%>
+        &lt;%&ndash;<div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>&ndash;%&gt;
       </div>
       <div id="content2" class="content" style="display:none;">
           <c:forEach var="xnxx" items="${relationList}">
@@ -94,42 +86,65 @@
               </div>
       </div>
       <div id="content3" class="content" style="display:none;">
-        <div class="new1 tabs-o animated pulse" style="margin-left: -298px;">
+        <div class="new1 tabs-o animated pulse" >
           <span class="tbs-title">疑似落脚点</span>
           <div class="tbs-cont">
               <div class="fl count" onclick="tips(this)">3</div>
-              <div class="fl ajbh">重庆市北碚区中庚城秋园酒店</div>
+              <div class="fl ajbh">${hotela.haddress}</div>
           </div>
         </div>
-        <div class="new2 tabs-o animated pulse" style="margin-left: -292px;margin-top: -123px;">
+        <div class="new1 tabs-o animated pulse" style="">
             <span class="tbs-title">出行方式</span>
             <div class="tbs-cont">
                 <div class="fl count" onclick="tips(this)">3</div>
                 <div class="fl ajbh">飞机</div>
             </div>
         </div>
-        <div class="new3 tabs-o animated pulse" style="margin-left: 85px;">
+          <%--酒店信息--%>
+        <div class="new1 tabs-o animated pulse" >
           <span class="tbs-title">入住偏好时间</span>
           <div class="tbs-cont">
               <div class="fl count" onclick="tips(this)">3</div>
-              <div class="fl ajbh">早晨（08:00——11:00）</div>
+              <div class="fl ajbh">${hotel.createtime}</div>
           </div>
         </div>
-        <div class="new4 tabs-o animated pulse" style="margin-left: 102px;">
+        <div class="new1 tabs-o animated pulse">
           <span class="tbs-title">退房偏好时间</span>
           <div class="tbs-cont">
               <div class="fl count" onclick="tips(this)">3</div>
-              <div class="fl ajbh">下午（18:00——20:00）</div>
+              <div class="fl ajbh">${hotel.gxsj}</div>
+          </div>
+        </div>
+        <%--<div class="new1 tabs-o animated pulse">
+          <span class="tbs-title">疑似活动区域</span>
+          <div class="tbs-cont">
+              <div class="fl count" onclick="tips(this)">3</div>
+              <div class="fl ajbh">重庆市刑警总队</div>
           </div>
+      </div>--%>
+          <%--网吧信息--%>
+        <div class="new1 tabs-o animated pulse">
+            <span class="tbs-title">网吧名称</span>
+            <div class="tbs-cont">
+                 <div class="fl count" onclick="tips(this)">3</div>
+                 <div class="fl ajbh">${wbxx.wbmc}</div>
+            </div>
         </div>
-        <div class="new5 tabs-o animated pulse" style="margin-left: -292px;margin-top: 0px;">
+        <div class="new1 tabs-o animated pulse">
             <span class="tbs-title">疑似活动区域</span>
             <div class="tbs-cont">
-                <div class="fl count" onclick="tips(this)">3</div>
-                <div class="fl ajbh">重庆市刑警总队</div>
+                  <div class="fl count" onclick="tips(this)">3</div>
+                  <div class="fl ajbh">${wbxx.wbxzqhmc}</div>
             </div>
         </div>
-        <%--<!--一条折线对应一条内容，左侧-->
+        <div class="new1 tabs-o animated pulse">
+             <span class="tbs-title">网吧地址</span>
+             <div class="tbs-cont">
+                  <div class="fl count" onclick="tips(this)">3</div>
+                  <div class="fl ajbh">${wbxx.wbdz}</div>
+             </div>
+        </div>
+      <%--<!--一条折线对应一条内容，左侧-->
         <div class="new1 animated pulse w130" style="margin-left: -298px;"><span class="birthdate" style="margin-top: 58px;">疑似落脚点：重庆市北碚区中庚城</span></div>
         <!--一条折线对应一条内容，左侧-->
         <div class="new3 animated pulse w130"><span class="hjxx">入住偏好时间：早晨（08:00——11:00）</span></div>
@@ -264,14 +279,12 @@
           $(".right-xx .title").text($(obj).text());
           $(".right-people .content").hide();
           $("#content"+ind).show();
-         /* if(ind=="0"){
+         /*if(ind=="1"){
               url="/toRyhxJsp?yhCate=00&projectName=00&zjhm="+zjhm;
               $("#content1").load(url);
-          }else if(ind=="1"){
+          }else if(ind=="2"){
               url="/getXnsfxx?yhCate=00&projectName=00&zjhm="+zjhm;
               $("#content2").load(url);
-          }else if(ind=="2"){
-
           }else if(ind=="3"){
 
           }else if(ind=="4"){
@@ -282,6 +295,8 @@
 
           }else if(ind=="7"){
 
+          }else if(ind=="8"){
+
           }*/
       }
   </script>

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

+<div id="content2" class="content" style="display:none;">
+    <c:forEach var="xnxx" items="${relationList}">
+        <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:forEach>
+    <div class="new1 tabs-o animated pulse">
+        <span class="tbs-title">身份证号码</span>
+        <div class="tbs-cont">
+            <div class="fl count" onclick="tips(this)">3</div>
+            <div class="fl ajbh">${zjhm}</div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript" src="/js/jquery-1.11.3.js"></script>
\ No newline at end of file