管理端管理账号管理接口

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

@@ -1,6 +1,6 @@
 package com.happy.Model;
 
-public class Admin_power {
+public class AdminPower {
 
     public Integer id;
     public String allow;  // 菜单名称

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

@@ -3,12 +3,11 @@ package com.happy.action;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.happy.Model.Admin;
-import com.happy.Model.Admin_power;
+import com.happy.Model.AdminPower;
 import com.happy.Until.GetHttpParam;
 import com.happy.Until.PwdDefind;
 import com.happy.Until.ResUtil;
-import com.happy.Until.ResponseUtil;
-import com.happy.service.AdminManagerService;
+import com.happy.dto.IPage;
 import com.happy.service.AdminService;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
@@ -19,7 +18,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Objects;
 
 public class adminAction extends ActionSupport implements ServletRequestAware {
 
@@ -33,8 +31,7 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
     public String password;
     public Integer id;
     public int page; // 当前页
-    public int rows;// 每页显示的行数rows123
-    public String phoneName;
+    public int rows;// 每页显示的行数rows
 
     public HttpServletRequest getRequest() {
         return request;
@@ -56,133 +53,310 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
         this.response = response;
     }
 
-    public String getAdminName() {
-        return adminName;
-    }
-
-    public void setAdminName(String adminName) {
-        this.adminName = adminName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public int getPage() {
-        return page;
-    }
-
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    public int getRows() {
-        return rows;
-    }
-
-    public void setRows(int rows) {
-        this.rows = rows;
-    }
-
-    public String getPhoneName() {
-        return phoneName;
-    }
-
-    public void setPhoneName(String phoneName) {
-        this.phoneName = phoneName;
+    /**
+     * 描述：登录
+     * @return
+     */
+    public String loginAdmin() {
+        JSONObject resultJson = new JSONObject();
+        StringBuilder getOneSqlx = new StringBuilder("");
+        getOneSqlx.append(" and admin_name = '").append(adminName).append("'")
+                .append(" and password = '").append(password).append("'");
+        Admin login = adminService.getOen(getOneSqlx.toString());
+        if (login != 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);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
     }
-
     
     /**
      * 描述：新增管理端管理员账号
      * @return
      */
     public String insertAdmin() {
-        JSONObject resultjson = new JSONObject();
+        JSONObject resultJson = new JSONObject();
         Gson gson = new Gson();
         com.alibaba.fastjson.JSONObject json = GetHttpParam.getRequestParameters(request);
         if (json == null) {
-            resultjson.put("message", "请传入参数");
-            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+            resultJson.put("message", "请传入参数");
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
         Admin admin = null;
         try {
             admin = gson.fromJson(json.toString(), new TypeToken<Admin>() {}.getType());
             if (admin == null) {
-                resultjson.put("message", "数据为空");
-                resultjson.put("code", 500);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                resultJson.put("message", "数据为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
             if (admin.getAdminName()==null || admin.getUserName()==null || admin.getLevel()==null || admin.getAdminPower()==null || admin.getAdminPower().equals("") || admin.getPhone()==null){
-                resultjson.put("message", "各参数不能为空");
-                resultjson.put("code", 500);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                resultJson.put("message", "各参数不能为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
             if (!PwdDefind.vertify(admin.getPassword())){
-                resultjson.put("message", "密码至少包含：大小写英文字母、数字、特殊符号,密码长度大于8位,小于20位");
-                resultjson.put("code", 500);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                resultJson.put("message", "密码至少包含：大小写英文字母、数字、特殊符号,密码长度大于8位,小于20位");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
             StringBuilder getOneSqlx = new StringBuilder("");
-            getOneSqlx.append(" and adminName = ").append(admin.getAdminName());
+            getOneSqlx.append(" and admin_name = '").append(admin.getAdminName()).append("'");
             Admin listc = adminService.getOen(getOneSqlx.toString());
             if (listc != null) {
-                resultjson.put("message", "该用户已存在");
-                resultjson.put("code", 500);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                resultJson.put("message", "该用户已存在");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
             int m = adminService.insertAdmin(admin);
             if (m > 0) {
-                resultjson.put("message", "添加成功");
-                resultjson.put("code", 200);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                resultJson.put("message", "添加成功");
+                resultJson.put("code", 200);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             } else {
-                resultjson.put("message", "添加失败");
-                resultjson.put("code", 502);
-                ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+                resultJson.put("message", "添加失败");
+                resultJson.put("code", 502);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
         } catch (Exception e) {
             e.printStackTrace();
+            resultJson.put("message", "未知异常："+ e);
+            resultJson.put("code", 205);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }
+        resultJson.put("message", "未知异常");
+        resultJson.put("code", 205);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
+    }
+
+    /**
+     * 描述：修改管理端管理员账号
+     * @return
+     */
+    public String updateAdmin() {
+        JSONObject resultJson = new JSONObject();
+        Gson gson = new Gson();
+        com.alibaba.fastjson.JSONObject json = GetHttpParam.getRequestParameters(request);
+        if (json == null) {
+            resultJson.put("message", "请传入参数");
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        Admin admin = null;
+        try {
+            admin = gson.fromJson(json.toString(), new TypeToken<Admin>() {}.getType());
+            if (admin == null) {
+                resultJson.put("message", "数据为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            if(admin.getId()==null){
+                resultJson.put("message", "修改用户Id不能为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            if (admin.getAdminName()==null || admin.getUserName()==null || admin.getLevel()==null || admin.getAdminPower()==null || admin.getAdminPower().equals("") || admin.getPhone()==null){
+                resultJson.put("message", "各参数不能为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            if (!PwdDefind.vertify(admin.getPassword())){
+                resultJson.put("message", "密码至少包含：大小写英文字母、数字、特殊符号,密码长度大于8位,小于20位");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            StringBuilder getOneSqlx = new StringBuilder("");
+            getOneSqlx.append(" and admin_name = '").append(admin.getAdminName()).append("'");
+            getOneSqlx.append(" and id != '").append(admin.getId()).append("'");
+            Admin listc = adminService.getOen(getOneSqlx.toString());
+            if (listc != null) {
+                resultJson.put("message", "该用户已存在");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            int m = adminService.updateAdmin(admin);
+            if (m > 0) {
+                resultJson.put("message", "修改成功");
+                resultJson.put("code", 200);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            } else {
+                resultJson.put("message", "修改失败");
+                resultJson.put("code", 502);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultJson.put("message", "未知异常："+ e);
+            resultJson.put("code", 205);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }
+        resultJson.put("message", "未知异常");
+        resultJson.put("code", 205);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
+    }
+
+    /**
+     * 描述：删除
+     * @return
+     */
+    public String delAdmin(){
+        JSONObject resultJson = new JSONObject();
+        if (id == null) {
+            resultJson.put("message", "请传入id");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        int m = adminService.delAdmin(id);
+        if (m > 0) {
+            resultJson.put("message", "删除成功");
+            resultJson.put("code", 200);
+            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 removePwd(){
+        JSONObject resultJson = new JSONObject();
+        if (id == null) {
+            resultJson.put("message", "请传入id");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        Admin admin = adminService.getById(id);
+        if (admin != null && !"".equals(admin)) {
+            admin.setPassword("Jams123456");
+            int m = adminService.updateAdmin(admin);
+            if(m > 0){
+                resultJson.put("message", "重置成功");
+                resultJson.put("code", 200);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }else{
+                resultJson.put("message", "重置失败");
+                resultJson.put("code", 502);
+                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 queryPage(){
+        JSONObject resultJson = new JSONObject();
+        StringBuilder s1 = new StringBuilder("");
+        if (adminName!=null){
+            s1.append(" and admin_name like '%").append(adminName).append("'");
+        }
+        IPage<Admin> adminIPage = adminService.queryPage(s1.toString(),page,rows);
+        if(adminIPage!=null && !"".equals(adminIPage)){
+            resultJson.put("message", "查询分页成功");
+            resultJson.put("code", 200);
+            resultJson.put("date", adminIPage);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }else{
+            resultJson.put("message", "查询分页失败");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         }
-        resultjson.put("message", "未知异常");
-        resultjson.put("code", 205);
-        ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
         return null;
     }
 
-    public String login() {
+    /**
+     * 描述：根据Id查询详细
+     * @return
+     */
+    public String getById(){
+        JSONObject resultJson = new JSONObject();
+        if (id == null) {
+            resultJson.put("message", "请传入id");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        Admin admin = adminService.getById(id);
+        if (admin != null) {
+            resultJson.put("message", "查询成功");
+            resultJson.put("code", 200);
+            resultJson.put("date", admin);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }else{
+            resultJson.put("message", "未查到用户信息");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+    }
+
+    // 菜单查询
+    public String getIndexList(){
         JSONObject resultjson = new JSONObject();
-        StringBuilder getOneSqlx = new StringBuilder("");
-        getOneSqlx.append(" and adminName = ").append(adminName)
-                .append(" and password = ").append(password);
-        Admin login = adminService.getOen(getOneSqlx.toString());
-        if (login != null) {
-            resultjson.put("message", "登录成功");
+        StringBuilder s1 = new StringBuilder("");
+        if (id==null){
+            resultjson.put("message", "请传入用户Id");
+            resultjson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+            return null;
+        }
+        Admin admin = adminService.getById(id);
+        if (admin==null){
+            resultjson.put("message", "未查到用户信息");
+            resultjson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+            return null;
+        }
+        String ids = admin.getAdminPower();
+        s1.append(" and id in (").append(ids).append(") ");
+        List<AdminPower> lpower = adminService.queryTree(s1.toString());
+        if (lpower!=null){
+            resultjson.put("message", "返回成功");
             resultjson.put("code", 200);
-            resultjson.put("data", login);
+            resultjson.put("data",lpower);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
             return null;
         }
-        resultjson.put("message", "用户名或密码错误");
+        resultjson.put("message", "数据为空");
         resultjson.put("code", 205);
         ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
         return null;

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

@@ -1,13 +1,372 @@
 package com.happy.action;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.happy.Model.AdminManager;
+import com.happy.Model.AdminManager;
+import com.happy.Model.AdminPower;
+import com.happy.Until.GetHttpParam;
+import com.happy.Until.PwdDefind;
+import com.happy.Until.ResUtil;
+import com.happy.dto.IPage;
+import com.happy.service.AdminManagerService;
+import com.happy.service.AdminService;
 import com.opensymphony.xwork2.ActionSupport;
+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 adminManagerAction extends ActionSupport {
 
+    private HttpServletRequest request;
+    public HttpServletResponse response;
 
+    @Resource
+    public AdminService adminService;
+
+    @Resource
+    public AdminManagerService adminManagerService;
+
+    public String adminName;
+    public String password;
+    public Integer id;
+    public int page; // 当前页
+    public int rows;// 每页显示的行数rows
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public void setRequest(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    public void setServletRequest(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    public HttpServletResponse getResponse() {
+        return response;
+    }
+
+    public void setResponse(HttpServletResponse response) {
+        this.response = response;
+    }
+
+    /**
+     * 描述：登录
+     * @return
+     */
+    public String loginAdmin() {
+        JSONObject resultJson = new JSONObject();
+        StringBuilder getOneSqlx = new StringBuilder("");
+        getOneSqlx.append(" and admin_name = '").append(adminName).append("'")
+                .append(" and password = '").append(password).append("'");
+        AdminManager login = adminManagerService.getOen(getOneSqlx.toString());
+        if (login != 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);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
+    }
+
+    /**
+     * 描述：新增民宿端账号
+     * @return
+     */
+    public String insertAdmin() {
+        JSONObject resultJson = new JSONObject();
+        Gson gson = new Gson();
+        com.alibaba.fastjson.JSONObject json = GetHttpParam.getRequestParameters(request);
+        if (json == null) {
+            resultJson.put("message", "请传入参数");
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        AdminManager admin = null;
+        try {
+            admin = gson.fromJson(json.toString(), new TypeToken<AdminManager>() {}.getType());
+            if (admin == null) {
+                resultJson.put("message", "数据为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            if (admin.getAdminName()==null || admin.getHotelName()==null || admin.getHotelTownship()==null
+                    || admin.getLevel()==null || admin.getCardName()==null || admin.getCorpnPhone()==null){
+                resultJson.put("message", "各参数不能为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+//            if (!PwdDefind.vertify(admin.getPassword())){
+//                resultJson.put("message", "密码至少包含：大小写英文字母、数字、特殊符号,密码长度大于8位,小于20位");
+//                resultJson.put("code", 500);
+//                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+//                return null;
+//            }
+            StringBuilder getOneSqlx = new StringBuilder("");
+            getOneSqlx.append(" and admin_name = '").append(admin.getAdminName()).append("'");
+            AdminManager listc = adminManagerService.getOen(getOneSqlx.toString());
+            if (listc != null) {
+                resultJson.put("message", "该用户已存在");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            int m = adminManagerService.insertAdmin(admin);
+            if (m > 0) {
+                resultJson.put("message", "添加成功");
+                resultJson.put("code", 200);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            } else {
+                resultJson.put("message", "添加失败");
+                resultJson.put("code", 502);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultJson.put("message", "未知异常："+ e);
+            resultJson.put("code", 205);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }
+        resultJson.put("message", "未知异常");
+        resultJson.put("code", 205);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
+    }
+
+    /**
+     * 描述：修改管理端管理员账号
+     * @return
+     */
+    public String updateAdmin() {
+        JSONObject resultJson = new JSONObject();
+        Gson gson = new Gson();
+        com.alibaba.fastjson.JSONObject json = GetHttpParam.getRequestParameters(request);
+        if (json == null) {
+            resultJson.put("message", "请传入参数");
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        AdminManager admin = null;
+        try {
+            admin = gson.fromJson(json.toString(), new TypeToken<AdminManager>() {}.getType());
+            if (admin == null) {
+                resultJson.put("message", "数据为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            if(admin.getId()==null){
+                resultJson.put("message", "修改用户Id不能为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            if (admin.getAdminName()==null || admin.getHotelName()==null || admin.getHotelTownship()==null
+                    || admin.getLevel()==null || admin.getCardName()==null || admin.getCorpnPhone()==null){
+                resultJson.put("message", "各参数不能为空");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            if (!PwdDefind.vertify(admin.getPassword())){
+                resultJson.put("message", "密码至少包含：大小写英文字母、数字、特殊符号,密码长度大于8位,小于20位");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            StringBuilder getOneSqlx = new StringBuilder("");
+            getOneSqlx.append(" and admin_name = '").append(admin.getAdminName()).append("'");
+            getOneSqlx.append(" and id != '").append(admin.getId()).append("'");
+            AdminManager listc = adminManagerService.getOen(getOneSqlx.toString());
+            if (listc != null) {
+                resultJson.put("message", "该用户已存在");
+                resultJson.put("code", 500);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+            int m = adminManagerService.updateAdmin(admin);
+            if (m > 0) {
+                resultJson.put("message", "修改成功");
+                resultJson.put("code", 200);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            } else {
+                resultJson.put("message", "修改失败");
+                resultJson.put("code", 502);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            resultJson.put("message", "未知异常："+ e);
+            resultJson.put("code", 205);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }
+        resultJson.put("message", "未知异常");
+        resultJson.put("code", 205);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
+    }
+
+    /**
+     * 描述：删除
+     * @return
+     */
+    public String delAdmin(){
+        JSONObject resultJson = new JSONObject();
+        if (id == null) {
+            resultJson.put("message", "请传入id");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        int m = adminManagerService.delAdmin(id);
+        if (m > 0) {
+            resultJson.put("message", "删除成功");
+            resultJson.put("code", 200);
+            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 removePwd(){
+        JSONObject resultJson = new JSONObject();
+        if (id == null) {
+            resultJson.put("message", "请传入id");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        AdminManager admin = adminManagerService.getById(id);
+        if (admin != null && !"".equals(admin)) {
+            admin.setPassword("Jams123456");
+            int m = adminManagerService.updateAdmin(admin);
+            if(m > 0){
+                resultJson.put("message", "重置成功");
+                resultJson.put("code", 200);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }else{
+                resultJson.put("message", "重置失败");
+                resultJson.put("code", 502);
+                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 queryPage(){
+        JSONObject resultJson = new JSONObject();
+        StringBuilder s1 = new StringBuilder("");
+        if (adminName!=null){
+            s1.append(" and admin_name like '%").append(adminName).append("'");
+        }
+        IPage<AdminManager> adminIPage = adminManagerService.queryPage(s1.toString(),page,rows);
+        if(adminIPage!=null && !"".equals(adminIPage)){
+            resultJson.put("message", "查询分页成功");
+            resultJson.put("code", 200);
+            resultJson.put("date", adminIPage);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }else{
+            resultJson.put("message", "查询分页失败");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }
+        return null;
+    }
+
+    /**
+     * 描述：根据Id查询详细
+     * @return
+     */
+    public String getById(){
+        JSONObject resultJson = new JSONObject();
+        if (id == null) {
+            resultJson.put("message", "请传入id");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        AdminManager admin = adminManagerService.getById(id);
+        if (admin != null) {
+            resultJson.put("message", "查询成功");
+            resultJson.put("code", 200);
+            resultJson.put("date", admin);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }else{
+            resultJson.put("message", "未查到用户信息");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+    }
+
+    // 菜单查询
+    public String getIndexList(){
+        JSONObject resultjson = new JSONObject();
+        StringBuilder s1 = new StringBuilder("");
+        if (id==null){
+            resultjson.put("message", "请传入用户Id");
+            resultjson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+            return null;
+        }
+        AdminManager admin = adminManagerService.getById(id);
+        if (admin==null){
+            resultjson.put("message", "未查到用户信息");
+            resultjson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
+            return null;
+        }
+        String ids = admin.getAdminPower();
+        s1.append(" and id in (").append(ids).append(") ");
+        List<AdminPower> lpower = adminService.queryTree(s1.toString());
+        if (lpower!=null){
+            resultjson.put("message", "返回成功");
+            resultjson.put("code", 200);
+            resultjson.put("data",lpower);
+            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/action/configAction.java

@@ -2,11 +2,8 @@ package com.happy.action;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.happy.Model.Admin;
-import com.happy.Model.Admin_power;
 import com.happy.Model.Config;
 import com.happy.Until.GetHttpParam;
-import com.happy.Until.PwdDefind;
 import com.happy.Until.ResUtil;
 import com.happy.service.ConfigService;
 import com.opensymphony.xwork2.ActionSupport;
@@ -17,8 +14,6 @@ import org.apache.struts2.interceptor.ServletRequestAware;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Objects;
 
 public class configAction extends ActionSupport implements ServletRequestAware {
 

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

@@ -1,8 +1,7 @@
 package com.happy.dao;
 
 import com.happy.Model.Admin;
-import com.happy.Model.Admin;
-import com.happy.Model.Admin_power;
+import com.happy.Model.AdminPower;
 
 import java.util.List;
 
@@ -59,4 +58,11 @@ public interface AdminDao {
      * @return
      */
     List<Admin> queryList(String sqlx);
+
+    /**
+     * 描述：查询资源菜单列表
+     * @param sqlx
+     * @return
+     */
+    List<AdminPower> queryTree(String sqlx);
 }

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

@@ -0,0 +1,61 @@
+package com.happy.dao;
+
+import com.happy.Model.HotelDict;
+
+import java.util.List;
+
+public interface HotelDictDao {
+
+    /**
+     * 描述：新增
+     * @param hotelDict
+     * @return
+     */
+    int insertHotelDict(HotelDict hotelDict);
+
+    /**
+     * 描述：修改
+     * @param hotelDict
+     * @return
+     */
+    int updateHotelDict(HotelDict hotelDict);
+
+    /**
+     * 描述：删除
+     * @param id
+     * @return
+     */
+    int delHotelDict(int id);
+
+    /**
+     * 描述：根据Id查询详细
+     * @param id
+     * @return
+     */
+    HotelDict getById(int id);
+
+    /**
+     * 描述：分页查询
+     * @param sqlx
+     * @param page
+     * @param rows
+     * @return
+     */
+    List<HotelDict> queryPage(String sqlx, int page, int rows);
+
+
+    /**
+     * 描述：获取总条数
+     * @param sqlx
+     * @return
+     */
+    int queryTotal(String sqlx);
+
+    /**
+     * 描述：查询列表
+     * @param sqlx
+     * @return
+     */
+    List<HotelDict> queryList(String sqlx);
+
+}

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

@@ -1,7 +1,8 @@
 package com.happy.dao.impl;
 
 import com.happy.Model.Admin;
-import com.happy.Model.Admin_power;
+import com.happy.Model.AdminPower;
+import com.happy.Until.UUIDUtil;
 import com.happy.dao.AdminDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -28,7 +29,7 @@ public class AdminImplDao implements AdminDao {
 
     @Override
     public int insertAdmin(Admin admin){
-        String sql = "insert into admin(admin_name,user_name,phone,password,level,admin_power,remark, create_id, create_date, status) values(:admin_name,:user_name,:phone,:password,:level,:admin_power,:remark, :create_id, :create_date, :status) ";
+        String sql = "insert into admin(id,admin_name,user_name,phone,password,level,admin_power,remark, create_id, create_date, status) values(:id,:admin_name,:user_name,:phone,:password,:level,:admin_power,:remark, :create_id, :create_date, :status) ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("admin_name", admin.getAdminName());
         sps.addValue("user_name",admin.getUserName());
@@ -40,6 +41,9 @@ public class AdminImplDao implements AdminDao {
         sps.addValue("create_id", admin.getCreateId());
         sps.addValue("create_date",admin.getCreateDate());
         sps.addValue("status", admin.getStatus());
+        if(admin.getId()==null){
+            sps.addValue("id", UUIDUtil.generateID());
+        }
         int num = 0;
         try{
             num = namedParameterJdbcTemplate.update(sql, sps);
@@ -136,4 +140,15 @@ public class AdminImplDao implements AdminDao {
         return null;
     }
 
+    @Override
+    public List<AdminPower> queryTree(String sqlx){
+        String sql = "select * from `admin_power` where 1=1 "+sqlx;
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        List<AdminPower> list = namedParameterJdbcTemplate.query(sql, sps,
+                new BeanPropertyRowMapper<>(AdminPower.class));
+        if (list != null && list.size() > 0) {
+            return list;
+        }
+        return null;
+    }
 }

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

@@ -0,0 +1,135 @@
+package com.happy.dao.impl;
+
+import com.happy.Model.HotelDict;
+import com.happy.Until.UUIDUtil;
+import com.happy.dao.HotelDictDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository("HotelDictDao")
+public class HotelDictImplDao implements HotelDictDao {
+
+    @Autowired
+    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    public NamedParameterJdbcTemplate getNamedParameterJdbcTemplate() {
+        return namedParameterJdbcTemplate;
+    }
+
+    public void setNamedParameterJdbcTemplate(NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
+        this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
+    }
+
+
+    @Override
+    public int insertHotelDict(HotelDict hotelDict) {
+        String sql = "INSERT INTO hotel_dict (id, name, file_url, create_id, create_date, modify_date, status) VALUES (:id, :name, :file_url, :create_id, :create_date, :modify_date, :status);\n";
+
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        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("modify_date",hotelDict.getModifyDate());
+        sps.addValue("status",hotelDict.getStatus());
+        if(hotelDict.getId()==null){
+            sps.addValue("id", UUIDUtil.generateID());
+        }
+        int num = 0;
+        try{
+            num = namedParameterJdbcTemplate.update(sql, sps);
+        }
+        catch(Exception e){
+            e.printStackTrace();
+        }
+        return num;
+    }
+
+    @Override
+    public int updateHotelDict(HotelDict hotelDict) {
+        String sql = "UPDATE hotel_dict SET name=:name, file_url=:file_url, create_id=:create_id, modify_date=:modify_date, status=:status WHERE id = :id";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        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("status",hotelDict.getStatus());
+        sps.addValue("id", hotelDict.getId());
+        int num = 0;
+        try{
+            num = namedParameterJdbcTemplate.update(sql, sps);
+        }
+        catch(Exception e){
+            e.printStackTrace();
+        }
+        return num;
+    }
+
+    @Override
+    public int delHotelDict(int id) {
+        String sql = "DELETE FROM `hotel_dict` WHERE id = :id ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("id",id);
+        int num = 0;
+        try{
+            num = namedParameterJdbcTemplate.update(sql, sps);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return num;
+    }
+
+    @Override
+    public HotelDict getById(int id) {
+        String sql = "SELECT * FROM `hotel_dict` WHERE id = :id ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("id",id);
+        List<HotelDict> list = null;
+        try{
+            list = namedParameterJdbcTemplate.query(sql, sps,
+                    new BeanPropertyRowMapper<>(HotelDict.class));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(list != null && list.size()>0) return list.get(0);
+        return null;
+    }
+
+    @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 ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("start", start);
+        sps.addValue("rows", rows);
+        List<HotelDict> list = namedParameterJdbcTemplate.query(sql, sps,
+                new BeanPropertyRowMapper<>(HotelDict.class));
+        if (list != null && list.size() > 0) return list;
+        return null;
+    }
+
+    @Override
+    public int queryTotal(String sqlx) {
+        String sql = "SELECT count(*) FROM`hotel_dict` where 1=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;
+        List<HotelDict> list = null;
+        try{
+            list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(HotelDict.class));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(list != null && list.size()>0) return list;
+        return null;
+    }
+}

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

@@ -12,7 +12,7 @@ public class IPage<T> {
 
     private int total;//总条数
 
-    private int pageCount;//总页数
+    private int totalPage;//总页数
 
     private List<T> pageList;//分页数据
 
@@ -40,12 +40,12 @@ public class IPage<T> {
         this.total = total;
     }
 
-    public int getPageCount() {
-        return pageCount;
+    public int getTotalPage() {
+        return totalPage;
     }
 
-    public void setPageCount(int pageCount) {
-        this.pageCount = pageCount;
+    public void setTotalPage(int totalPage) {
+        this.totalPage = totalPage;
     }
 
     public List<T> getPageList() {

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

@@ -51,5 +51,11 @@ public interface AdminManagerService {
      * @return
      */
     List<AdminManager> queryList(String sqlx);
+    /**
+     * 描述：查询一条数据
+     * @param sqlx
+     * @return
+     */
+    public AdminManager getOen(String sqlx);
 
 }

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

@@ -1,8 +1,7 @@
 package com.happy.service;
 
 import com.happy.Model.Admin;
-import com.happy.Model.Admin;
-import com.happy.Model.Admin_power;
+import com.happy.Model.AdminPower;
 import com.happy.dto.IPage;
 
 import java.util.List;
@@ -54,7 +53,14 @@ public interface AdminService {
     List<Admin> queryList(String sqlx);
 
     /**
-     * 描述：查询列表
+     * 描述：查询资源菜单列表
+     * @param sqlx
+     * @return
+     */
+    List<AdminPower> queryTree(String sqlx);
+
+    /**
+     * 描述：查询一条数据
      * @param sqlx
      * @return
      */

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

@@ -0,0 +1,53 @@
+package com.happy.service;
+
+import com.happy.Model.HotelDict;
+import com.happy.dto.IPage;
+
+import java.util.List;
+
+public interface HotelDictService {
+
+    /**
+     * 描述：新增
+     * @param house
+     * @return
+     */
+    int insertHotelDict(HotelDict house);
+
+    /**
+     * 描述：修改
+     * @param house
+     * @return
+     */
+    int updateHotelDict(HotelDict house);
+
+    /**
+     * 描述：删除
+     * @param id
+     * @return
+     */
+    int delHotelDict(int id);
+
+    /**
+     * 描述：根据Id查询详细
+     * @param id
+     * @return
+     */
+    HotelDict getById(int id);
+
+    /**
+     * 描述：分页查询
+     * @param sqlx
+     * @param page
+     * @param rows
+     * @return
+     */
+    IPage<HotelDict> queryPage(String sqlx, int page, int rows);
+
+    /**
+     * 描述：查询列表
+     * @param sqlx
+     * @return
+     */
+    List<HotelDict> queryList(String sqlx);
+}

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

@@ -1,9 +1,8 @@
 package com.happy.service.impl;
 
 import com.happy.Model.Admin;
-import com.happy.Model.Admin;
-import com.happy.Model.Admin_power;
-import com.happy.dao.AdminDao;
+import com.happy.Model.AdminPower;
+import com.happy.Until.UUIDUtil;
 import com.happy.dao.AdminDao;
 import com.happy.dto.IPage;
 import com.happy.service.AdminService;
@@ -20,11 +19,13 @@ public class AdminImplService implements AdminService {
 
     @Override
     public int insertAdmin(Admin admin) {
+        admin.setCreateDate(UUIDUtil.getNewDate());
         return adminDao.insertAdmin(admin);
     }
 
     @Override
     public int updateAdmin(Admin admin) {
+        admin.setModifyDate(UUIDUtil.getNewDate());
         return adminDao.updateAdmin(admin);
     }
 
@@ -44,7 +45,8 @@ public class AdminImplService implements AdminService {
         List<Admin> adminList = adminDao.queryPage(sqlx,page,rows);
         int total = adminDao.queryTotal(sqlx);
         iPage.setPageList(adminList);
-        iPage.setPageCount( (int)Math.ceil((double)total/rows));
+        iPage.setPage(page);
+        iPage.setTotalPage( (int)Math.ceil((double)total/rows));
         iPage.setRows(rows);
         iPage.setTotal(total);
         return iPage;
@@ -56,6 +58,11 @@ public class AdminImplService implements AdminService {
     }
 
     @Override
+    public List<AdminPower> queryTree(String sqlx) {
+        return adminDao.queryTree(sqlx);
+    }
+
+    @Override
     public Admin getOen(String sqlx) {
         List<Admin> list = adminDao.queryList(sqlx);
         if(list!=null && list.size()>0) return list.get(0);

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

@@ -1,5 +1,6 @@
 package com.happy.service.impl;
 
+import com.happy.Model.Admin;
 import com.happy.Model.AdminManager;
 import com.happy.dto.IPage;
 import com.happy.dao.AdminManagerDao;
@@ -41,7 +42,8 @@ public class AdminManagerImplService implements AdminManagerService {
         List<AdminManager> adminManagerList = adminManagerDao.queryPage(sqlx,page,rows);
         int total = adminManagerDao.queryTotal(sqlx);
         iPage.setPageList(adminManagerList);
-        iPage.setPageCount( (int)Math.ceil((double)total/rows));
+        iPage.setPage(page);
+        iPage.setTotalPage( (int)Math.ceil((double)total/rows));
         iPage.setRows(rows);
         iPage.setTotal(total);
         return iPage;
@@ -51,4 +53,11 @@ public class AdminManagerImplService implements AdminManagerService {
     public List<AdminManager> queryList(String sqlx) {
         return adminManagerDao.queryList(sqlx);
     }
+
+    @Override
+    public AdminManager getOen(String sqlx) {
+        List<AdminManager> list = adminManagerDao.queryList(sqlx);
+        if(list!=null && list.size()>0) return list.get(0);
+        return null;
+    }
 }

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

@@ -42,7 +42,8 @@ public class HouseImplService implements HouseService {
         List<House> houseList = houseDao.queryPage(sqlx,page,rows);
         int total = houseDao.queryTotal(sqlx);
         iPage.setPageList(houseList);
-        iPage.setPageCount( (int)Math.ceil((double)total/rows));
+        iPage.setPage(page);
+        iPage.setTotalPage( (int)Math.ceil((double)total/rows));
         iPage.setRows(rows);
         iPage.setTotal(total);
         return iPage;