diff --git a/WebRoot/admin/applylist.jsp b/WebRoot/admin/applylist.jsp index c19a0c9..0a863ad 100644 --- a/WebRoot/admin/applylist.jsp +++ b/WebRoot/admin/applylist.jsp @@ -27,6 +27,13 @@ String usertype = session.getAttribute("userType")+""; + @@ -72,12 +79,12 @@ String usertype = session.getAttribute("userType")+""; - ${item.userid} - ${USERS_MAP[item.userid].username} - ${item.name} - ${item.cate} - 上传文件 - + ${item.userid} + ${USERS_MAP[item.userid].username} + ${item.name} + ${item.cate} + 查看申请资料 + 待街道审核 @@ -88,7 +95,7 @@ String usertype = session.getAttribute("userType")+""; 街道审核不通过 - + 待市级审核 @@ -98,8 +105,8 @@ String usertype = session.getAttribute("userType")+""; 市级审核不通过 - - + + 修改 @@ -165,7 +172,38 @@ $(document).ready(function(){ - + + diff --git a/WebRoot/admin/applylist1.jsp b/WebRoot/admin/applylist1.jsp index ac57731..d823c40 100644 --- a/WebRoot/admin/applylist1.jsp +++ b/WebRoot/admin/applylist1.jsp @@ -58,108 +58,82 @@ String usertype = session.getAttribute("userType")+""; - - - - - - - - - + + + + + + - - + - - - - - - - - - - + + + + + + - - +
房源大小类型价格申请人上传资料备注申请时间状态申请人id申请人姓名申请社区申请房源申请资料状态 操作
- - ${item.hs.rooname} - ${item.hs.size} ${item.hs.cate} ${item.hs.price}元/月 - - ${item.user.username}/ - ${item.user.realname} - - 查看 - - - 查看 - ${item.created} - - - 待街道审核 - - - 街道审核通过 - - - 街道审核不通过 - - - 待市级审核 - - - 市级审核通过 - - - 市级审核不通过 - + ${item.userid}${USERS_MAP[item.userid].username}${item.name}${item.cate}查看申请资料 + + + 待街道审核 + + + 街道审核通过 + + + 街道审核不通过 + + + 待市级审核 + + + 市级审核通过 + + + 市级审核不通过 + - - - - - 通过 - - - - 不通过 - - - - - - - 不通过 - - - - - - 通过 - - - - - - - - 删除 + + + + + + 通过 + + + + 不通过 + + + + + + + 不通过 + + + + + + 通过 + + + + + + + 删除 - - - - - -
diff --git a/WebRoot/admin/applylist2.jsp b/WebRoot/admin/applylist2.jsp index bc65efd..301bf45 100644 --- a/WebRoot/admin/applylist2.jsp +++ b/WebRoot/admin/applylist2.jsp @@ -70,6 +70,7 @@ String usertype = session.getAttribute("userType")+""; 申请社区 申请房源 申请资料 + 状态 操作 @@ -79,12 +80,32 @@ String usertype = session.getAttribute("userType")+""; ${item.userid} - ${USERS_MAP[item.userid].username} + ${USERS_MAP[item.userid].realname} ${item.name} ${item.cate} - 上传文件 - - + 查看申请资料 + + + + + 待街道审核 + + + 街道审核通过 + + + 街道审核不通过 + + + 待市级审核 + + + 市级审核通过 + + + 市级审核不通过 + + @@ -99,7 +120,7 @@ String usertype = session.getAttribute("userType")+""; - + 不通过 @@ -116,12 +137,6 @@ String usertype = session.getAttribute("userType")+""; 删除 - - - - - - diff --git a/WebRoot/admin/communitylist.jsp b/WebRoot/admin/communitylist.jsp index b8ed0a1..ab6e05a 100644 --- a/WebRoot/admin/communitylist.jsp +++ b/WebRoot/admin/communitylist.jsp @@ -30,10 +30,7 @@ - toastr.${state}('${message}', '提示'); - <%--setTimeout(function(){--%> - <%-- window.location.href = "<%=basePath%>${url}";--%> - <%--},1500)--%> + toastr.${state}('${message}', '提示'); }) diff --git a/WebRoot/admin/index.jsp b/WebRoot/admin/index.jsp index 5be3726..e8bdade 100644 --- a/WebRoot/admin/index.jsp +++ b/WebRoot/admin/index.jsp @@ -187,7 +187,7 @@ background-image: linear-gradient(160deg, #80D0C7 0%, #0093E9 100%); 数据统计 - +
  • @@ -303,6 +303,12 @@ background-image: linear-gradient(160deg, #80D0C7 0%, #0093E9 100%); 数据统计
    • +
  • + +
    • diff --git a/WebRoot/admin/jblist.jsp b/WebRoot/admin/jblist.jsp index 94b0782..88d5763 100644 --- a/WebRoot/admin/jblist.jsp +++ b/WebRoot/admin/jblist.jsp @@ -47,8 +47,8 @@ String usertype = session.getAttribute("userType")+""; - - + + @@ -58,15 +58,11 @@ String usertype = session.getAttribute("userType")+""; - + - - - - + + + diff --git a/WebRoot/admin/material.jsp b/WebRoot/admin/material.jsp new file mode 100644 index 0000000..4d99bb0 --- /dev/null +++ b/WebRoot/admin/material.jsp @@ -0,0 +1,76 @@ +<%-- + Created by IntelliJ IDEA. + User: pan + Date: 2020/6/10 0010 + Time: 6:46 + To change this template use File | Settings | File Templates. +--%> +<%@ page language="java" pageEncoding="UTF-8"%> + +<%@ taglib uri="/struts-tags" prefix="s"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + +
    +
    +

    数据列表

    + +
    + 添加资料 +
    +
    + +
    举报用户id举报用户的姓名被举报用户id被举报用户姓名 举报人id 举报人事宜
    - - ${item.user} - ${item.applyUserId}${item.title} ${item.content} ${item.created}${USERS_MAP[item.applyUserId].username} ${item.userId} ${item.content}
    + + + + + + + + + + + + + + + + + + +
    资料名资料类型资料表单名资料表单顺序操作
    ${item.materialName} + + 文本 + 图片 + + ${item.formName}${item.formOrder} + + + 更新资料 + + + + 删除资料 + +
    + + + + diff --git a/WebRoot/admin/materialAdd.jsp b/WebRoot/admin/materialAdd.jsp new file mode 100644 index 0000000..c97ce40 --- /dev/null +++ b/WebRoot/admin/materialAdd.jsp @@ -0,0 +1,85 @@ +<%-- + Created by IntelliJ IDEA. + User: pan + Date: 2020/6/10 0010 + Time: 6:46 + To change this template use File | Settings | File Templates. +--%> +<%@ page language="java" pageEncoding="UTF-8"%> + +<%@ taglib uri="/struts-tags" prefix="s"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + +
    +

    录入数据

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + +
    + + + + 只允许输入英文字母 +
    + + + +
    + +
    +
    +
    +
    + + diff --git a/WebRoot/admin/materialUpdate.jsp b/WebRoot/admin/materialUpdate.jsp new file mode 100644 index 0000000..819516f --- /dev/null +++ b/WebRoot/admin/materialUpdate.jsp @@ -0,0 +1,84 @@ +<%-- + Created by IntelliJ IDEA. + User: pan + Date: 2020/6/10 0010 + Time: 6:46 + To change this template use File | Settings | File Templates. +--%> +<%@ page language="java" pageEncoding="UTF-8"%> + +<%@ taglib uri="/struts-tags" prefix="s"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + +
    +

    录入数据

    +
    +
    + + + + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + + + + + + + +
    + + + +
    --%> +<%-- --%> +<%-- --%> +<%-- 文本--%> +<%-- 文件--%> +<%--" type="text" class="medium">--%> +<%--
    --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
    + + + +
    + +
    +
    +
    +
    + + diff --git a/WebRoot/admin/userMaterial.jsp b/WebRoot/admin/userMaterial.jsp new file mode 100644 index 0000000..96b1c21 --- /dev/null +++ b/WebRoot/admin/userMaterial.jsp @@ -0,0 +1,59 @@ +<%-- + Created by IntelliJ IDEA. + User: pan + Date: 2020/6/10 0010 + Time: 13:05 + To change this template use File | Settings | File Templates. +--%> +<%@ page language="java" pageEncoding="UTF-8"%> + +<%@ taglib uri="/struts-tags" prefix="s"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + +
    + + + + + + + + + + + + + + + +
    资料名内容
    ${item.materialName} + + ${item.formValue} + + + + +
    + + +
    + + diff --git a/WebRoot/head.jsp b/WebRoot/head.jsp index 0566987..6e33d6d 100644 --- a/WebRoot/head.jsp +++ b/WebRoot/head.jsp @@ -12,37 +12,33 @@ String path = request.getContextPath(); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; %> - - - - 公共租赁住房租赁管理系统 - + +公共租赁住房租赁管理系统 + - + - - + + - - + + - - - - + + + + - + - - - - + + + + - - + + - - - - - + + + \ No newline at end of file diff --git a/WebRoot/ui/apply.jsp b/WebRoot/ui/apply.jsp index 2aba8ef..86fe016 100644 --- a/WebRoot/ui/apply.jsp +++ b/WebRoot/ui/apply.jsp @@ -1,37 +1,66 @@ -<%@ page language="java" pageEncoding="UTF-8"%> -<%@ taglib uri="/struts-tags" prefix="s"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ page language="java" pageEncoding="UTF-8" %> +<%@ taglib uri="/struts-tags" prefix="s" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page language="java" %> <%@ page language="java" %> <% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> -
    @@ -51,8 +80,8 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
    - - + +
    @@ -61,23 +90,28 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"

    GET IN APPLY

    - 在线提交申请租赁公租房申请 + + + ${typePrefix}公租房 + ${typePrefix}廉租房 + ${typePrefix}经济适用房 +

    - +
    -
    +

    详细填写申请表

    - -
    -
    -
    -
    - -
    - 申请材料: - - 点击上传 + +
    + + + +
    + +
    +
    + 申请人 +
    +
    + +
    +
    +
    +
    + 申请说明 +
    +
    + +
    +
    + +
    + + +
    +
    + ${item.value.materialName} +
    +
    + + + + + + + 点击上传 + + + +
    +
    +     + +
    +
    +
    -
    -
    + -

    + +

    - -
    +
    + +
    + - - - - + - - - + + }) + + \ No newline at end of file diff --git a/WebRoot/ui/detail.jsp b/WebRoot/ui/detail.jsp index 944711a..2e91aa7 100644 --- a/WebRoot/ui/detail.jsp +++ b/WebRoot/ui/detail.jsp @@ -41,7 +41,7 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);" @@ -125,14 +125,7 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
    ${model.description }
    -

    - ${model.content } -

    - - - - - +
    @@ -165,12 +158,13 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);" 价格: ￥ ${model.price }元/月
    +
    - - - - 我要申请 - + + + + 我要申请 +
    diff --git a/WebRoot/ui/house.jsp b/WebRoot/ui/house.jsp index 5f0d9e9..3afae0f 100644 --- a/WebRoot/ui/house.jsp +++ b/WebRoot/ui/house.jsp @@ -30,7 +30,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. -
    @@ -50,10 +50,10 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
    - + -
    - +
    +
    @@ -75,8 +75,8 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
      - - + +
    • ALL
    • 可用
      • @@ -84,7 +84,7 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
    - +
      @@ -141,7 +141,7 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
      - +
      @@ -157,34 +157,34 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"

      - ${item.rooname} + ${item.communityName}

      - - ${item.address} - 发布 ${item.created} - - ${item.cate } - - -

      -
      -

      ${item.price}元/月

      -
      + + ${item.address} + 发布 ${item.created} + + ${item.cate } + + +

      +
      +

      ${item.price}元/月

      +
      - - - + + +
    - +
    @@ -206,10 +206,10 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"

    ${item.address} - 发布 ${item.created} + 发布 ${item.created} ${item.cate } - +

    @@ -220,17 +220,17 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
    - - + +
    - - + +
    - +
    @@ -252,10 +252,10 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"

    ${item.address} - 发布 ${item.created} + 发布 ${item.created} ${item.cate } - +

    @@ -266,34 +266,34 @@ style="background:url(<%=basePath %>static/breadcrumb.jpg);"
    - - + +
    - - - + + +
    - - - - + + + +
    -
    +
    - - - + + + \ No newline at end of file diff --git a/WebRoot/ui/index.jsp b/WebRoot/ui/index.jsp index acc14cc..167b32c 100644 --- a/WebRoot/ui/index.jsp +++ b/WebRoot/ui/index.jsp @@ -1,11 +1,11 @@ -<%@ page language="java" pageEncoding="UTF-8"%> -<%@ taglib uri="/struts-tags" prefix="s"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ page language="java" pageEncoding="UTF-8" %> +<%@ taglib uri="/struts-tags" prefix="s" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page language="java" %> <%@ page language="java" %> <% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> @@ -13,150 +13,149 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
    -
    - -
    - -
    -
    -
    -
    - -
    -

    ${item.title }

    -

    - Public rental housing rental

    +
    + +
    + +
    +
    +
    +
    + +
    +

    ${item.title }

    +

    + Public rental housing rental

    +
    + +
    -
    -
    + +
    - - -
    -
    +
    - - - + + - +
    +
  • + Newest house
    • +
  • + 最新房源
    • +
    - +
    - +
    - - -
    - -
    -
    - - - - - 闲置 - 使用中 -
    -
    -

    - ${item.rooname}

    -

    - - ${item.address} - 发布 ${item.created} - - ${item.cate } - + + +

    + +
    +
    + + + + + 闲置 + 使用中 -

    -
    -

    ${item.price}元/月

    -
    +
    +
    +

    + ${item.communityName} +

    +

    + + ${item.address} + 发布 ${item.created} + + ${item.cate } + + +

    +
    +

    ${item.price}元/月

    +
    +
    +
    -
    -
    - + - - -
    - +
    -
    - +
    + -
    - - + +

    资料下载

    DOWNLOADS

    - - + +
    - - - - -
    - -
    -
    - + + + + +
    + +
    +
    + +
    +
    +

    + ${item.title }

    +

    ${item.created } / POSTED

    +

    + ${item.description} +

    + Read More +
    +
    -
    -

    - ${item.title }

    -

    ${item.created } / POSTED

    -

    - ${item.description} -

    - Read More -
    -
    -
    - + - - + +
    -
    - +
    + + \ No newline at end of file diff --git a/WebRoot/ui/pub.jsp b/WebRoot/ui/pub.jsp index b1b030b..b038fea 100644 --- a/WebRoot/ui/pub.jsp +++ b/WebRoot/ui/pub.jsp @@ -1,11 +1,11 @@ -<%@ page language="java" pageEncoding="UTF-8"%> -<%@ taglib uri="/struts-tags" prefix="s"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ page language="java" pageEncoding="UTF-8" %> +<%@ taglib uri="/struts-tags" prefix="s" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page language="java" %> <%@ page language="java" %> <% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> @@ -13,9 +13,9 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. - -
    +
    @@ -33,86 +33,54 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
    - + -
    +
    - - - - - - - - - - - - - - - - +
    + +
    + + +
    + + +
    房源大小类型价格申请人上传资料备注申请时间状态投诉举报
    + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + +
    地区申请人姓名社区名称户型投诉举报
    - - ${item.hs.rooname} - ${item.hs.size} ${item.hs.cate} ${item.hs.price}元/月 - - ${item.user.username}/ - ${item.user.realname} - - 查看 - - - 查看 - ${item.created} - - - 待街道审核 - - - 街道审核通过 - - - 街道审核不通过 - - - 待市级审核 - - - 市级审核通过 - - - 市级审核不通过 - - - 举报 -
    ${RegionMap[item.pid].region_name}-${RegionMap[item.cid].region_name}-${RegionMap[item.aid].region_name}${USERS_MAP[item.userid].username}${item.name}${item.houseType} + 举报 +
    @@ -122,15 +90,15 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
    - - + + - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/WebRoot/upload.jsp b/WebRoot/upload.jsp index 654446d..dab99f2 100644 --- a/WebRoot/upload.jsp +++ b/WebRoot/upload.jsp @@ -24,8 +24,8 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. -
    - + +
    @@ -41,8 +41,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. function copy() { var savePath = "${Saved}"; - //alert(savePath); - window.opener.document.getElementById("attachfile").value=savePath; + window.opener.document.querySelector('input[name=${param.name}]').value=savePath window.close(); } diff --git a/src/com/app/action/AppAction.java b/src/com/app/action/AppAction.java index cb3de3d..e583619 100644 --- a/src/com/app/action/AppAction.java +++ b/src/com/app/action/AppAction.java @@ -2,28 +2,43 @@ package com.app.action; import com.app.bean.*; import com.app.service.*; +import com.app.utils.CommunityType; +import com.app.utils.Constants; import com.app.utils.MainUtils; import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.ServletActionContext; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; import java.util.Iterator; import java.util.List; +import java.util.Map; @Controller @Scope("prototype") public class AppAction { - @Resource - AdsService adsService; - @Resource - CatesService catesService; - @Resource - NewsService newsService; - @Resource - HouseService houseService; + @Autowired + private AdsService adsService; + @Autowired + private CatesService catesService; + @Autowired + private NewsService newsService; + @Autowired + private HouseService houseService; + @Autowired + private CommunityService communityService; + @Autowired + private ApplyService applyService; + @Autowired + private UsersService usersService; + @Autowired + private MaterialService materialService; + + private CommunityType type; public List getCate() { List list = catesService.list(" FROM Cates where pid=0"); @@ -39,7 +54,8 @@ public class AppAction { act.put("cates", getCate()); act.put("ads", adsService.list(" FROM Ads order by id DESC")); act.put("news", newsService.list(" FROM News order by id DESC")); - act.put("hs", houseService.list(" FROM House order by id DESC")); + act.put("hs", houseService.transformList("select c.address as address,h.state as state,h.id as id,c.name as communityName,h.created as created,h.price as price,h.thunb " + + "as thunb FROM House h,Community c where h.communityId=c.id order by h.id DESC")); return "success"; } @@ -73,10 +89,13 @@ public class AppAction { act.put("cates", getCate()); //ģѯ if (queryString==null||"".equals(queryString.trim())) { - act.put("hs", houseService.list(" FROM House order by id DESC")); + act.put("hs", houseService.transformList("select c.address as address,h.state as state,h.id as id,c.name as communityName,h.created as created,h.price as price,h.thunb " + + "as thunb FROM House h,Community c where h.communityId=c.id order by h.id DESC")); }else { queryString="%"+queryString+"%"; - act.put("hs", houseService.list(" FROM House where rooname like '"+queryString+"' or address like '"+queryString+"' order by id DESC")); + act.put("hs", houseService.transformList("select c.address as address,h.state as state,h.id as id,c.name as communityName,h.created as created,h.price " + + "as price,h.thunb as thunb FROM House h,Community c where h.communityId=c.id and h.rooname like '"+queryString+"' " + + "or h.address like '"+queryString+"' order by h.id DESC")); } //ݵѯ @@ -105,22 +124,25 @@ public class AppAction { public String detail() { ActionContext act = ActionContext.getContext(); act.put("cates", getCate()); - act.put("model", houseService.findById(id)); + act.put("model", houseService.findByIdWithCommunity(id)); act.put("cates1", catesService.list()); act.put("hs", houseService.list(" FROM House ORDER BY NEWID() ")); + return "success"; } - @Resource - ApplyService applyService; - @Resource - UsersService usersService; + public String apply() { ActionContext act = ActionContext.getContext(); Users u = (Users) act.getSession().get("users"); House model = houseService.findById(id); + Community community= communityService.findById(model.getCommunityId()); act.put("cates", getCate()); act.put("model", model); + act.put("communityType",community.getType()); + act.put("address",community.getAddress()); + act.put("materialMap",ConstantsService.materialMap); + if (applyService.list(" FROM Apply where userid=" + u.getId()).size() > 0) { act.put("message", ":Ѿ"); act.put("state", "error"); @@ -139,9 +161,19 @@ public class AppAction { public String pub() { ActionContext act = ActionContext.getContext(); - List list = applyService.list(); + String whereType; + if(type!=null){ + whereType=" and c.type="+type.getType(); + }else{ + whereType=""; + } + + List list = applyService.transformList("select c.houseType as houseType,a.pid as pid,a.cid as cid,a.aid as aid,a.id as id,c.name as name" + + ",a.userid as userid from Apply a,House h,Community c where a.hid=h.id and h.communityId=c.id and a.state=5"+whereType); act.put("cates", getCate()); act.put("list", list); + act.put(Constants.USERS_MAP,ConstantsService.usersMap); + act.put(Constants.REGION_MAP,ConstantsService.regionMap); return "success"; } public String jb() { @@ -167,10 +199,25 @@ public class AppAction { model.setState("1"); model.setType("1"); model.setCreated(MainUtils.getTime()); - model.setAttachfile(attachfile); model.setHid(id); - model.setMessage(messagex); + model.setMessage(messagex); applyService.save(model); + + HttpServletRequest request=ServletActionContext.getRequest(); + Map map=ConstantsService.materialMap; + Enumeration enumeration= request.getParameterNames(); + while (enumeration.hasMoreElements()){ + String key=enumeration.nextElement(); + if(map.containsKey(key)){ + String value=request.getParameter(key); + UserMaterial userMaterial=new UserMaterial(); + userMaterial.setUserId(u.getId()); + userMaterial.setFormValue(value); + userMaterial.setFormId(map.get(key).getId()); + userMaterial.setApplyId(model.getId()); + materialService.submitMaterial(userMaterial); + } + } model1.setState(2); houseService.update(model1); @@ -188,7 +235,7 @@ public class AppAction { act.put("model", model1); Report model = new Report(); - model.setUserid(u.getId()+""); + model.setUserid(u.getId()); model.setState("1"); model.setCreated(MainUtils.getTime()); model.setMid(id+""); @@ -199,16 +246,7 @@ public class AppAction { return "success"; } - public String attachfile; public String messagex; - - public String getAttachfile() { - return attachfile; - } - - public void setAttachfile(String attachfile) { - this.attachfile = attachfile; - } public String getMessagex() { @@ -229,4 +267,11 @@ public class AppAction { this.id = id; } + public CommunityType getType() { + return type; + } + + public void setType(CommunityType type) { + this.type = type; + } } \ No newline at end of file diff --git a/src/com/app/action/ApplyAction.java b/src/com/app/action/ApplyAction.java index 2d01804..d49e534 100644 --- a/src/com/app/action/ApplyAction.java +++ b/src/com/app/action/ApplyAction.java @@ -16,14 +16,14 @@ import java.util.List; @Controller @Scope("prototype") public class ApplyAction { - @Resource - ApplyService applyService; - - - @Resource - UsersService usersService; - @Resource - HouseService houseService; + @Autowired + private ApplyService applyService; + @Autowired + private UsersService usersService; + @Autowired + private HouseService houseService; + @Autowired + private MaterialService materialService; @Autowired private RefuseApplyService refuseApplyService; @@ -175,15 +175,10 @@ public class ApplyAction { public String jblist() { ActionContext act = ActionContext.getContext(); - List list = reportService.list(); - for (Report report : list) { - Apply apply = applyService.findById(Integer.parseInt(report.getMid())); - report.setUser(usersService.findById(Integer.parseInt(report.getUserid())).getUsername()); - Users u = usersService.findById(apply.getUserid()); - House h = houseService.findById(apply.getHid()); - report.setTitle(u.getUsername()+""+h.getRooname()); - } + List list = reportService.list("select a.userid as applyUserId,r.userid as userId,r.content as content " + + "from Report r,Apply a where r.mid=a.id"); act.put("list", list); + act.put(Constants.USERS_MAP,ConstantsService.usersMap); return "success"; } @Resource @@ -237,13 +232,15 @@ public class ApplyAction { this.ret = ret; } + public String applyList() { ActionContext act = ActionContext.getContext(); Users u = (Users) act.getSession().get("users"); - List list = applyService.list("select a.id as id,a.userid as userid,h.cate as cate,c.name as name,a.state as state " + + List list = applyService.transformList("select a.id as id,a.userid as userid,h.cate " + + "as cate,c.name as name,a.state as state,a.message as message " + "FROM Apply a,House h,Community c,Users u where a.userid="+ u.getId()+"and a.hid=h.id and h.communityId=c.id and a.userid=u.id "); act.put("list", list); - act.put(Constants.USERS_MAP,ConstantsService.getUsersMap()); + act.put(Constants.USERS_MAP,ConstantsService.usersMap); return "success"; } @@ -252,11 +249,11 @@ public class ApplyAction { Users u = (Users) act.getSession().get("users"); String wh = " a.pid=" + u.getPid() + " AND a.cid=" + u.getCid() + " AND a.aid=" + u.getAid(); - List list = applyService.list("select a.id as id,a.userid as userid,h.cate as cate,c.name as name,a.state as state FROM " + + List list = applyService.transformList("select a.id as id,a.userid as userid,h.cate as cate,c.name as name,a.state as state FROM " + "Apply a,House h,Community c,Users u where " + wh+" and a.hid=h.id and h.communityId=c.id and a.userid=u.id "); act.put("list", list); - act.put(Constants.USERS_MAP,ConstantsService.getUsersMap()); + act.put(Constants.USERS_MAP,ConstantsService.usersMap); return "success"; } @@ -272,17 +269,18 @@ public class ApplyAction { } - List list = applyService.list("select a.id as id,a.userid as userid,h.cate as cate,c.name as name," + + List list = applyService.transformList("select a.id as id,a.userid as userid,h.cate as cate,c.name as name," + "a.state as state FROM Apply a,House h,Community c,Users u where a.hid=h.id and h.communityId=c.id and a.userid=u.id "+whereSql); act.put("list", list); - act.put(Constants.USERS_MAP,ConstantsService.getUsersMap()); + act.put(Constants.USERS_MAP,ConstantsService.usersMap); return "success"; } public String delete() { - Integer id = this.id; - applyService.delete(id); ActionContext act = ActionContext.getContext(); + Users u = (Users) act.getSession().get("users"); + applyService.delete(this.id); + materialService.deleteUserMaterial(u.getId()); act.put("message", "ɾɹ!"); act.put("state", "success"); act.put("url", "admin/apply/"+ret+".do"); diff --git a/src/com/app/action/CommunityAction.java b/src/com/app/action/CommunityAction.java index c183986..1b15f72 100644 --- a/src/com/app/action/CommunityAction.java +++ b/src/com/app/action/CommunityAction.java @@ -95,8 +95,8 @@ public class CommunityAction { } act.put(Constants.LIST, communityService.list(community, type.getType())); - act.put(Constants.REGION_MAP, ConstantsService.getRegionMap()); - act.put(Constants.USERS_MAP, ConstantsService.getUsersMap()); + act.put(Constants.REGION_MAP, ConstantsService.regionMap); + act.put(Constants.USERS_MAP, ConstantsService.usersMap); this.setState(request.getParameter(Constants.STATE) == null ? null : StateType.valueOf(request.getParameter(Constants.STATE))); this.setMessage(request.getParameter(Constants.MESSAGE)); diff --git a/src/com/app/action/MaterialAction.java b/src/com/app/action/MaterialAction.java new file mode 100644 index 0000000..54c653b --- /dev/null +++ b/src/com/app/action/MaterialAction.java @@ -0,0 +1,190 @@ +package com.app.action; + +import com.app.bean.ApplicationMaterial; +import com.app.bean.UserMaterial; +import com.app.service.ConstantsService; +import com.app.service.MaterialService; +import com.app.utils.Constants; +import com.app.utils.StateType; +import com.opensymphony.xwork2.ActionContext; +import org.apache.log4j.Logger; +import org.apache.struts2.ServletActionContext; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; + +import javax.servlet.http.HttpServletRequest; + +@Controller +public class MaterialAction { + + @Autowired + private MaterialService materialService; + + private static final Logger logger= Logger.getLogger(MaterialAction.class); + + private StateType state; + + private String message; + + private UserMaterial userMaterial; + + private ApplicationMaterial applicationMaterial; + + private Integer applyId; + + @Autowired + private ConstantsService constantsService; + + /** + * ϶б + * @return + */ + public String materialList(){ + ActionContext actionContext=ActionContext.getContext(); + HttpServletRequest request= ServletActionContext.getRequest(); + String result; + try { + actionContext.put(Constants.LIST,materialService.materialList()); + result= Constants.SUCCESS; + } catch (Exception e) { + e.printStackTrace(); + logger.error(e); + result=Constants.ERROR; + } + this.setState(request.getParameter(Constants.STATE) == null ? null : StateType.valueOf(request.getParameter(Constants.STATE))); + this.setMessage(request.getParameter(Constants.MESSAGE)); + constantsService.initMaterial(); + return result; + } + + /** + * ϶ + * @return ӽ + */ + public String addMaterial(){ + if(applicationMaterial==null||applicationMaterial.getFormName()==null||applicationMaterial.getFormName().isEmpty() + ||applicationMaterial.getFormType()==null||applicationMaterial.getFormType().isEmpty()||!materialService.addMaterial(applicationMaterial)){ + this.setState(StateType.error); + this.setMessage("ʧ"); + return Constants.ERROR; + }else{ + this.setState(StateType.success); + this.setMessage("ϳɹ"); + return Constants.SUCCESS; + } + } + + /** + * ϶ + * @return ظ½ + */ + public String toUpdate(){ + ActionContext act=ActionContext.getContext(); + ApplicationMaterial material; + if(applicationMaterial==null||applicationMaterial.getId()==null||(material=materialService.find(applicationMaterial.getId()))==null){ + this.setState(StateType.error); + this.setMessage("༭ʧ"); + return Constants.ERROR; + }else { + act.put(Constants.MODEL,material); + return Constants.SUCCESS; + } + } + + /** + * ɾ϶ + * @return ɾ + */ + public String deleteMaterial(){ + if(applicationMaterial==null||applicationMaterial.getId()==null||!materialService.deleteMaterial(applicationMaterial.getId())){ + this.setState(StateType.error); + this.setMessage("ɾʧ"); + return Constants.ERROR; + }else{ + this.setState(StateType.success); + this.setMessage("ɾϳɹ"); + return Constants.SUCCESS; + } + } + + /** + * ϶ + * @return ظ½ + */ + public String updateMaterial(){ + if(applicationMaterial==null||applicationMaterial.getId()==null||applicationMaterial.getFormOrder()==null + ||applicationMaterial.getMaterialName()==null||!materialService.updateMaterial(applicationMaterial)){ + this.setState(StateType.error); + this.setMessage("ʧ"); + return Constants.ERROR; + }else{ + this.setState(StateType.success); + this.setMessage("ϳɹ"); + return Constants.SUCCESS; + } + } + + /** + * 鿴û + * @return б + */ + public String findMaterial(){ + ActionContext act=ActionContext.getContext(); + if(applyId==null){ + this.setState(StateType.error); + this.setMessage("鿴ʧ"); + return Constants.ERROR; + }else{ + act.put("materialList",materialService.export(applyId)); + return Constants.SUCCESS; + } + } + + public Integer getApplyId() { + return applyId; + } + + public void setApplyId(Integer applyId) { + this.applyId = applyId; + } + + public MaterialService getMaterialService() { + return materialService; + } + + public void setMaterialService(MaterialService materialService) { + this.materialService = materialService; + } + + public StateType getState() { + return state; + } + + public void setState(StateType state) { + this.state = state; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public UserMaterial getUserMaterial() { + return userMaterial; + } + + public void setUserMaterial(UserMaterial userMaterial) { + this.userMaterial = userMaterial; + } + + public ApplicationMaterial getApplicationMaterial() { + return applicationMaterial; + } + + public void setApplicationMaterial(ApplicationMaterial applicationMaterial) { + this.applicationMaterial = applicationMaterial; + } +} diff --git a/src/com/app/action/ReportAction.java b/src/com/app/action/ReportAction.java index 2be4e77..98e03e7 100644 --- a/src/com/app/action/ReportAction.java +++ b/src/com/app/action/ReportAction.java @@ -36,13 +36,13 @@ public class ReportAction { return content; } - public String userid; + public Integer userid; - public void setUserid(String userid) { + public void setUserid(Integer userid) { this.userid = userid; } - public String getUserid() { + public Integer getUserid() { return userid; } diff --git a/src/com/app/bean/ApplicationMaterial.java b/src/com/app/bean/ApplicationMaterial.java new file mode 100644 index 0000000..eea7142 --- /dev/null +++ b/src/com/app/bean/ApplicationMaterial.java @@ -0,0 +1,65 @@ +package com.app.bean; + +import javax.persistence.*; + +@Entity +@Table(name = "application_material") +public class ApplicationMaterial { + private Integer id; + private String formName; + private String formType; + private Integer formOrder; + private String materialName; + + @Id + @Column(name = "id") + @SequenceGenerator(name="increment") + @GeneratedValue(strategy=GenerationType.IDENTITY) + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @Basic + @Column(name = "form_name") + public String getFormName() { + return formName; + } + + public void setFormName(String formName) { + this.formName = formName; + } + + @Basic + @Column(name = "form_type") + public String getFormType() { + return formType; + } + + public void setFormType(String formType) { + this.formType = formType; + } + + @Basic + @Column(name = "form_order") + public Integer getFormOrder() { + return formOrder; + } + + public void setFormOrder(Integer formOrder) { + this.formOrder = formOrder; + } + + @Basic + @Column(name = "material_name") + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } +} diff --git a/src/com/app/bean/Apply.java b/src/com/app/bean/Apply.java index 273c222..7db26b0 100644 --- a/src/com/app/bean/Apply.java +++ b/src/com/app/bean/Apply.java @@ -10,6 +10,15 @@ public class Apply { private String cate; private String name; + private String houseType; + + public String getHouseType() { + return houseType; + } + + public void setHouseType(String houseType) { + this.houseType = houseType; + } public String getCate() { return cate; diff --git a/src/com/app/bean/House.java b/src/com/app/bean/House.java index 4a5b273..256557f 100644 --- a/src/com/app/bean/House.java +++ b/src/com/app/bean/House.java @@ -1,7 +1,6 @@ package com.app.bean; import javax.persistence.*; -import java.util.Objects; @Entity public class House { @@ -24,6 +23,7 @@ public class House { private String address; private String cate; private Integer communityId; + private String communityName; private Integer total; private Integer remain; @@ -239,36 +239,12 @@ public class House { this.remain = remain; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - House house = (House) o; - return Objects.equals(id, house.id) && - Objects.equals(rooname, house.rooname) && - Objects.equals(size, house.size) && - Objects.equals(thunb, house.thunb) && - Objects.equals(price, house.price) && - Objects.equals(description, house.description) && - Objects.equals(created, house.created) && - Objects.equals(content, house.content) && - Objects.equals(lat, house.lat) && - Objects.equals(lng, house.lng) && - Objects.equals(userid, house.userid) && - Objects.equals(username, house.username) && - Objects.equals(pid, house.pid) && - Objects.equals(cid, house.cid) && - Objects.equals(aid, house.aid) && - Objects.equals(state, house.state) && - Objects.equals(address, house.address) && - Objects.equals(cate, house.cate) && - Objects.equals(communityId, house.communityId) && - Objects.equals(total, house.total) && - Objects.equals(remain, house.remain); - } - - @Override - public int hashCode() { - return Objects.hash(id, rooname, size, thunb, price, description, created, content, lat, lng, userid, username, pid, cid, aid, state, address, cate, communityId, total, remain); + @Transient + public String getCommunityName() { + return communityName; + } + + public void setCommunityName(String communityName) { + this.communityName = communityName; } } diff --git a/src/com/app/bean/RefuseApply.java b/src/com/app/bean/RefuseApply.java index 255c70a..5bebd26 100644 --- a/src/com/app/bean/RefuseApply.java +++ b/src/com/app/bean/RefuseApply.java @@ -4,7 +4,6 @@ import javax.persistence.*; import java.util.Objects; @Entity -@Table(name = "refuse_apply", schema = "dbo", catalog = "gzf") public class RefuseApply { private Integer id; private Integer applyId; diff --git a/src/com/app/bean/Report.hbm.xml b/src/com/app/bean/Report.hbm.xml index 958bb99..d41ea0d 100644 --- a/src/com/app/bean/Report.hbm.xml +++ b/src/com/app/bean/Report.hbm.xml @@ -7,7 +7,7 @@ - + diff --git a/src/com/app/bean/Report.java b/src/com/app/bean/Report.java index 76fc77b..3badc08 100644 --- a/src/com/app/bean/Report.java +++ b/src/com/app/bean/Report.java @@ -4,14 +4,24 @@ public class Report { public int id; public String content; public String title; - public String user; - - public String getUser() { - return user; + public Integer userId; + + public Integer applyUserId; + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getApplyUserId() { + return applyUserId; } - public void setUser(String user) { - this.user = user; + public void setApplyUserId(Integer applyUserId) { + this.applyUserId = applyUserId; } public String getTitle() { @@ -30,13 +40,13 @@ public class Report { return content; } - public String userid; + public Integer userid; - public void setUserid(String userid) { + public void setUserid(Integer userid) { this.userid = userid; } - public String getUserid() { + public Integer getUserid() { return userid; } diff --git a/src/com/app/bean/UserMaterial.java b/src/com/app/bean/UserMaterial.java new file mode 100644 index 0000000..2cd8427 --- /dev/null +++ b/src/com/app/bean/UserMaterial.java @@ -0,0 +1,86 @@ +package com.app.bean; + +import javax.persistence.*; + +@Entity +@Table(name = "user_material") +public class UserMaterial { + private Integer id; + private Integer userId; + private Integer formId; + private String formValue; + private Integer applyId; + + private String formType; + private String materialName; + + @Id + @Column(name = "id") + @SequenceGenerator(name="increment") + @GeneratedValue(strategy=GenerationType.IDENTITY) + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @Basic + @Column(name = "user_id") + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + @Basic + @Column(name = "form_id") + public Integer getFormId() { + return formId; + } + + public void setFormId(Integer formId) { + this.formId = formId; + } + + @Basic + @Column(name = "form_value") + public String getFormValue() { + return formValue; + } + + public void setFormValue(String formValue) { + this.formValue = formValue; + } + + @Basic + @Column(name="apply_id") + public Integer getApplyId() { + return applyId; + } + + public void setApplyId(Integer applyId) { + this.applyId = applyId; + } + + @Transient + public String getFormType() { + return formType; + } + + public void setFormType(String formType) { + this.formType = formType; + } + + @Transient + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } +} diff --git a/src/com/app/service/ApplyService.java b/src/com/app/service/ApplyService.java index b8f3d0c..52ccb0f 100644 --- a/src/com/app/service/ApplyService.java +++ b/src/com/app/service/ApplyService.java @@ -5,17 +5,19 @@ import com.app.bean.Apply; import java.util.List; public interface ApplyService { - public void save(Apply model); + void save(Apply model); - public void update(Apply model); + void update(Apply model); - public Apply findById(int id); + Apply findById(int id); - public void delete(int id); + void delete(int id); - public List list(); + List list(); - public List list(String where); + List list(String where); - public List list(String where, String[] param); + List transformList(String where); + + List list(String where, String[] param); } \ No newline at end of file diff --git a/src/com/app/service/ApplyServiceImpl.java b/src/com/app/service/ApplyServiceImpl.java index 90be0c3..ad293c2 100644 --- a/src/com/app/service/ApplyServiceImpl.java +++ b/src/com/app/service/ApplyServiceImpl.java @@ -38,6 +38,10 @@ public class ApplyServiceImpl implements ApplyService { } public List list(String where) { + return factory.getCurrentSession().createQuery(where).list(); + } + + public List transformList(String where) { return factory.getCurrentSession().createQuery(where).setResultTransformer(Transformers.aliasToBean(Apply.class)).list(); } diff --git a/src/com/app/service/ConstantsService.java b/src/com/app/service/ConstantsService.java index 4d70e65..6d6218d 100644 --- a/src/com/app/service/ConstantsService.java +++ b/src/com/app/service/ConstantsService.java @@ -1,5 +1,6 @@ package com.app.service; +import com.app.bean.ApplicationMaterial; import com.app.bean.Region; import com.app.bean.Users; import org.springframework.beans.factory.annotation.Autowired; @@ -17,17 +18,24 @@ public class ConstantsService { public static final Map usersMap=new HashMap<>(); + public static final Map materialMap=new HashMap<>(); + @Autowired private RegionService regionService; @Autowired private UsersService usersService; + @Autowired + private MaterialService materialService; + @PostConstruct public void init(){ initRegion(); initUsers(); + + initMaterial(); } public void initRegion(){ @@ -46,11 +54,11 @@ public class ConstantsService { } } - public static Map getRegionMap() { - return regionMap; - } - - public static Map getUsersMap() { - return usersMap; + public void initMaterial(){ + materialMap.clear(); + List applicationMaterials=materialService.materialList(); + for(ApplicationMaterial material:applicationMaterials){ + materialMap.put(material.getFormName(),material); + } } } diff --git a/src/com/app/service/HouseService.java b/src/com/app/service/HouseService.java index 285f596..3ee0193 100644 --- a/src/com/app/service/HouseService.java +++ b/src/com/app/service/HouseService.java @@ -5,17 +5,21 @@ import com.app.bean.House; import java.util.List; public interface HouseService { - public void save(House model); + void save(House model); - public void update(House model); + void update(House model); - public House findById(int id); + House findById(int id); - public void delete(int id); + House findByIdWithCommunity(int id); - public List list(); + void delete(int id); - public List list(String where); + List list(); - public List list(String where, String[] param); + List list(String where); + + List transformList(String where); + + List list(String where, String[] param); } \ No newline at end of file diff --git a/src/com/app/service/HouseServiceImpl.java b/src/com/app/service/HouseServiceImpl.java index c894b95..aaaac3a 100644 --- a/src/com/app/service/HouseServiceImpl.java +++ b/src/com/app/service/HouseServiceImpl.java @@ -3,6 +3,7 @@ package com.app.service; import com.app.bean.House; import org.hibernate.Query; import org.hibernate.SessionFactory; +import org.hibernate.transform.Transformers; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,6 +28,16 @@ public class HouseServiceImpl implements HouseService { return (House) factory.getCurrentSession().get(House.class, id); } + @Override + public House findByIdWithCommunity(int id) { + return (House) factory.getCurrentSession().createQuery( + "select h.id as id,c.name as rooname,c.address as address,h.size as size," + + "c.houseType as cate,h.price as price,c.description as description ,h.state as state " + + "from House h,Community c where h.id=? and h.communityId=c.id") + .setInteger(0,id) + .setResultTransformer(Transformers.aliasToBean(House.class)).uniqueResult(); + } + public void delete(int id) { factory.getCurrentSession().delete( factory.getCurrentSession().load(House.class, id)); @@ -36,10 +47,16 @@ public class HouseServiceImpl implements HouseService { return factory.getCurrentSession().createQuery("from House").list(); } + public List transformList(String where){ + return factory.getCurrentSession().createQuery(where).setResultTransformer(Transformers.aliasToBean(House.class)).list(); + } + public List list(String where) { return factory.getCurrentSession().createQuery(where).list(); } + + public List list(String where, String[] param) { Query q = factory.getCurrentSession().createQuery(where); int i = 0; diff --git a/src/com/app/service/MaterialService.java b/src/com/app/service/MaterialService.java new file mode 100644 index 0000000..7885c88 --- /dev/null +++ b/src/com/app/service/MaterialService.java @@ -0,0 +1,36 @@ +package com.app.service; + +import com.app.bean.ApplicationMaterial; +import com.app.bean.UserMaterial; + +import java.util.List; + +public interface MaterialService { + + //ȡ϶б + List materialList(); + + //϶ + boolean addMaterial(ApplicationMaterial applicationMaterial); + + // + ApplicationMaterial find(Integer id); + + //϶˳ + boolean updateMaterial(ApplicationMaterial applicationMaterial); + + //ɾ϶ + boolean deleteMaterial(Integer id); + + //ûύ + boolean submitMaterial(UserMaterial userMaterial); + + //û༭ + boolean updateMaterial(UserMaterial userMaterial); + + //ɾû + boolean deleteUserMaterial(Integer userId); + + //û + List export(Integer applyId); +} diff --git a/src/com/app/service/MaterialServiceImpl.java b/src/com/app/service/MaterialServiceImpl.java new file mode 100644 index 0000000..62ca597 --- /dev/null +++ b/src/com/app/service/MaterialServiceImpl.java @@ -0,0 +1,135 @@ +package com.app.service; + +import com.app.bean.ApplicationMaterial; +import com.app.bean.UserMaterial; +import org.apache.log4j.Logger; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.criterion.DetachedCriteria; +import org.hibernate.criterion.Order; +import org.hibernate.transform.Transformers; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +@Service +@Transactional +public class MaterialServiceImpl implements MaterialService{ + + private static final Logger logger= Logger.getLogger(MaterialServiceImpl.class); + + @Autowired + private HibernateTemplate hibernateTemplate; + + @Override + public List materialList() { + try { + return (List) hibernateTemplate.findByCriteria(DetachedCriteria.forClass(ApplicationMaterial.class).addOrder(Order.asc("formOrder"))); + } catch (DataAccessException e) { + e.printStackTrace(); + logger.error(e); + } + return new ArrayList<>(); + } + + @Override + public boolean addMaterial(ApplicationMaterial applicationMaterial) { + try { + ApplicationMaterial c=new ApplicationMaterial(); + c.setFormName(applicationMaterial.getFormName()); + c.setFormOrder(applicationMaterial.getFormOrder()); + c.setMaterialName(applicationMaterial.getMaterialName()); + c.setFormType(applicationMaterial.getFormType()); + return hibernateTemplate.save(c)!=null; + } catch (DataAccessException e) { + e.printStackTrace(); + logger.error(e); + } + return false; + } + + @Override + public boolean deleteMaterial(final Integer id) { + return (boolean) hibernateTemplate.execute(new HibernateCallback() { + public Object doInHibernate(Session session) throws HibernateException { + Query query = session.createQuery("delete from ApplicationMaterial where id=?"); + query.setInteger(0,id); + return query.executeUpdate()>0; + } + }); + } + + @Override + public boolean updateMaterial(final ApplicationMaterial applicationMaterial) { + return (boolean) hibernateTemplate.execute(new HibernateCallback() { + public Object doInHibernate(Session session) throws HibernateException { + Query query = session.createQuery("update ApplicationMaterial set formOrder=?,materialName=? where id=?"); + query.setInteger(0,applicationMaterial.getFormOrder()); + query.setString(1,applicationMaterial.getMaterialName()); + query.setInteger(2,applicationMaterial.getId()); + return query.executeUpdate()>0; + } + }); + } + + @Override + public ApplicationMaterial find(Integer id) { + return (ApplicationMaterial) hibernateTemplate.get(ApplicationMaterial.class,id); + } + + @Override + public boolean submitMaterial(UserMaterial userMaterial) { + try { + return hibernateTemplate.save(userMaterial)!=null; + } catch (DataAccessException e) { + e.printStackTrace(); + logger.error(e); + } + return false; + } + + @Override + public boolean updateMaterial(UserMaterial userMaterial) { + try { + hibernateTemplate.update(userMaterial); + return true; + } catch (DataAccessException e) { + e.printStackTrace(); + logger.error(e); + } + return false; + } + + @Override + public boolean deleteUserMaterial(final Integer userId) { + return (boolean) hibernateTemplate.execute(new HibernateCallback() { + public Object doInHibernate(Session session) throws HibernateException { + Query query = session.createQuery("delete from UserMaterial where userId=?"); + query.setInteger(0,userId); + return query.executeUpdate()>0; + } + }); + } + + @SuppressWarnings("unchecked") + @Override + public List export(final Integer applyId) { + return (List) hibernateTemplate.execute(new HibernateCallback() { + @Override + public Object doInHibernate(Session session) throws HibernateException, SQLException { + Query query = session.createQuery("select u.formValue as formValue,a.materialName as materialName,a.formType as formType from UserMaterial u,ApplicationMaterial a " + + "where u.formId=a.id and u.applyId=? order by a.formOrder").setResultTransformer(Transformers.aliasToBean(UserMaterial.class)); + query.setInteger(0,applyId); + return query.list(); + } + }); + } +} diff --git a/src/com/app/service/ReportServiceImpl.java b/src/com/app/service/ReportServiceImpl.java index f6fcccd..427fff5 100644 --- a/src/com/app/service/ReportServiceImpl.java +++ b/src/com/app/service/ReportServiceImpl.java @@ -3,6 +3,7 @@ package com.app.service; import com.app.bean.Report; import org.hibernate.Query; import org.hibernate.SessionFactory; +import org.hibernate.transform.Transformers; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +38,7 @@ public class ReportServiceImpl implements ReportService { } public List list(String where) { - return factory.getCurrentSession().createQuery(where).list(); + return factory.getCurrentSession().createQuery(where).setResultTransformer(Transformers.aliasToBean(Report.class)).list(); } public List list(String where, String[] param) { diff --git a/src/com/app/servlet/FileUploadServlet.java b/src/com/app/servlet/FileUploadServlet.java index 90ca627..54c9ce6 100644 --- a/src/com/app/servlet/FileUploadServlet.java +++ b/src/com/app/servlet/FileUploadServlet.java @@ -89,7 +89,7 @@ public class FileUploadServlet extends HttpServlet { request.setAttribute("Saved", savePath); request.setAttribute("message", "Upload OK!~"); - request.getRequestDispatcher("upload.jsp").forward(request, response); + request.getRequestDispatcher("upload.jsp?name="+request.getParameter("name")).forward(request, response); } /** diff --git a/src/struts.xml b/src/struts.xml index 245060d..277b9d2 100644 --- a/src/struts.xml +++ b/src/struts.xml @@ -351,5 +351,49 @@ + + + + + list.do?state=${state}&message=${message} + true + + + + + /admin/materialAdd.jsp + + + + /admin/materialUpdate.jsp + + list.do?state=${state}&message=${message} + true + + + + + + list.do?state=${state}&message=${message} + true + + + + + /admin/material.jsp + + + + + list.do?state=${state}&message=${message} + true + + + + + /admin/userMaterial.jsp + + +