数据中台

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

@@ -10,14 +10,17 @@ import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.ServletRequestAware;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 public class IDCAction extends ActionSupport implements ServletRequestAware {
 
     private HttpServletRequest request;
     public HttpServletResponse response;
 
+    @Resource
     private IDCService idcService;
 
     public HttpServletRequest getRequest() {
@@ -46,16 +49,16 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
      */
     public String getBookStatusData(){
         JSONObject resultJson = new JSONObject();
-        IDCBookStatusEto idcBookStatusEto = idcService.getBookStatusData();
-        if (idcBookStatusEto == null) {
+        List<IDCBookStatusEto> list = idcService.getBookStatusData();
+        if (list == null && list.size()==0) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
         resultJson.put("message", "查询成功");
-        resultJson.put("code", 500);
-        resultJson.put("data", idcBookStatusEto);
+        resultJson.put("code", 200);
+        resultJson.put("data", list);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }
@@ -66,8 +69,8 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
      */
     public String getHotelData() {
         JSONObject resultJson = new JSONObject();
-        IDCHotelEto idcHotelEto = idcService.getHotelData();
-        if (idcHotelEto == null) {
+        List<IDCHotelEto> list = idcService.getHotelData();
+        if (list == null && list.size()==0) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -75,7 +78,7 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
         }
         resultJson.put("message", "查询成功");
         resultJson.put("code", 500);
-        resultJson.put("data", idcHotelEto);
+        resultJson.put("data", list);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }
@@ -86,8 +89,8 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
      */
     public String getRankBookNumData() {
         JSONObject resultJson = new JSONObject();
-        IDCRankEto idcRankEto = idcService.getRankBookNumData();
-        if (idcRankEto == null) {
+        List<IDCRankEto> list = idcService.getRankBookNumData();
+        if (list == null && list.size()==0) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -95,7 +98,7 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
         }
         resultJson.put("message", "查询成功");
         resultJson.put("code", 500);
-        resultJson.put("data", idcRankEto);
+        resultJson.put("data", list);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }
@@ -106,8 +109,8 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
      */
     public String getRankSalesAmountData(){
         JSONObject resultJson = new JSONObject();
-        IDCRankEto idcRankEto = idcService.getRankSalesAmountData();
-        if (idcRankEto == null) {
+        List<IDCRankEto> list = idcService.getRankSalesAmountData();
+        if (list == null && list.size()==0) {
             resultJson.put("message", "数据为空");
             resultJson.put("code", 500);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -115,7 +118,7 @@ public class IDCAction extends ActionSupport implements ServletRequestAware {
         }
         resultJson.put("message", "查询成功");
         resultJson.put("code", 500);
-        resultJson.put("data", idcRankEto);
+        resultJson.put("data", list);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }

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

@@ -4,6 +4,8 @@ import com.happy.dto.IDCBookStatusEto;
 import com.happy.dto.IDCHotelEto;
 import com.happy.dto.IDCRankEto;
 
+import java.util.List;
+
 public interface IDCDao {
 
 
@@ -11,24 +13,24 @@ public interface IDCDao {
      * 描述：获取订单状态占比数据
      * @return
      */
-    IDCBookStatusEto getBookStatusData();
+    List<IDCBookStatusEto> getBookStatusData();
 
     /**
      * 描述：获取各县民宿数量
      * @return
      */
-    IDCHotelEto getHotelData();
+    List<IDCHotelEto> getHotelData();
 
     /**
      * 描述：获取订单量排行
      * @return
      */
-    IDCRankEto getRankBookNumData();
+    List<IDCRankEto> getRankBookNumData();
 
     /**
      * 描述：获取销售额排行
      * @return
      */
-    IDCRankEto getRankSalesAmountData();
+    List<IDCRankEto> getRankSalesAmountData();
 
 }

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

@@ -6,7 +6,7 @@ public class IDCBookStatusEto {
     private Integer orderStatus;
 
     //订单状态名称
-    private String orderStatusMame;
+    private String orderStatusName;
 
     //数量
     private String statusNum;
@@ -14,7 +14,6 @@ public class IDCBookStatusEto {
     //比例
     private Double proportion;
 
-
     public Integer getOrderStatus() {
         return orderStatus;
     }
@@ -23,12 +22,12 @@ public class IDCBookStatusEto {
         this.orderStatus = orderStatus;
     }
 
-    public String getOrderStatusMame() {
-        return orderStatusMame;
+    public String getOrderStatusName() {
+        return orderStatusName;
     }
 
-    public void setOrderStatusMame(String orderStatusMame) {
-        this.orderStatusMame = orderStatusMame;
+    public void setOrderStatusName(String orderStatusName) {
+        this.orderStatusName = orderStatusName;
     }
 
     public String getStatusNum() {

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

@@ -4,30 +4,32 @@ import com.happy.dto.IDCBookStatusEto;
 import com.happy.dto.IDCHotelEto;
 import com.happy.dto.IDCRankEto;
 
+import java.util.List;
+
 public interface IDCService {
 
     /**
      * 描述：获取订单状态占比数据
      * @return
      */
-    IDCBookStatusEto getBookStatusData();
+    List<IDCBookStatusEto> getBookStatusData();
 
     /**
      * 描述：获取各县民宿数量
      * @return
      */
-    IDCHotelEto getHotelData();
+    List<IDCHotelEto> getHotelData();
 
     /**
      * 描述：获取订单量排行
      * @return
      */
-    IDCRankEto getRankBookNumData();
+    List<IDCRankEto> getRankBookNumData();
 
     /**
      * 描述：获取销售额排行
      * @return
      */
-    IDCRankEto getRankSalesAmountData();
+    List<IDCRankEto> getRankSalesAmountData();
 
 }

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

@@ -8,6 +8,7 @@ import com.happy.service.IDCService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service("IDCService")
 public class IDCImplService implements IDCService {
@@ -16,22 +17,22 @@ public class IDCImplService implements IDCService {
     private IDCDao idcDao;
 
     @Override
-    public IDCBookStatusEto getBookStatusData() {
+    public List<IDCBookStatusEto> getBookStatusData() {
         return idcDao.getBookStatusData();
     }
 
     @Override
-    public IDCHotelEto getHotelData() {
+    public List<IDCHotelEto> getHotelData() {
         return idcDao.getHotelData();
     }
 
     @Override
-    public IDCRankEto getRankBookNumData() {
+    public List<IDCRankEto> getRankBookNumData() {
         return idcDao.getRankBookNumData();
     }
 
     @Override
-    public IDCRankEto getRankSalesAmountData() {
+    public List<IDCRankEto> getRankSalesAmountData() {
         return idcDao.getRankSalesAmountData();
     }
 }

mhotel/src/struts.xml

@@ -36,6 +36,8 @@
 <!--		<action name="app*" method = "{1}" class="com.happy.action.appAction"></action>-->
 		<action name="upload*" method = "{1}" class="com.happy.action.uploadAction">
 		</action>
+		<action name="idc*" method = "{1}" class="com.happy.action.IDCAction">
+		</action>
 
 		<action name="abk*" method = "{1}" class="com.happy.action.AppBookingAction"></action>
 		<action name="ahp*" method = "{1}" class="com.happy.action.AppHomePageAction"></action>