人员画像同住人员和网吧信息接口，数据源调整

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

-package com.founder.interservice.mapper.xzxt;
+package com.founder.interservice.mapper.cqxz;
 
 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.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
-import com.founder.interservice.ryhx.model.TbStCqhotelData;
 
 import java.util.List;
 import java.util.Map;

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

@@ -139,7 +139,7 @@ public class RyhxController {
         SysDictitem sysDictitem = new SysDictitem();
         List<TbStCqwbdata> tbStCqwbdataList = null;//本人上网信息
         List<TbStCqhotelData> listHotelData = null;//本人住店信息
-        List<TbStCqhotelData> listOtherHotelData = null;//本人同住人信息
+        List<TbStCqhotelData> listOtherHotelData = new ArrayList<>();//本人所有同住人信息
         try{
             if(zjhm != null &&  !"".equals(zjhm)){
                 //旅店住宿信息
@@ -156,7 +156,9 @@ public class RyhxController {
                         }
                         //根据旅店信息，查询同住人员信息
                         if (null != tbStCqhotel) {
-                            listOtherHotelData =  ryhxService.queryHotelxx(zjhm,hotelno,rzsj,roomno);
+                            //当前酒店同住人员信息
+                            List<TbStCqhotelData> listOneHotelData = ryhxService.queryHotelxx(zjhm,hotelno,rzsj,roomno);
+                            listOtherHotelData.addAll(listOneHotelData);
                         }
                     }
                 }

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.mapper.cqxz.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 com.founder.interservice.util.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/resources/application-dev.yml

@@ -10,6 +10,11 @@ spring:
       username: XZXT
       password: XZXT
       url: jdbc:oracle:thin:@192.168.1.116:1521:xzxtcp
+    cqxz:
+      driver-class-name: oracle.jdbc.driver.OracleDriver
+      username: XZXT
+      password: XZXT
+      url: jdbc:oracle:thin:@47.92.129.99:1600:orcl
   #配置jpa 使其展示sql语句
   jpa:
     show-sql: true

src/main/resources/mybatis/mapper/xzxt/RyhxMapper.xml → src/main/resources/mybatis/mapper/cqxz/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">
+<mapper namespace="com.founder.interservice.mapper.cqxz.RyhxMapper">
     <sql id = "getHoteldetail_where">
         <if test="xxzjbh != null and xxzjbh != ''">
             and xxzjbh = #{xxzjbh, jdbcType=VARCHAR}