添加接口小程序首页查询

mhotel/src/com/happy/Model/AdminManager.java

@@ -22,6 +22,11 @@ public class AdminManager {
 	 */
 	private Integer type;
 
+	/**
+	 * 全景链接
+	 */
+	private String linkProUrl;
+
 
 	/**
 	 * 所属商家Id
@@ -136,6 +141,14 @@ public class AdminManager {
 		this.type = type;
 	}
 
+	public String getLinkProUrl() {
+		return linkProUrl;
+	}
+
+	public void setLinkProUrl(String linkProUrl) {
+		this.linkProUrl = linkProUrl;
+	}
+
 	public Integer getManagerId() {
 		return managerId;
 	}

mhotel/src/com/happy/action/AppHomePageAction.java

@@ -3,19 +3,14 @@ package com.happy.action;
 import com.baidubce.model.User;
 import com.happy.Model.Hotel;
 import com.happy.Model.weixin.Users;
-import com.happy.Until.DateUtil;
+import com.happy.Until.*;
 import com.happy.Until.Enum.B;
 import com.happy.Until.Enum.TempEnum;
-import com.happy.Until.Func;
-import com.happy.Until.ResponseUtil;
-import com.happy.Until.ResultUtil;
 import com.happy.constant.ResultStatusCode;
 import com.happy.dao.UserVisitsDao;
 import com.happy.dto.IPage;
-import com.happy.service.AppHomePageService;
-import com.happy.service.FileService;
-import com.happy.service.HotelService;
-import com.happy.service.UserService;
+import com.happy.dto.townshipCountDTO;
+import com.happy.service.*;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
@@ -24,6 +19,7 @@ import org.apache.struts2.interceptor.ServletRequestAware;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 首页进去Action请求交互
@@ -43,6 +39,8 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
     public HotelService hotelService;
     @Resource
     public FileService fileService;
+    @Resource
+    public AdminManagerService adminManagerService;
 
     public int page; // 当前页
     public int rows;// 每页显示的行数rows
@@ -57,6 +55,7 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
     public String queryValue; // 首页查寻搜索关键词
     private String hotel_township; // 所属乡镇
     public String userId; // 用户id
+    public int type;
 
     public HttpServletRequest getRequest() {
         return request;
@@ -121,8 +120,7 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
     public String homePage()
     {
         // 获取民宿列表
-        IPage iPage = appHomePageService.getHotelList(queryValue, hotel_township,page,rows);
-
+        IPage iPage = appHomePageService.getHotelList(queryValue, hotel_township,type,page,rows);
         // 用户访问量数据
         userVisitsDao.add(userId);
         ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(),iPage);
@@ -251,6 +249,47 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
 
 
 
+    /**
+     * 描述：获取各乡俗民宿级别数量
+     * @return
+     */
+    public String getTownshipCount(){
+        JSONObject resultjson = new JSONObject();
+        List<townshipCountDTO> list = adminManagerService.getTownshipCount();
+        if (list!=null){
+            resultjson.put("message", "返回成功");
+            resultjson.put("code", 200);
+            resultjson.put("data",list);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+            return null;
+        }
+        resultjson.put("message", "数据为空");
+        resultjson.put("code", 205);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+        return null;
+    }
+
+    /**
+     * 描述：获取各乡镇剩余房数
+     * @return
+     */
+    public String getResidueCount(){
+        JSONObject resultjson = new JSONObject();
+        List<townshipCountDTO> list = adminManagerService.getResidueCount();
+        if (list!=null){
+            resultjson.put("message", "返回成功");
+            resultjson.put("code", 200);
+            resultjson.put("data",list);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+            return null;
+        }
+        resultjson.put("message", "数据为空");
+        resultjson.put("code", 205);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+        return null;
+    }
+
+
     public String getUserCode() {
         return userCode;
     }

mhotel/src/com/happy/action/adminManagerAction.java

@@ -730,44 +730,4 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
         return null;
     }
 
-    /**
-     * 描述：获取各乡俗民宿级别数量
-     * @return
-     */
-    public String getTownshipCount(){
-        JSONObject resultjson = new JSONObject();
-        List<townshipCountDTO> list = adminManagerService.getTownshipCount();
-        if (list!=null){
-            resultjson.put("message", "返回成功");
-            resultjson.put("code", 200);
-            resultjson.put("data",list);
-            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
-            return null;
-        }
-        resultjson.put("message", "数据为空");
-        resultjson.put("code", 205);
-        ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
-        return null;
-    }
-
-    /**
-     * 描述：获取各乡镇剩余房数
-     * @return
-     */
-    public String getResidueCount(){
-        JSONObject resultjson = new JSONObject();
-        List<townshipCountDTO> list = adminManagerService.getResidueCount();
-        if (list!=null){
-            resultjson.put("message", "返回成功");
-            resultjson.put("code", 200);
-            resultjson.put("data",list);
-            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
-            return null;
-        }
-        resultjson.put("message", "数据为空");
-        resultjson.put("code", 205);
-        ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
-        return null;
-    }
-
 }

mhotel/src/com/happy/dao/impl/AdminManagerImplDao.java

@@ -32,7 +32,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
 
     public String selectSql =
         "select " +
-        "a.id, a.type, a.manager_id, a.admin_name, a.hotel_name, a.hotel_township, b.name hotel_township_name, a.corpn_name, a.corpn_phone, a.level, a.admin_power, a.bank_card, a.card_name, a.bank_name, a.create_id, DATE_FORMAT(a.create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(a.modify_date,'%Y-%m-%d %T') modify_date,a.status,a.remark,a.openid " +
+        "a.id, a.type, a.manager_id, a.linkpro_url, a.admin_name, a.hotel_name, a.hotel_township, b.name hotel_township_name, a.corpn_name, a.corpn_phone, a.level, a.admin_power, a.bank_card, a.card_name, a.bank_name, a.create_id, DATE_FORMAT(a.create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(a.modify_date,'%Y-%m-%d %T') modify_date,a.status,a.remark,a.openid " +
         "from `admin_manager` a " +
         "left join hotel_dict b on a.hotel_township = b.id";
 
@@ -40,13 +40,14 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public int insertAdmin(AdminManager adminManager) {
 
-        String sql = "INSERT INTO admin_manager (id, type, manager_id, admin_name, password, hotel_name, hotel_township, corpn_name, corpn_phone, level, admin_power, bank_card, card_name, bank_name, create_id, create_date, status, remark) VALUES (:id, :type, :manager_id ,:admin_name, :password, :hotel_name, :hotel_township, :corpn_name, :corpn_phone, :level, :admin_power, :bank_card, :card_name, :bank_name, :create_id, :create_date, :status, :remark)";
+        String sql = "INSERT INTO admin_manager (id, type, manager_id, admin_name, password, linkpro_url, hotel_name, hotel_township, corpn_name, corpn_phone, level, admin_power, bank_card, card_name, bank_name, create_id, create_date, status, remark) VALUES (:id, :type, :manager_id ,:admin_name, :password, :linkpro_url, :hotel_name, :hotel_township, :corpn_name, :corpn_phone, :level, :admin_power, :bank_card, :card_name, :bank_name, :create_id, :create_date, :status, :remark)";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("type", adminManager.getType());
         sps.addValue("manager_id", adminManager.getManagerId());
         sps.addValue("admin_name", adminManager.getAdminName());
         sps.addValue("password", adminManager.getPassword());
+        sps.addValue("linkpro_url", adminManager.getLinkProUrl());
         sps.addValue("hotel_name", adminManager.getHotelName());
         sps.addValue("hotel_township", adminManager.getHotelTownship());
         sps.addValue("corpn_name", adminManager.getCorpnName());
@@ -201,6 +202,15 @@ public class AdminManagerImplDao implements AdminManagerDao {
     }
 
     public void appendValue(AdminManager adminManager, StringBuffer stringBuffer, MapSqlParameterSource sps){
+
+        if (!Func.checkNull(String.valueOf(adminManager.getType()))){
+            stringBuffer.append(" type=:type ,");
+            sps.addValue("type", adminManager.getType());
+        }
+        if (!Func.checkNull(adminManager.getLinkProUrl())){
+            stringBuffer.append(" linkpro_url=:linkpro_url ,");
+            sps.addValue("linkpro_url", adminManager.getLinkProUrl());
+        }
         if (!Func.checkNull(adminManager.getAdminName())){
             stringBuffer.append(" admin_name=:admin_name ,");
             sps.addValue("admin_name", adminManager.getAdminName());

mhotel/src/com/happy/dao/impl/HotelImplDao.java

@@ -171,7 +171,7 @@ public class HotelImplDao implements HotelDao {
         int start = (page - 1) * rows;// 每页的起始下标
         String sql = "SELECT a.*,b.min_price,c.hotel_township,d.hotel_township_name, e.h_type_name,c.hotel_name FROM `hotel` a " +
                 "left join (select manager_id,min(price) min_price from house where status=1 group by manager_id) b on a.manager_id = b.manager_id " +
-                "left join (select id,manager_id,hotel_township,hotel_name from admin_manager ) c on a.manager_id = c.id " +
+                "left join (select id,manager_id,hotel_township,hotel_name,type from admin_manager ) c on a.manager_id = c.id " +
                 "LEFT JOIN (  SELECT  id,name as hotel_township_name  FROM  hotel_dict GROUP BY  id) d ON d.id = c.hotel_township " +
                 "LEFT JOIN (  SELECT  id,name as h_type_name  FROM  hotel_dict GROUP BY  id) e ON e.id = a.htype      " +
                 " WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
@@ -192,7 +192,7 @@ public class HotelImplDao implements HotelDao {
         SqlUtil.filterKeyword(sqlx);
         String sql = "SELECT count(*) FROM `hotel` a " +
                 "left join (select manager_id,min(price) min_price from house where status=1 group by manager_id) b on a.manager_id = b.manager_id " +
-                "left join (select manager_id,hotel_township hotel_township from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
+                "left join (select manager_id,hotel_township hotel_township,type from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
                 "LEFT JOIN (  SELECT  id,name as hotel_township_name  FROM  hotel_dict GROUP BY  id) d ON d.id = c.hotel_township " +
                 " WHERE status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();

mhotel/src/com/happy/service/AppHomePageService.java

@@ -22,6 +22,15 @@ public interface AppHomePageService {
     public IPage getHotelList(String queryValue,String hotel_township, int page, int rows);
 
     /**
+     * APP端进入首页查询功能
+     * @param queryValue
+     * @param page
+     * @param rows
+     * @return
+     */
+    IPage getHotelList(String queryValue,String hotel_township,int type, int page, int rows);
+
+    /**
      * 通过id 查询酒店信息
      * @param ids
      * @param page

mhotel/src/com/happy/service/impl/AppHomePageImplService.java

@@ -52,6 +52,21 @@ public class AppHomePageImplService implements AppHomePageService {
     }
 
     @Override
+    public IPage<Hotel> getHotelList(String queryValue,String hotel_township,int type, int page, int rows) {
+        StringBuilder strSql = new StringBuilder(" and hstatus=1 "); // 酒店正在营业中才显示
+        if (!Func.checkNull(queryValue)){
+            strSql.append(" and hname like '%").append(queryValue).append("%' ");
+        }
+        if (!Func.checkNull(hotel_township)){
+            strSql.append(" and c.hotel_township = '").append(hotel_township).append("' ");
+        }
+        if (!Func.checkNull(String.valueOf(type))){
+            strSql.append(" and c.type = '").append(type).append("' ");
+        }
+        return hotelService.queryPagePrice(strSql.toString(),page,rows);
+    }
+
+    @Override
     public IPage<Hotel> getHotelList(List<String> ids, int page, int rows) {
         if (ids == null || ids.size() <= 0 )
             return null;