Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

mhotel/WebRoot/WEB-INF/classes/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-

mhotel/WebRoot/WEB-INF/classes/applicationContext.xml

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:jee="http://www.springframework.org/schema/jee"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-        http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
-
-    <!-- <context:property-placeholder location="classpath:jdbc.properties" /> -->
-    <!-- 设置需要进行Spring注解扫描的类包 -->
-    <context:component-scan base-package="com.happy" />
-
-    <!-- 自动加载构建bean
-     <context:component-scan base-package="com.game.service" />
-     <context:component-scan base-package="com.game.dao" />   -->
-
-    <!-- 配置数据源 -->
-    <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
-        <property name="url"
-                  value="jdbc:mysql://211.101.247.132:3306/mhotel?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8"></property>
-        <property name="username" value="hotel"></property>
-        <property name="password" value="Aws3227cd!"></property>
-
-
-        <!-- 配置获取连接等待超时的时间 -->
-        <property name="maxWait" value="60000" />
-
-        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
-        <property name="timeBetweenEvictionRunsMillis" value="60000" />
-
-        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
-        <property name="minEvictableIdleTimeMillis" value="300000" />
-
-        <property name="validationQuery" value="SELECT 'x'" />
-        <property name="testWhileIdle" value="true" />
-        <property name="testOnBorrow" value="false" />
-        <property name="testOnReturn" value="false" />
-
-        <!-- 打开PSCache，并且指定每个连接上PSCache的大小（Oracle使用） -->
-        <!-- <property name="poolPreparedStatements" value="true" />
-        <property name="maxPoolPreparedStatementPerConnectionSize" value="20" />   -->
-
-        <!-- 配置监控统计拦截的filters，去掉后监控界面sql无法统计 -->
-        <property name="filters" value="stat" />
-
-    </bean>
-
-
-    <!-- 配置Jdbc模板 -->
-    <bean id="namedParameterJdbcTemplate" class="org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate" scope="prototype">
-        <constructor-arg ref="dataSource"></constructor-arg>
-    </bean>
-
-    <!-- 配置事务管理器 -->
-    <bean id="transactionManager" scope="prototype"
-          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="dataSource" />
-    </bean>
-
-    <!-- 配置事务通知属性 -->
-    <tx:advice id="txAdvice" transaction-manager="transactionManager" >
-        <!-- 定义事务传播属性 -->
-        <tx:attributes>
-            <tx:method name="insert*" propagation="REQUIRED"/>
-            <tx:method name="count*" propagation="REQUIRED"/>
-            <tx:method name="update*" propagation="REQUIRED"/>
-            <tx:method name="edit*" propagation="REQUIRED"/>
-            <tx:method name="save*" propagation="REQUIRED"/>
-            <tx:method name="add*" propagation="REQUIRED"/>
-            <tx:method name="new*" propagation="REQUIRED"/>
-            <tx:method name="set*" propagation="REQUIRED"/>
-            <tx:method name="remove*" propagation="REQUIRED"/>
-            <tx:method name="delete*" propagation="REQUIRED"/>
-            <tx:method name="change*" propagation="REQUIRED"/>
-
-            <tx:method name="get*" read-only="true" />
-            <tx:method name="find*" read-only="true" />
-            <tx:method name="load*" read-only="true" />
-
-            <tx:method name="*" propagation="REQUIRED" />
-        </tx:attributes>
-    </tx:advice>
-
-    <!-- 配置事务切面 -->
-    <aop:config>
-        <!-- 配置切点 -->
-        <aop:pointcut id="serviceOperation"
-                      expression="execution(* com.happy.service.*.*(..))" />
-        <aop:advisor advice-ref="txAdvice" pointcut-ref="serviceOperation" />
-    </aop:config>
-
-</beans>

mhotel/WebRoot/WEB-INF/classes/struts.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts PUBLIC
-		"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-		"http://struts.apache.org/dtds/struts-2.3.dtd">
-
-<struts>
-	<constant name="struts.enable.DynamicMethodInvocation" value="true" />
-	<!-- 开启使用开发模式，详细错误提示 -->
-	<constant name="struts.devMode" value="true"/>
-	<!-- 指定每次请求到达，重新加载资源文件 -->
-	<constant name="struts.i18n.reload" value="true"/>
-	<!-- 指定每次配置文件更改后，自动重新加载 -->
-	<constant name="struts.configuration.xml.reload" value="true"/>
-	<!-- 指定XSLT Result使用样式表缓存 -->
-	<constant name="struts.xslt.nocache" value="true"/>
-
-	<!-- 修改上传文件的大小 -->
-	<constant name="struts.multipart.maxSize" value="50000000"/>
-
-	<package name="happy" namespace="/" extends="struts-default">
-<!--		<action name="data*" method = "{1}" class="com.happy.action.DataAction">-->
-<!--			<result name="list">/jsp/list.jsp</result>-->
-<!--		</action>-->
-		<action name="admin*" method = "{1}" class="com.happy.action.adminAction">
-		</action>
-		<action name="managerAdmin*" method = "{1}" class="com.happy.action.adminManagerAction">
-		</action>
-		<action name="config*" method = "{1}" class="com.happy.action.configAction">
-		</action>
-		<action name="hotel*" method = "{1}" class="com.happy.action.hotelAction">
-		</action>
-		<action name="house*" method = "{1}" class="com.happy.action.houseAction">
-		</action>
-		<action name="book*" method = "{1}" class="com.happy.action.bookAction">
-		</action>
-		<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>
-		<action name="amp*" method = "{1}" class="com.happy.action.AppMePageAction"></action>
-
-	</package>
-	<package name="interfaces" namespace="/interfaces" extends="struts-default">
-		<!-- 接口总调度开始 -->
-<!--		<action name="main*" method="{1}" class="com.happy.action.MainAction"></action>-->
-	</package>
-
-</struts>

mhotel/WebRoot/WEB-INF/classes/zc.properties

@@ -1,10 +0,0 @@
-#conf.global.upload.image.dir=/usr/local/apache-tomcat-7.0.69/webapps/HappysSystem/happy/image
-conf.global.upload.image.dir=/usr/local/apache-tomcat-8.0.28/webapps/HappysSystem/happy/image
-#conf.global.upload.image.dir=D\:/apache-tomcat-8.0.28/webapps/HappysSystemhappy/image
-#conf.global.upload.image.dir=/opt/apache-tomcat-8.0.28/webapps/HappysSystem/happy/image
-#conf.global.upload.image.dir=D\:/tomcat7.0/tomcat7.0/apache-tomcat-7.0.52/webapps/CustomerServiceManager/csm/image
-#conf.global.upload.image.dir=D\:/tomcat7.0/tomcat7.0/apache-tomcat-7.0.52/webapps/HappysSystem/happy/image
-#conf.global.upload.image.dir=C\:/tomcat6/webapps/CustomerServiceManager/csm/image
-#conf.global.upload.image.dir=/home/bae/app/CustomerServiceManager/csm/image
-
-conf.global.decrypt.key=123456789012345678901234567890~!

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

@@ -1,112 +1,37 @@
 package com.happy.Model;
 
-import java.util.Date;
+import com.happy.common.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
- * @Description  
- * @Author  raojiaolong
- * @Date 2023-08-23 
+ * 民宿房态表Model
  */
-
-public class HouseNumberStatus {
-
-	private String id; // 主键
-	private String numberId; // 房间号id
-	private Integer closeType; // 关房类型（1.停用房 2.维修房 3.保留房）
-
-	private String bookingId;//订单id
-	private String remark; // 备注
-	private String setDate; // 设置日期
-	private String createId; // 创建人
-	private Date createDate; // 创建时间
-	private Date modifyDate; // 修改时间
-	private Integer status; // 状态(0删除 1.正常 2.关房 3.脏房 4.净房)
-
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-
-	public String getNumberId() {
-		return numberId;
-	}
-
-	public void setNumberId(String numberId) {
-		this.numberId = numberId;
-	}
-
-
-	public Integer getCloseType() {
-		return closeType;
-	}
-
-	public void setCloseType(Integer closeType) {
-		this.closeType = closeType;
-	}
-
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-
-	public String getSetDate() {
-		return setDate;
-	}
-
-	public void setSetDate(String setDate) {
-		this.setDate = setDate;
-	}
-
-
-	public String getCreateId() {
-		return createId;
-	}
-
-	public void setCreateId(String createId) {
-		this.createId = createId;
-	}
-
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-
-	public Date getModifyDate() {
-		return modifyDate;
-	}
-
-	public void setModifyDate(Date modifyDate) {
-		this.modifyDate = modifyDate;
-	}
-
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public String getBookingId() {
-		return bookingId;
-	}
-
-	public void setBookingId(String bookingId) {
-		this.bookingId = bookingId;
-	}
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HouseNumberStatus extends BaseModel {
+    /**
+     * 房间号id
+     */
+    private String numberId;
+    /**
+     * 订单id
+     */
+    private String bookingId;
+    /**
+     * 关房类型（1.停用房 2.维修房 3.保留房）
+     */
+    private Integer closeType;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 设置日期
+     */
+    private String setDate;
+    /**
+     * 状态(0删除 1.正常 2.关房 3.脏房 4.净房 5.预定 6.入住)
+     */
+    private Integer status;
 }

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

@@ -1,124 +1,37 @@
 package com.happy.Model;
 
-import java.util.Date;
+import com.happy.common.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * @Description  
- * @Author  raojiaolong
- * @Date 2023-08-21 
+ * 民宿单日房价表Model
  */
-
-public class HousePrice {
-
-
-	private Integer id; // 主键
-
-	private Integer managerId; // 商家id
-
-	private Integer houseId; // 房型id
-
-	private Double price; // 单价
-
-	private String remark; // 备注
-
-	private String setDate; // 设置日期
-
-	private Integer createId; // 创建人
-
-	private Date createDate; // 创建时间
-
-	private Date modifyDate; // 修改时间
-
-	private Integer status; // 状态(0删除 1正常)
-
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
-	public Integer getManagerId() {
-		return managerId;
-	}
-
-	public void setManagerId(Integer managerId) {
-		this.managerId = managerId;
-	}
-
-
-	public Integer getHouseId() {
-		return houseId;
-	}
-
-	public void setHouseId(Integer houseId) {
-		this.houseId = houseId;
-	}
-
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-
-	public String getSetDate() {
-		return setDate;
-	}
-
-	public void setSetDate(String setDate) {
-		this.setDate = setDate;
-	}
-
-
-	public Integer getCreateId() {
-		return createId;
-	}
-
-	public void setCreateId(Integer createId) {
-		this.createId = createId;
-	}
-
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-
-	public Date getModifyDate() {
-		return modifyDate;
-	}
-
-	public void setModifyDate(Date modifyDate) {
-		this.modifyDate = modifyDate;
-	}
-
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HousePrice extends BaseModel {
+    /**
+     * 商家id
+     */
+    private String managerId;
+    /**
+     * 房型id
+     */
+    private String houseId;
+    /**
+     * 单价
+     */
+    private Double price;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 设置日期
+     */
+    private String setDate;
+    /**
+     * 状态(0删除 1正常)
+     */
+    private Integer status;
 }

mhotel/src/com/happy/Until/BeanMapTool.java

@@ -0,0 +1,56 @@
+package com.happy.Until;
+
+import org.springframework.cglib.beans.BeanMap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class BeanMapTool {
+    public static <T> Map<String, ? super Object> beanToMap(T bean) {
+        BeanMap beanMap = BeanMap.create(bean);
+        Map<String, Object> map = new HashMap<>();
+
+        beanMap.forEach((key, value) -> {
+            map.put(String.valueOf(key), value);
+        });
+        return map;
+    }
+
+    public static <T> T mapToBean(Map<String, ?> map, Class<T> clazz)
+            throws IllegalAccessException, InstantiationException {
+        T bean = clazz.newInstance();
+        BeanMap beanMap = BeanMap.create(bean);
+        beanMap.putAll(map);
+        return bean;
+    }
+
+    public static <T> List<Map<String, ?>> objectsToMaps(List<T> objList) {
+        List<Map<String, ?>> list = new ArrayList<>();
+        if (objList != null && !objList.isEmpty()) {
+            Map<String, ?> map;
+            T bean;
+            for (T t : objList) {
+                bean = t;
+                map = beanToMap(bean);
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+    public static <T> List<T> mapsToObjects(List<Map<String, ?>> maps, Class<T> clazz)
+            throws InstantiationException, IllegalAccessException {
+        List<T> list = new ArrayList<>();
+        if (maps != null && !maps.isEmpty()) {
+            Map<String, ?> map;
+            for (Map<String, ?> stringMap : maps) {
+                map = stringMap;
+                T bean = mapToBean(map, clazz);
+                list.add(bean);
+            }
+        }
+        return list;
+    }
+}

mhotel/src/com/happy/Until/DateUtil.java

@@ -475,4 +475,51 @@ public class DateUtil
         return i;
     }
 
+    /**
+     * 获得两个日期之间的所有日期
+     *
+     * @param startDate 开始日期
+     * @param endDate 结束日期
+     */
+    public static List<Date> getDateListBetween(Date startDate, Date endDate) {
+        List<Date> result = new ArrayList<>();
+        // result.add(parseDateToStr(startDate, Time_Formatter_Day));
+        result.add(startDate);
+        Calendar calBegin = Calendar.getInstance();
+        // 使用给定的 Date 设置此 Calendar 的时间
+        calBegin.setTime(startDate);
+        Calendar calEnd = Calendar.getInstance();
+        // 使用给定的 Date 设置此 Calendar 的时间
+        calEnd.setTime(endDate);
+        // 测试此日期是否在指定日期之后
+        while (endDate.after(calBegin.getTime())) {
+            // 根据日历的规则，为给定的日历字段添加或减去指定的时间量
+            calBegin.add(Calendar.DAY_OF_MONTH, 1);
+            // result.add(parseDateToStr(calBegin.getTime(), Time_Formatter_Day));
+            result.add(calBegin.getTime());
+        }
+        return result;
+    }
+
+    /**
+     * 判断当前时间是否在[startTime, endTime]区间
+     *
+     * @param dataIn 传入的时间
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     */
+    public static boolean isEffectiveDate(Date dataIn, Date startTime, Date endTime) {
+        if (dataIn.getTime() == startTime.getTime()
+                || dataIn.getTime() == endTime.getTime()) {
+            return true;
+        }
+        Calendar date = Calendar.getInstance();
+        date.setTime(dataIn);
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(startTime);
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+        return date.after(begin) && date.before(end);
+    }
+
 }

mhotel/src/com/happy/Until/GetHttpParam.java

@@ -6,11 +6,13 @@ import com.alibaba.fastjson.JSON;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -205,4 +207,20 @@ public class GetHttpParam {
         }
         return null;
     }
+
+    public static String getRequestPostData(HttpServletRequest request) throws IOException {
+        int contentLength = request.getContentLength();
+        if (contentLength < 0) {
+            return null;
+        }
+        byte[] buffer = new byte[contentLength];
+        for (int i = 0; i < contentLength; ) {
+            int len = request.getInputStream().read(buffer, i, contentLength - i);
+            if (len == -1) {
+                break;
+            }
+            i += len;
+        }
+        return new String(buffer, StandardCharsets.UTF_8);
+    }
 }

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

@@ -0,0 +1,15 @@
+package com.happy.action;
+
+import com.happy.common.controller.BaseController;
+import com.happy.dto.HouseNumberStatusDto;
+import com.opensymphony.xwork2.ModelDriven;
+
+public class HouseNumberStatusAction extends BaseController implements ModelDriven<HouseNumberStatusDto> {
+    private final HouseNumberStatusDto houseNumberStatusDto = new HouseNumberStatusDto();
+
+    @Override
+    public HouseNumberStatusDto getModel() {
+        return houseNumberStatusDto;
+    }
+
+}