Merge remote-tracking branch 'origin/master'

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

@@ -106,6 +106,7 @@ public class AdminManager {
 	 * 营业执照
 	 */
 	private List<FileInfo> fileInfoList;
+
 	public String openid;
 
 	public Integer getId() {

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

@@ -51,7 +51,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
     public int page; // 当前页
     public int rows;// 每页显示的行数rows
 
-    public List<FileInfo> fileList;//需上传的附件列表
+    public String fileListJson;
 
     public HttpServletRequest getRequest() {
         return request;
@@ -116,6 +116,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
      * @return
      */
     public String insertAdmin() {
+
         JSONObject resultJson = new JSONObject();
         Gson gson = new Gson();
         com.alibaba.fastjson.JSONObject json = GetHttpParam.getRequestParameters(request);
@@ -127,12 +128,14 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
         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", "各参数不能为空");
@@ -157,18 +160,14 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             }
             admin.setId(Math.toIntExact(UUIDUtil.generateID()));
             admin.setManagerId(admin.getId());
-//            //保存详细图附件
-//            List<File> fileList = JSONArray.parseArray(fileListJson, File.class);
-//            if(fileList!=null && fileList.size()>0){
-//                for(File file : fileList){
-//                    file.setLinkId(admin.getId());
-//                    fileService.insertFile(file);
-//                }
-//            }else{
-//                resultJson.put("message", "请上传详细图");
-//                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-//                return null;
-//            }
+            //保存详细图附件
+            List<FileInfo> fileInfoList = JSONArray.parseArray(fileListJson, FileInfo.class);
+            if(fileInfoList!=null && fileInfoList.size()>0){
+                for(FileInfo file : fileInfoList){
+                    file.setLinkId(admin.getId());
+                    fileService.updateFile(file);
+                }
+            }
             int m = adminManagerService.insertAdmin(admin);
             if (m > 0) {
                 resultJson.put("message", "添加成功");
@@ -241,21 +240,17 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-//            //修改详细图附件
-//            List<FileInfo> fileInfoList = JSONArray.parseArray(fileListJson, File.class);
-//            if(fileList!=null && fileList.size()>0){
-//                if(admin.getId()!= null){
-//                    fileService.delLinkFile(admin.getId());
-//                }
-//                for(FileInfo fileInfo : fileInfoList){
-//                    fileInfo.setLinkId(admin.getId());
-//                    fileService.insertFile(fileInfo);
-//                }
-//            }else{
-//                resultJson.put("message", "请上传详细图");
-//                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-//                return null;
-//            }
+            //修改详细图附件
+            List<FileInfo> fileInfoList = JSONArray.parseArray(fileListJson, FileInfo.class);
+            if(fileInfoList!=null && fileInfoList.size()>0){
+                if(admin.getId()!= null){
+                    fileService.delLinkFile(admin.getId());
+                }
+                for(FileInfo fileInfo : fileInfoList){
+                    fileInfo.setLinkId(admin.getId());
+                    fileService.insertFile(fileInfo);
+                }
+            }
             int m = adminManagerService.updateAdmin(admin);
             if (m > 0) {
                 resultJson.put("message", "修改成功");

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

@@ -183,8 +183,8 @@ public class appAction extends ActionSupport implements ServletRequestAware {
         CodeEntity codeEntity = appService.getCodeInfo(code);
         Admin admin = appService.queryByNameAndOpenid(admin_name,codeEntity.getOpenid());
         if (admin!=null){
-            resultJson.put("message", "已绑定");
-            resultJson.put("code", 200);
+            resultJson.put("message", "该账户已绑定，请勿重复绑定");
+            resultJson.put("code", 205);
             resultJson.put("data",admin);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
@@ -204,17 +204,25 @@ public class appAction extends ActionSupport implements ServletRequestAware {
     // 解绑
     public String uncode(){
         JSONObject resultJson = new JSONObject();
-        if (code==null){
+        if (code==null || admin_name==null || password==null){
             resultJson.put("message", "参数不能为空");
             resultJson.put("code", 205);
             resultJson.put("data","");
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
+        Admin login = appService.login(admin_name,password);
+        if (login==null){
+            resultJson.put("message", "账户或密码错误");
+            resultJson.put("code", 205);
+            resultJson.put("data","");
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
         CodeEntity codeEntity = appService.getCodeInfo(code);
-        Admin admin = appService.queryByOpenid(codeEntity.getOpenid());
+        Admin admin = appService.queryByNameAndOpenid(admin_name,codeEntity.getOpenid());
         if (admin==null){
-            resultJson.put("message", "未查询到绑定信息");
+            resultJson.put("message", "输入信息与当前绑定账户不匹配");
             resultJson.put("code", 205);
             resultJson.put("data","");
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -288,8 +296,8 @@ public class appAction extends ActionSupport implements ServletRequestAware {
         CodeEntity codeEntity = appService.getCodeInfo(code);
         AdminManager admin = appService.queryMaByNameAndOpenid(admin_name,codeEntity.getOpenid());
         if (admin!=null){
-            resultJson.put("message", "已绑定");
-            resultJson.put("code", 200);
+            resultJson.put("message",  "该账户已绑定，请勿重复绑定");
+            resultJson.put("code", 205);
             resultJson.put("data",admin);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
@@ -309,17 +317,25 @@ public class appAction extends ActionSupport implements ServletRequestAware {
 
     public String uncode_ma(){
         JSONObject resultJson = new JSONObject();
-        if (code==null){
+        if (code==null || admin_name==null || password==null){
             resultJson.put("message", "参数不能为空");
             resultJson.put("code", 205);
             resultJson.put("data","");
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
+        AdminManager login = appService.login_ma(admin_name,password);
+        if (login==null){
+            resultJson.put("message", "账户或密码错误");
+            resultJson.put("code", 205);
+            resultJson.put("data","");
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
         CodeEntity codeEntity = appService.getCodeInfo(code);
-        AdminManager admin = appService.queryMaByOpenid(codeEntity.getOpenid());
+        AdminManager admin = appService.queryMaByNameAndOpenid(admin_name,codeEntity.getOpenid());
         if (admin==null){
-            resultJson.put("message", "未查询到绑定信息");
+            resultJson.put("message", "输入信息与当前绑定账户不匹配");
             resultJson.put("code", 205);
             resultJson.put("data","");
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());

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

@@ -92,24 +92,51 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         try{
             switch (type){
                 case 1://接单
-                    if(book.getOrderStatus()!=""){
-
+                    if(book.getOrderStatus()!="2"){
+                        resultJson.put("message", "已支付状态才能接单");
+                        resultJson.put("code", 502);
+                        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                        return null;
                     }
                     book.setOrderStatus("3");
+                    book.setUpdateTime(UUIDUtil.getNewDate());
                     msg = "接单";
                     sendMsg = "商家已接单";
                     break;
                 case 2://入住
+                    if(book.getOrderStatus()!="3"){
+                        resultJson.put("message", "待入住状态才能办理入住");
+                        resultJson.put("code", 502);
+                        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                        return null;
+                    }
                     book.setOrderStatus("4");
+                    book.setUpdateTime(UUIDUtil.getNewDate());
                     msg = "入住办理";
                     break;
                 case 3://退房
+                    if(book.getOrderStatus()!="4"){
+                        resultJson.put("message", "已入住状态才能办理退房");
+                        resultJson.put("code", 502);
+                        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                        return null;
+                    }
+                    book.setCheckOutTime(UUIDUtil.getNewDate());//退房时间
+                    book.setUpdateTime(UUIDUtil.getNewDate());
                     book.setOrderStatus("5");
                     msg = "退房";
                     break;
                 case 4://退单
+                    if(book.getOrderStatus()!="2"){
+                        resultJson.put("message", "已支付状态才能退单");
+                        resultJson.put("code", 502);
+                        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                        return null;
+                    }
                     book.setOrderStatus("8");
+                    book.setUpdateTime(UUIDUtil.getNewDate());
                     msg = "退单";
+                    sendMsg = "商家已退单";
                     break;
                 case 5://退款
                     book.setOrderStatus("9");
@@ -119,7 +146,9 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             int m = bookService.updateBooking(book);
             if (m > 0) {
                 //推送信息
-                Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                if(!"".equals(sendMsg)){
+                    Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                }
                 resultJson.put("message", msg+"成功");
                 resultJson.put("code", 200);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -146,7 +175,9 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
     public String quearyBookPage(){
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
-        s1.append(" and hotel_manager_id = '").append(managerId).append("'");
+        if(managerId!=null){
+            s1.append(" and hotel_manager_id = '").append(managerId).append("'");
+        }
         if (ledgerParam!=null){
             s1.append(" and (order_num like '%").append(ledgerParam).append("%'")
                     .append(" or user_name like '%").append(ledgerParam).append("%'")
@@ -167,7 +198,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         if(bookTypeEto!=null && !"".equals(bookTypeEto)){
             resultJson.put("message", "查询分页成功");
             resultJson.put("code", 200);
-            resultJson.put("date", bookTypeEto);
+            resultJson.put("data", bookTypeEto);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         }else{
             resultJson.put("message", "查询分页失败");
@@ -236,7 +267,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             // 导出文件
             new toExcel().book(vectorsList, path + filePathName,
                     "sheet1", columnName);
-            String url = request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            String url = "http://"+request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
             resultJson.put("downurl", url + "/download/" + filePathName);
             resultJson.put("code", 200);
             resultJson.put("message", "导出成功");
@@ -282,7 +313,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         if(bookTypeEto!=null && !"".equals(bookTypeEto)){
             resultJson.put("message", "查询分页成功");
             resultJson.put("code", 200);
-            resultJson.put("date", bookTypeEto);
+            resultJson.put("data", bookTypeEto);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         }else{
             resultJson.put("message", "查询分页失败");
@@ -308,7 +339,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         if (book != null) {
             resultJson.put("message", "查询成功");
             resultJson.put("code", 200);
-            resultJson.put("date", book);
+            resultJson.put("data", book);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }else{
@@ -376,7 +407,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             // 导出文件
             new toExcel().book(vectorsList, path + filePathName,
                     "sheet1", columnName);
-            String url = request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            String url = "http://"+request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
             resultJson.put("downurl", url + "/download/" + filePathName);
             resultJson.put("code", 200);
             resultJson.put("message", "导出成功");

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

@@ -87,13 +87,13 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
             BeanUtils.copyProperties(hotelEto,hotel);
             int hotelId = hotel.getId()!= null ? hotel.getId():Math.toIntExact(UUIDUtil.generateID());
             int m = 0;
-//            //详细图附件
-//            List<File> fileList = JSONArray.parseArray(fileListJson, File.class);
-//            if(fileList==null){
-//                resultJson.put("message", "请上传详细图");
-//                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-//                return null;
-//            }
+            //详细图附件
+            List<FileInfo> fileList = JSONArray.parseArray(fileListJson, FileInfo.class);
+            if(fileList==null){
+                resultJson.put("message", "请上传详细图");
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
             //保存基本信息
             if(hotel.getId()!= null){
                 m = hotelService.updateHotel(hotel);
@@ -103,13 +103,13 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
             }
 
             if (m > 0) {
-//                if(hotel.getId()!= null){
-//                    fileService.delLinkFile(hotel.getId());
-//                }
-//                for(File file : fileList){
-//                    file.setLinkId(hotelId);
-//                    fileService.insertFile(file);
-//                }
+                if(hotel.getId()!= null){
+                    fileService.delLinkFile(hotel.getId());
+                }
+                for(FileInfo file : fileList){
+                    file.setLinkId(hotelId);
+                    fileService.updateFile(file);
+                }
                 resultJson.put("message", "维护成功");
                 resultJson.put("code", 200);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());

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

@@ -87,8 +87,8 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-//            //详细图附件
-//            List<File> fileList = JSONArray.parseArray(fileListJson, File.class);
+            //详细图附件
+            List<FileInfo> fileList = JSONArray.parseArray(fileListJson, FileInfo.class);
 //            if(fileList==null){
 //                resultJson.put("message", "请上传详细图");
 //                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -106,10 +106,10 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
             house.setId(Math.toIntExact(UUIDUtil.generateID()));
             int m = houseService.insertHouse(house);
             if (m > 0) {
-//                for(File file : fileList){
-//                    file.setLinkId(house.getId());
-//                    fileService.insertFile(file);
-//                }
+                for(FileInfo file : fileList){
+                    file.setLinkId(house.getId());
+                    fileService.updateFile(file);
+                }
                 resultJson.put("message", "新增成功");
                 resultJson.put("code", 200);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -163,8 +163,8 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-//            //详细图附件
-//            List<File> fileList = JSONArray.parseArray(fileListJson, File.class);
+            //详细图附件
+            List<FileInfo> fileList = JSONArray.parseArray(fileListJson, FileInfo.class);
 //            if(fileList==null){
 //                resultJson.put("message", "请上传详细图");
 //                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -182,13 +182,13 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
             }
             int m = houseService.updateHouse(house);
             if (m > 0) {
-//                if(house.getId()!= null){
-//                    fileService.delLinkFile(house.getId());
-//                }
-//                for(File file : fileList){
-//                    file.setLinkId(house.getId());
-//                    fileService.insertFile(file);
-//                }
+                if(house.getId()!= null){
+                    fileService.delLinkFile(house.getId());
+                }
+                for(FileInfo file : fileList){
+                    file.setLinkId(house.getId());
+                    fileService.insertFile(file);
+                }
                 resultJson.put("message", "修改成功");
                 resultJson.put("code", 200);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());

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

@@ -1,12 +1,18 @@
 package com.happy.action;
 
+import com.happy.Model.AdminManager;
+import com.happy.Model.FileInfo;
+import com.happy.Until.ResUtil;
 import com.happy.Until.ResponseUtil;
+import com.happy.Until.UUIDUtil;
+import com.happy.service.FileService;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.FileUtils;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.ServletRequestAware;
 
+import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -25,7 +31,10 @@ public class uploadAction extends ActionSupport implements ServletRequestAware {
     public String url_name;
     public String url;
 
-    private List<File> fileList;
+    public String linkId;
+
+    @Resource
+    public FileService fileService;
 
     public HttpServletRequest getRequest() {
         return request;
@@ -109,12 +118,24 @@ public class uploadAction extends ActionSupport implements ServletRequestAware {
             // 保存图片到指定位置
             FileUtils.copyFile(myFile, destFile);
             // 返回图片url路径
-            String url = "http://192.168.57.1:8080/zhotel/download/" + myFileFileName;
+            String url = "http://"+request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            String fileurl = url + "/download/" + myFileFileName;
+            FileInfo fileInfo = new FileInfo();
+            fileInfo.setName(myFileFileName);
+            fileInfo.setUrl(fileurl);
+            fileInfo.setId(Math.toIntExact(UUIDUtil.generateID()));
             /* 保存入库  */
-            resultJson.put("code", 500);
-            resultJson.put("message", "上传成功");
-            resultJson.put("data", url);
-            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+            int m = fileService.insertFile(fileInfo);
+            if(m>0){
+                resultJson.put("code", 200);
+                resultJson.put("message", "上传成功");
+                resultJson.put("data", fileInfo);
+                ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+            }else{
+                resultJson.put("code", 502);
+                resultJson.put("message", "上传失败");
+                ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+            }
         }catch (Exception e){
             resultJson.put("code", 502);
             resultJson.put("message", "操作异常");
@@ -129,4 +150,31 @@ public class uploadAction extends ActionSupport implements ServletRequestAware {
         return null;
     }
 
+    /**
+     * 描述:根据关联Id查询附件
+     * @return
+     */
+    public String getByLinkId(){
+        JSONObject resultJson = new JSONObject();
+        if (linkId == null) {
+            resultJson.put("message", "请传入关联id");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        List<FileInfo> fileInfoList = fileService.queryList("and link_id ='"+linkId+"'");
+        if (fileInfoList != null) {
+            resultJson.put("message", "查询成功");
+            resultJson.put("code", 200);
+            resultJson.put("data", fileInfoList);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }else{
+            resultJson.put("message", "未查到存在关联附件");
+            resultJson.put("code", 500);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+    }
+
 }

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

@@ -35,6 +35,8 @@ public class FileImplInfoDao implements FileInfoDao {
         sps.addValue("name",file.getName());
         if(file.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", file.getId());
         }
         int num = 0;
         try{