修改数据工厂查询

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

@@ -20,6 +20,8 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
     private HttpServletRequest request;
     public HttpServletResponse response;
 
+    public Integer type;//1.今日 2.本月 3.本年
+
     @Resource
     private IDCService idcService;
 
@@ -50,7 +52,7 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
     public String getBookStatusData(){
         JSONObject resultJson = new JSONObject();
         List<IDCBookStatusEto> list = idcService.getBookStatusData();
-        if (list == null && list.size()==0) {
+        if (list == null) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -70,14 +72,14 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
     public String getHotelData() {
         JSONObject resultJson = new JSONObject();
         List<IDCHotelEto> list = idcService.getHotelData();
-        if (list == null && list.size()==0) {
+        if (list == null) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
         resultJson.put("message", "查询成功");
-        resultJson.put("code", 500);
+        resultJson.put("code", 200);
         resultJson.put("data", list);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
@@ -89,15 +91,25 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
      */
     public String getRankBookNumData() {
         JSONObject resultJson = new JSONObject();
-        List<IDCRankEto> list = idcService.getRankBookNumData();
-        if (list == null && list.size()==0) {
+        StringBuilder sqlx = new StringBuilder("");
+        if(type==1){
+            sqlx.append("AND DATE_FORMAT(pay_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')");
+        }
+        if(type==2){
+            sqlx.append("AND DATE_FORMAT(pay_time,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
+        }
+        if(type==3){
+            sqlx.append("AND DATE_FORMAT(pay_time,'%Y') = DATE_FORMAT(NOW(),'%Y')");
+        }
+        List<IDCRankEto> list = idcService.getRankBookNumData(sqlx.toString());
+        if (list == null) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
         resultJson.put("message", "查询成功");
-        resultJson.put("code", 500);
+        resultJson.put("code", 200);
         resultJson.put("data", list);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
@@ -109,15 +121,25 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
      */
     public String getRankSalesAmountData(){
         JSONObject resultJson = new JSONObject();
-        List<IDCRankEto> list = idcService.getRankSalesAmountData();
-        if (list == null && list.size()==0) {
+        StringBuilder sqlx = new StringBuilder("");
+        if(type==1){
+            sqlx.append("AND DATE_FORMAT(pay_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')");
+        }
+        if(type==2){
+            sqlx.append("AND DATE_FORMAT(pay_time,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
+        }
+        if(type==3){
+            sqlx.append("AND DATE_FORMAT(pay_time,'%Y') = DATE_FORMAT(NOW(),'%Y')");
+        }
+        List<IDCRankEto> list = idcService.getRankSalesAmountData(sqlx.toString());
+        if (list == null) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
         resultJson.put("message", "查询成功");
-        resultJson.put("code", 500);
+        resultJson.put("code", 200);
         resultJson.put("data", list);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;

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

@@ -38,7 +38,6 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
     public int page; // 当前页
     public int rows;// 每页显示的行数rows
     public String orderTime;//住房时间
-    public String houseName;//房型名称
 
     public String fileListJson;
 
@@ -299,11 +298,10 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
         if (orderTime!=null){
-            s1.append("  and DATE_FORMAT(order_start_time,'%Y-%m-%d') <= '").append(orderTime).append("'")
-                .append("  and DATE_FORMAT(order_end_time,'%Y-%m-%d') >= '").append(orderTime).append("'");
+            s1.append("  and DATE_FORMAT(order_start_time,'%Y-%m-%d') = '").append(orderTime).append("'");
         }
-        if (houseName!=null){
-            s1.append("  and house_name like '%").append(houseName).append("%'");
+        if (hName!=null){
+            s1.append("  and house_name like '%").append(hName).append("%'");
         }
         IPage<HouseSumEto> houseIPage = houseService.queryPageHouseSum(s1.toString(),page,rows);
         if(houseIPage!=null && !"".equals(houseIPage)){

mhotel/src/com/happy/dao/IDCDao.java

@@ -25,12 +25,12 @@ public interface IDCDao {
      * 描述：获取订单量排行
      * @return
      */
-    List<IDCRankEto> getRankBookNumData();
+    List<IDCRankEto> getRankBookNumData(String sqlx);
 
     /**
      * 描述：获取销售额排行
      * @return
      */
-    List<IDCRankEto> getRankSalesAmountData();
+    List<IDCRankEto> getRankSalesAmountData(String sqlx);
 
 }

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

@@ -199,6 +199,10 @@ public class HotelImplDao implements HotelDao {
             stringBuffer.append(" hname=:hname ,");
             sps.addValue("hname",hotel.getHname());
         }
+        if (!Func.checkNull(hotel.getCoverImg())){
+            stringBuffer.append(" cover_img=:cover_img ,");
+            sps.addValue("cover_img",hotel.getCoverImg());
+        }
         if (!Func.checkNull(hotel.getHposition())){
             stringBuffer.append(" hposition=:hposition ,");
             sps.addValue("hposition",hotel.getHposition());

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

@@ -54,8 +54,8 @@ public class IDCImplDao implements IDCDao {
     }
 
     @Override
-    public List<IDCRankEto> getRankBookNumData() {
-        String sql = "select a.*,@curRank := @curRank + 1 AS rank from (select hotel_name,count(1) book_num from booking where order_status=5 group by hotel_id ORDER BY count(1) DESC) a,(SELECT @curRank := 0) r";
+    public List<IDCRankEto> getRankBookNumData(String sqlx) {
+        String sql = "select a.*,@curRank := @curRank + 1 AS rank from (select hotel_name,count(1) book_num from booking where order_status=2 " +sqlx + " group by hotel_id ORDER BY count(1) DESC) a,(SELECT @curRank := 0) r";
         List<IDCRankEto> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(IDCRankEto.class));
@@ -67,8 +67,8 @@ public class IDCImplDao implements IDCDao {
     }
 
     @Override
-    public List<IDCRankEto> getRankSalesAmountData() {
-        String sql = "select a.*,@curRank := @curRank + 1 AS rank from (select hotel_name,sum(pay_account) salesAmount from booking where order_status=5 group by hotel_id ORDER BY sum(pay_account) DESC) a,(SELECT @curRank := 0) r";
+    public List<IDCRankEto> getRankSalesAmountData(String sqlx) {
+        String sql = "select a.*,@curRank := @curRank + 1 AS rank from (select hotel_name,sum(pay_account) salesAmount from booking where order_status=2 "+sqlx+" group by hotel_id ORDER BY sum(pay_account) DESC) a,(SELECT @curRank := 0) r";
         List<IDCRankEto> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(IDCRankEto.class));

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

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
 import java.util.ArrayList;
 import java.util.List;
 
-@Repository("UsersDao")
+@Repository("UserDao")
 public class UserDaoImpl implements UserDao {
 
     @Autowired

mhotel/src/com/happy/dto/IDCSum.java

@@ -1,4 +1,74 @@
 package com.happy.dto;
 
 public class IDCSum {
+
+    private Integer hotelSum;//民宿总数
+
+    private Integer bookNumDay;//今日订单量
+
+    private Double salesAmountDay;//今日销售量
+
+    private Integer bookNumyDay;//昨日订单量
+
+    private Double salesAmountyDay;//昨日销售量
+
+    private Double bookNumRatio;//订单量比例
+
+    private Double salesAmountRatio;//销售量比例
+
+    public Integer getHotelSum() {
+        return hotelSum;
+    }
+
+    public void setHotelSum(Integer hotelSum) {
+        this.hotelSum = hotelSum;
+    }
+
+    public Integer getBookNumDay() {
+        return bookNumDay;
+    }
+
+    public void setBookNumDay(Integer bookNumDay) {
+        this.bookNumDay = bookNumDay;
+    }
+
+    public Double getSalesAmountDay() {
+        return salesAmountDay;
+    }
+
+    public void setSalesAmountDay(Double salesAmountDay) {
+        this.salesAmountDay = salesAmountDay;
+    }
+
+    public Integer getBookNumyDay() {
+        return bookNumyDay;
+    }
+
+    public void setBookNumyDay(Integer bookNumyDay) {
+        this.bookNumyDay = bookNumyDay;
+    }
+
+    public Double getSalesAmountyDay() {
+        return salesAmountyDay;
+    }
+
+    public void setSalesAmountyDay(Double salesAmountyDay) {
+        this.salesAmountyDay = salesAmountyDay;
+    }
+
+    public Double getBookNumRatio() {
+        return bookNumRatio;
+    }
+
+    public void setBookNumRatio(Double bookNumRatio) {
+        this.bookNumRatio = bookNumRatio;
+    }
+
+    public Double getSalesAmountRatio() {
+        return salesAmountRatio;
+    }
+
+    public void setSalesAmountRatio(Double salesAmountRatio) {
+        this.salesAmountRatio = salesAmountRatio;
+    }
 }

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

@@ -24,12 +24,12 @@ public interface IDCService {
      * 描述：获取订单量排行
      * @return
      */
-    List<IDCRankEto> getRankBookNumData();
+    List<IDCRankEto> getRankBookNumData(String sqlx);
 
     /**
      * 描述：获取销售额排行
      * @return
      */
-    List<IDCRankEto> getRankSalesAmountData();
+    List<IDCRankEto> getRankSalesAmountData(String sqlx);
 
 }

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

@@ -27,12 +27,12 @@ public class IDCImplService implements IDCService {
     }
 
     @Override
-    public List<IDCRankEto> getRankBookNumData() {
-        return idcDao.getRankBookNumData();
+    public List<IDCRankEto> getRankBookNumData(String sqlx) {
+        return idcDao.getRankBookNumData(sqlx);
     }
 
     @Override
-    public List<IDCRankEto> getRankSalesAmountData() {
-        return idcDao.getRankSalesAmountData();
+    public List<IDCRankEto> getRankSalesAmountData(String sqlx) {
+        return idcDao.getRankSalesAmountData(sqlx);
     }
 }