bug修改

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

@@ -1,5 +1,7 @@
 package com.happy.Model;
 
+import java.util.List;
+
 /**
  * @Description  
  * @Author  raojiaolong
@@ -89,6 +91,11 @@ public class AdminManager {
 	 */
 	private Integer status;
 
+	/**
+	 * 营业执照
+	 */
+	private List<File> fileList;
+
 	public Integer getId() {
 		return id;
 	}
@@ -216,4 +223,12 @@ public class AdminManager {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
+
+	public List<File> getFileList() {
+		return fileList;
+	}
+
+	public void setFileList(List<File> fileList) {
+		this.fileList = fileList;
+	}
 }

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

@@ -13,6 +13,7 @@ import com.happy.service.*;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.interceptor.ServletRequestAware;
 import org.springframework.beans.BeanUtils;
 
 import javax.annotation.Resource;
@@ -20,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-public class HotelAction extends ActionSupport {
+public class hotelAction extends ActionSupport implements ServletRequestAware {
 
     private HttpServletRequest request;
     public HttpServletResponse response;

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

@@ -5,12 +5,15 @@ import com.google.gson.reflect.TypeToken;
 import com.happy.Model.AdminManager;
 import com.happy.Model.AdminManager;
 import com.happy.Model.AdminPower;
+import com.happy.Model.File;
 import com.happy.Until.GetHttpParam;
 import com.happy.Until.PwdDefind;
 import com.happy.Until.ResUtil;
+import com.happy.Until.UUIDUtil;
 import com.happy.dto.IPage;
 import com.happy.service.AdminManagerService;
 import com.happy.service.AdminService;
+import com.happy.service.FileService;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
@@ -21,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-public class adminManagerAction extends ActionSupport {
+public class adminManagerAction extends ActionSupport implements ServletRequestAware{
 
     private HttpServletRequest request;
     public HttpServletResponse response;
@@ -32,6 +35,9 @@ public class adminManagerAction extends ActionSupport {
     @Resource
     public AdminManagerService adminManagerService;
 
+    @Resource
+    public FileService fileService;
+
     public String adminName;
     public String password;
     public String hotelTownship;
@@ -127,6 +133,21 @@ public class adminManagerAction extends ActionSupport {
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
+            admin.setId(Math.toIntExact(UUIDUtil.generateID()));
+            //保存详细图附件
+            if(admin.getFileList()!=null && admin.getFileList().size()>0){
+                if(admin.getId()!= null){
+                    fileService.delLinkFile(admin.getId());
+                }
+                for(File file : admin.getFileList()){
+                    file.setLinkId(admin.getId());
+                    fileService.insertFile(file);
+                }
+            }else{
+                resultJson.put("message", "请上传详细图");
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
             int m = adminManagerService.insertAdmin(admin);
             if (m > 0) {
                 resultJson.put("message", "添加成功");
@@ -354,7 +375,7 @@ public class adminManagerAction extends ActionSupport {
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
         if (adminName!=null){
-            s1.append(" and admin_name like '%").append(adminName).append("'");
+            s1.append(" and admin_name like '%").append(adminName).append("%'");
         }
         if (hotelTownship!=null){
             s1.append(" and hotel_township like '%").append(hotelTownship).append("'");

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

@@ -106,8 +106,12 @@ public class uploadAction extends ActionSupport implements ServletRequestAware {
             // 保存图片到指定位置
             FileUtils.copyFile(myFile, destFile);
             // 返回图片url路径
-            String url = "服务前缀" + myFileFileName;
+            String url = "http://192.168.57.1:8080/zhotel/download/" + myFileFileName;
             /* 保存入库  */
+            resultJson.put("code", 500);
+            resultJson.put("message", "上传成功");
+            resultJson.put("date", url);
+            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
         }catch (Exception e){
             resultJson.put("code", 502);
             resultJson.put("message", "操作异常");