Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mhotel/src/com/happy/action/adminManagerAction.java

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

@@ -44,7 +44,9 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
     public String adminName;
     public String password;
     public String hotelTownship;
+    public Integer managerId;//商户Id
     public Integer id;
+    public String level;//权限
     public int page; // 当前页
     public int rows;// 每页显示的行数rows
 
@@ -79,19 +81,26 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 .append(" and password = '").append(password).append("'");
         AdminManager login = adminManagerService.getOen(getOneSqlx.toString());
         if (login != null) {
-            //是否首次登录
-            Hotel hotel = hotelService.getOen("and manager_id = '"+login.getId()+"'");
-            if(hotel==null){
-                resultJson.put("isLogin",1);
+            if(login.getStatus()==2){
+                resultJson.put("message", "账号已冻结请联系管理员");
+                resultJson.put("code", 205);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
             }else{
-                resultJson.put("isLogin",0);
+                //是否主账号首次登录
+                Hotel hotel = hotelService.getOen("and manager_id = '"+login.getId()+"'");
+                if(hotel==null && hotel.getManagerId().equals(login.getId())){
+                    resultJson.put("isLogin",1);
+                }else{
+                    resultJson.put("isLogin",0);
+                }
+                login.setPassword("********");
+                resultJson.put("message", "登录成功");
+                resultJson.put("code", 200);
+                resultJson.put("data", login);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
             }
-            login.setPassword("********");
-            resultJson.put("message", "登录成功");
-            resultJson.put("code", 200);
-            resultJson.put("data", login);
-            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-            return null;
         }
         resultJson.put("message", "用户名或密码错误");
         resultJson.put("code", 205);
@@ -533,7 +542,13 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             s1.append(" and admin_name like '%").append(adminName).append("%'");
         }
         if (hotelTownship!=null){
-            s1.append(" and hotel_township like '%").append(hotelTownship).append("'");
+            s1.append(" and hotel_township = '").append(hotelTownship).append("'");
+        }
+        if(managerId!=null){
+            s1.append(" and manager_id = ").append(managerId);
+        }
+        if(level!=null){
+            s1.append(" and level = '").append(level).append("'");
         }
         IPage<AdminManager> adminIPage = adminManagerService.queryPage(s1.toString(),page,rows);
         if(adminIPage!=null && !"".equals(adminIPage)){

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

@@ -40,9 +40,11 @@ public class AdminImplDao implements AdminDao {
         sps.addValue("remark", admin.getRemark());
         sps.addValue("create_id", admin.getCreateId());
         sps.addValue("create_date",admin.getCreateDate());
-        sps.addValue("status", admin.getStatus());
+        sps.addValue("status", 1);
         if(admin.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", admin.getId());
         }
         int num = 0;
         try{
@@ -80,7 +82,7 @@ public class AdminImplDao implements AdminDao {
 
     @Override
     public int delAdmin(int id){
-        String sql = "delete from `admin` where id=:id ";
+        String sql = "update `admin` set status=0 where id=:id ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id", id);
         int num = 0;
@@ -109,7 +111,7 @@ public class AdminImplDao implements AdminDao {
     @Override
     public List<Admin> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "select * from `admin` where 1=1 "+sqlx+" order by id desc limit :start,:rows ";
+        String sql = "select * from `admin` where status=1 "+sqlx+" order by id desc limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -123,14 +125,14 @@ public class AdminImplDao implements AdminDao {
 
     @Override
     public int queryTotal(String sqlx) {
-        String sql = "select count(*) from `admin` where 1=1 "+sqlx;
+        String sql = "select count(*) from `admin` where status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }
 
     @Override
     public List<Admin> queryList(String sqlx) {
-        String sql = "select * from `admin` where 1=1 "+sqlx;
+        String sql = "select * from `admin` where status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         List<Admin> list = namedParameterJdbcTemplate.query(sql, sps,
                 new BeanPropertyRowMapper<>(Admin.class));
@@ -142,7 +144,7 @@ public class AdminImplDao implements AdminDao {
 
     @Override
     public List<AdminPower> queryTree(String sqlx){
-        String sql = "select * from `admin_power` where 1=1 "+sqlx;
+        String sql = "select * from `admin_power` where status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         List<AdminPower> list = namedParameterJdbcTemplate.query(sql, sps,
                 new BeanPropertyRowMapper<>(AdminPower.class));

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

@@ -30,9 +30,10 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public int insertAdmin(AdminManager adminManager) {
 
-        String sql = "INSERT INTO admin_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) VALUES (: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)";
+        String sql = "INSERT INTO admin_manager (id, 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, remake) VALUES (: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, :remake)";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("manager_id", adminManager.getAdminName());
         sps.addValue("admin_name", adminManager.getAdminName());
         sps.addValue("password", adminManager.getPassword());
         sps.addValue("hotel_name", adminManager.getHotelName());
@@ -47,8 +48,11 @@ public class AdminManagerImplDao implements AdminManagerDao {
         sps.addValue("create_id", adminManager.getCreateId());
         sps.addValue("create_date",adminManager.getCreateDate());
         sps.addValue("status", 1);
+        sps.addValue("remake", adminManager.getRemake());
         if(adminManager.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", adminManager.getId());
         }
         int num = 0;
         try{
@@ -63,7 +67,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public int updateAdmin(AdminManager adminManager) {
 
-        String sql = "UPDATE admin_manager SET admin_name = :admin_name, password = :password, hotel_name = :hotel_name, hotel_township = :hotel_township, corpn_name = :corpn_name, corpn_phone = :corpn_phone, level = :level, admin_power = :admin_power, bank_card = :bank_card, card_name = :card_name, bank_name = :bank_name, create_id = :create_id, modify_date =:modify_date, status =:status WHERE id = :id";
+        String sql = "UPDATE admin_manager SET admin_name = :admin_name, password = :password, hotel_name = :hotel_name, hotel_township = :hotel_township, corpn_name = :corpn_name, corpn_phone = :corpn_phone, level = :level, admin_power = :admin_power, bank_card = :bank_card, card_name = :card_name, bank_name = :bank_name, create_id = :create_id, modify_date =:modify_date, status =:status, remake =:remake WHERE id = :id";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("admin_name", adminManager.getAdminName());
@@ -80,6 +84,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
         sps.addValue("create_id", adminManager.getCreateId());
         sps.addValue("modify_date",adminManager.getModifyDate());
         sps.addValue("status", adminManager.getStatus());
+        sps.addValue("remake", adminManager.getRemake());
         sps.addValue("id",adminManager.getId());
         int num = 0;
         try{
@@ -93,7 +98,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
 
     @Override
     public int delAdmin(int id) {
-        String sql = "DELETE FROM `admin_manager` WHERE id = :id ";
+        String sql = "update `admin_manager` set status=0 where id=:id";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id",id);
         int num = 0;
@@ -124,7 +129,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public List<AdminManager> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT * FROM `admin_manager` WHERE 1=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        String sql = "SELECT * FROM `admin_manager` WHERE status!=0 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -136,14 +141,14 @@ public class AdminManagerImplDao implements AdminManagerDao {
 
     @Override
     public int queryTotal(String sqlx) {
-        String sql = "SELECT count(*) FROM`admin_manager` where 1=1 "+sqlx;
+        String sql = "SELECT count(*) FROM`admin_manager` where status!=0 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }
 
     @Override
     public List<AdminManager> queryList(String sqlx) {
-        String sql = "SELECT * FROM `admin_manager` WHERE 1=1 "+sqlx;
+        String sql = "SELECT * FROM `admin_manager` WHERE status!=0 "+sqlx;
         List<AdminManager> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(AdminManager.class));

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

@@ -35,11 +35,13 @@ public class HotelDictImplDao implements HotelDictDao {
         sps.addValue("name",hotelDict.getName());
         sps.addValue("file_url",hotelDict.getFileUrl());
         sps.addValue("create_id",hotelDict.getCreateId());
-        sps.addValue("create_date",hotelDict.getCreateDate());
+        sps.addValue("create_date",UUIDUtil.getNewDate());
         sps.addValue("modify_date",hotelDict.getModifyDate());
-        sps.addValue("status",hotelDict.getStatus());
+        sps.addValue("status",1);
         if(hotelDict.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id",  hotelDict.getId());
         }
         int num = 0;
         try{
@@ -59,7 +61,7 @@ public class HotelDictImplDao implements HotelDictDao {
         sps.addValue("name",hotelDict.getName());
         sps.addValue("file_url",hotelDict.getFileUrl());
         sps.addValue("create_id",hotelDict.getCreateId());
-        sps.addValue("modify_date",hotelDict.getModifyDate());
+        sps.addValue("modify_date",UUIDUtil.getNewDate());
         sps.addValue("status",hotelDict.getStatus());
         sps.addValue("id", hotelDict.getId());
         int num = 0;
@@ -74,7 +76,7 @@ public class HotelDictImplDao implements HotelDictDao {
 
     @Override
     public int delHotelDict(int id) {
-        String sql = "DELETE FROM `hotel_dict` WHERE id = :id ";
+        String sql = "UPDATE `hotel_dict` SET status=0 WHERE id = :id ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id",id);
         int num = 0;
@@ -105,7 +107,7 @@ public class HotelDictImplDao implements HotelDictDao {
     @Override
     public List<HotelDict> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT * FROM `hotel_dict` WHERE 1=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        String sql = "SELECT * FROM `hotel_dict` WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -117,14 +119,14 @@ public class HotelDictImplDao implements HotelDictDao {
 
     @Override
     public int queryTotal(String sqlx) {
-        String sql = "SELECT count(*) FROM`hotel_dict` where 1=1 "+sqlx;
+        String sql = "SELECT count(*) FROM`hotel_dict` where status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }
 
     @Override
     public List<HotelDict> queryList(String sqlx) {
-        String sql = "SELECT * FROM `hotel_dict` WHERE 1=1 "+sqlx;
+        String sql = "SELECT * FROM `hotel_dict` WHERE status=1 "+sqlx;
         List<HotelDict> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(HotelDict.class));

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

@@ -50,10 +50,12 @@ public class HotelImplDao implements HotelDao {
         sps.addValue("lock_time",hotel.getLockTime());
         sps.addValue("is_canorder",hotel.getIsCheckout());
         sps.addValue("create_id", hotel.getCreateId());
-        sps.addValue("create_date",hotel.getCreateDate());
-        sps.addValue("status", hotel.getStatus());
+        sps.addValue("create_date",UUIDUtil.getNewDate());
+        sps.addValue("status", 1);
         if(hotel.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", hotel.getId());
         }
         int num = 0;
         try{
@@ -87,7 +89,7 @@ public class HotelImplDao implements HotelDao {
         sps.addValue("lock_time",hotel.getLockTime());
         sps.addValue("is_canorder",hotel.getIsCheckout());
         sps.addValue("create_id", hotel.getCreateId());
-        sps.addValue("create_date",hotel.getCreateDate());
+        sps.addValue("modify_date",UUIDUtil.getNewDate());
         sps.addValue("status", hotel.getStatus());
         sps.addValue("id", hotel.getId());
         int num = 0;
@@ -102,7 +104,7 @@ public class HotelImplDao implements HotelDao {
 
     @Override
     public int delHotel(int id) {
-        String sql = "DELETE FROM `hotel` WHERE id = :id ";
+        String sql = "update `hotel` set status=0 where id=:id";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id",id);
         int num = 0;
@@ -133,7 +135,7 @@ public class HotelImplDao implements HotelDao {
     @Override
     public List<Hotel> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT * FROM `hotel` WHERE 1=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        String sql = "SELECT * FROM `hotel` WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -161,14 +163,14 @@ public class HotelImplDao implements HotelDao {
 
     @Override
     public int queryTotal(String sqlx) {
-        String sql = "SELECT count(*) FROM`hotel` where 1=1 "+sqlx;
+        String sql = "SELECT count(*) FROM`hotel` where status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }
 
     @Override
     public List<Hotel> queryList(String sqlx) {
-        String sql = "SELECT * FROM `hotel` WHERE 1=1 "+sqlx;
+        String sql = "SELECT * FROM `hotel` WHERE status=1 "+sqlx;
         List<Hotel> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(Hotel.class));

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

@@ -43,6 +43,9 @@ public class HouseImplDao implements HouseDao {
         sps.addValue("status",house.getStatus());
         if(house.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", house.getId());
+
         }
         int num = 0;
         try{
@@ -79,7 +82,7 @@ public class HouseImplDao implements HouseDao {
 
     @Override
     public int delHouse(int id) {
-        String sql = "DELETE FROM `house` WHERE id = :id ";
+        String sql = "update `house` set status=0 where id=:id";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id",id);
         int num = 0;
@@ -110,7 +113,7 @@ public class HouseImplDao implements HouseDao {
     @Override
     public List<House> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT * FROM `house` WHERE 1=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        String sql = "SELECT * FROM `house` WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -122,14 +125,14 @@ public class HouseImplDao implements HouseDao {
 
     @Override
     public int queryTotal(String sqlx) {
-        String sql = "SELECT count(*) FROM`house` where 1=1 "+sqlx;
+        String sql = "SELECT count(*) FROM`house` where status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }
 
     @Override
     public List<House> queryList(String sqlx) {
-        String sql = "SELECT * FROM `house` WHERE 1=1 "+sqlx;
+        String sql = "SELECT * FROM `house` WHERE status=1 "+sqlx;
         List<House> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(House.class));

mhotel/src/struts.xml

@@ -23,17 +23,26 @@
 		</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="appMePage*" method = "{1}" class="com.happy.action.AppMePageAction"></action>
-		<action name="appHomePage*" method = "{1}" class="com.happy.action.AppHomePageAction"></action>
-		<action name="appBooking*" method = "{1}" class="com.happy.action.AppBookingAction"></action>
+		<action name="upload*" method = "{1}" class="com.happy.action.uploadAction">
+		</action>
+		<action name="appMePage*" method = "{1}" class="com.happy.action.AppMePageAction">
+		</action>
+		<action name="appHomePage*" method = "{1}" class="com.happy.action.AppHomePageAction">
+		</action>
+		<action name="appBooking*" method = "{1}" class="com.happy.action.AppBookingAction">
+		</action>
 	</package>
 	<package name="interfaces" namespace="/interfaces" extends="struts-default">
 		<!-- 接口总调度开始 -->