Merge branch 'master' of http://192.168.10.120:8080/other-project/tjmdp

src/main/java/com/qiankun/controller/ActivityController.java

+package com.qiankun.controller;
+ 
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.qiankun.controller.base.BaseController;
+import com.qiankun.entity.Activity;
+import com.qiankun.service.ActivityService;
+import com.qiankun.vo.ActivityVo;
+ 
+@Controller
+public class ActivityController extends BaseController<Object>{
+ 
+	@Autowired
+	private ActivityService activityService;
+    
+    @RequestMapping("/activity/list")
+    public ModelAndView list() throws Exception {
+        ModelAndView view = new ModelAndView();
+        view.setViewName("activity/activitylist");
+        return view;
+    }
+    
+    @RequestMapping("/activity/add")
+    public ModelAndView userAdd(String id) throws Exception {
+        ModelAndView view = new ModelAndView();
+        ActivityVo vo = new ActivityVo();
+        if(StringUtils.isNotBlank(id)) {
+        	Activity activity = activityService.findById(id);
+        	
+        	
+        }
+        
+        
+        view.setViewName("activity/saveactivity");
+        view.getModel().put("dict", dict());
+        view.getModel().put("activity", vo);
+        return view;
+    }
+
+}
\ No newline at end of file

src/main/java/com/qiankun/dao/ActivityDao.java

+package com.qiankun.dao;
+
+import java.util.Date;
+
+import com.qiankun.dao.core.Hints;
+import com.qiankun.dao.core.IDao;
+import com.qiankun.entity.Activity;
+import com.qiankun.pages.IPageList;
+
+public interface ActivityDao extends IDao<Activity, String> {
+
+	IPageList<Activity> findActivityPage(String searchStr, String type, String order, String sort,
+			Hints hints);
+
+	
+
+}

src/main/java/com/qiankun/dao/ActivityDaoImpl.java

+package com.qiankun.dao;
+
+import java.util.Date;
+
+import org.springframework.stereotype.Repository;
+
+import com.qiankun.dao.core.AbsDao;
+import com.qiankun.dao.core.Hints;
+import com.qiankun.entity.Activity;
+import com.qiankun.pages.IPageList;
+import com.qiankun.pages.PageListImpl;
+
+@Repository
+public class ActivityDaoImpl extends AbsDao<Activity, String> implements ActivityDao {
+	
+	
+	private static final String FIND_ACTIVITY_PAGE = " from Activity where name like ?  ";
+	
+	
+	@Override
+	public IPageList<Activity> findActivityPage(String searchStr, String type, String order, String sort, Hints hints) {
+		
+		
+		if (order == null){
+			order = " createTime ";
+		}
+		if (sort == null){
+			sort=" desc ";
+		}
+		
+		String hql = "";
+		if (type != null){
+			hql = " and type = '" + type + "'";
+		}
+		
+		if (searchStr == null) {
+			searchStr = "%";
+		}
+		String param = "%" + searchStr + "%";
+		IPageList<Activity> Activitys = new PageListImpl<Activity>();
+		
+		Activitys.setRecords(find(FIND_ACTIVITY_PAGE + hql + sortHQL(order, sort), hints, param));
+		Activitys.setRecordTotal(findCount(" select count(*) " + FIND_ACTIVITY_PAGE + hql, param));
+		
+		
+		return Activitys;
+	}	
+	
+	
+
+}

src/main/java/com/qiankun/entity/Activity.java

@@ -41,9 +41,6 @@ public class Activity {
 	@Lob
 	private String content;     //详细信息
 	
-	@ManyToOne
-	private User review;  //;
-	
 	private Date day;      //活动时间
 	
 	private long max;      //最大人数;
@@ -60,7 +57,7 @@ public class Activity {
 	@JsonIgnore
 	private Set<User> user = new HashSet<User>();
 	
-	private Date updateTime = new Date();
+	private Date createTime = new Date();
 
 	public String getId() {
 		return id;
@@ -102,14 +99,6 @@ public class Activity {
 		this.content = content;
 	}
 
-	public User getReview() {
-		return review;
-	}
-
-	public void setReview(User review) {
-		this.review = review;
-	}
-
 	public Date getDay() {
 		return day;
 	}
@@ -166,12 +155,12 @@ public class Activity {
 		this.user = user;
 	}
 
-	public Date getUpdateTime() {
-		return updateTime;
+	public Date getCreateTime() {
+		return createTime;
 	}
 
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
 	}
 
 	
@@ -180,4 +169,5 @@ public class Activity {
 	
 	
 	
+	
 }

src/main/java/com/qiankun/service/ActivityService.java

+package com.qiankun.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.qiankun.dao.ActivityDao;
+import com.qiankun.dao.core.Hints;
+import com.qiankun.entity.Activity;
+import com.qiankun.pages.IPageList;
+
+@Service
+public class ActivityService {
+
+	@Autowired
+	private ActivityDao activityDao;
+	
+	public Activity findById(String id) {
+		Activity activity = activityDao.find(id);
+		return activity;
+	}
+	
+	
+	@Transactional
+	public void save(Activity activity) {
+		activityDao.save(activity);		
+	}
+	
+	@Transactional
+	public void remove(String id) {
+		activityDao.remove(id);
+	}
+
+	public IPageList<Activity> findByActivitys(String searchStr,String type,String order,String sort, Hints hints){
+		IPageList<Activity> activitys = activityDao.findActivityPage(searchStr, type, order, sort, hints);
+		return activitys;
+	}
+
+}

src/main/java/com/qiankun/service/UserService.java

 package com.qiankun.service;
 
-import org.dom4j.util.UserDataDocumentFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,8 +23,8 @@ public class UserService {
 	
 	
 	@Transactional
-	public void save(User user) {
-		userDao.save(user);		
+	public User save(User user) {
+		return userDao.save(user);		
 	}
 	
 	@Transactional

src/main/java/com/qiankun/vo/ActivityVo.java

+package com.qiankun.vo;
+
+import java.util.Date;
+
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+
+import com.qiankun.entity.User;
+
+public class ActivityVo {
+	
+private String id;
+	
+	private String name;    //活动名称
+	
+	private String type;    //活动类型
+	
+	private String addr;     //地点
+	
+	private String content;     //详细信息
+	
+	private Date day;      //活动时间
+	
+	private long max;      //最大人数;
+	
+	private String crowd;  //适用人群  1,2,3
+	
+	private boolean available;  //活动是否可用
+	
+	private String contacts;  //联系人
+	
+	private String tel; //联系电话
+
+    
+    
+    
+	
+}

src/main/webapp/WEB-INF/decorators/main.jsp

@@ -246,7 +246,7 @@
 
 							<ul class="submenu">
 								<li>
-									<a href="form-elements.html">
+									<a href="<webpath:path/>/activity/list">
 										<i class="icon-double-angle-right"></i>
 										活动管理
 									</a>
@@ -276,7 +276,6 @@
 
 								<span class="menu-text">
 									礼物管理
-									
 								</span>
 							</a>
 						</li>

src/main/webapp/WEB-INF/pages/activity/activitylist.jsp

+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<%@ taglib prefix="webpath" uri="/WEB-INF/tlds/path.tld"%>
+<%@ taglib prefix="webpage" uri="/WEB-INF/tlds/pageview.tld"%>
+
+<head>
+	
+
+</head>
+		
+
+<div class="main-content">
+	<div class="breadcrumbs" id="breadcrumbs">
+		
+
+		<ul class="breadcrumb">
+			<li>
+				<i class="icon-home home-icon"></i>
+				<a href="#">首页</a>
+			</li>
+			<li class="active">活动管理</li>
+		</ul><!-- .breadcrumb -->
+
+		
+	</div>
+	<div class="page-content">
+		<div class="row">
+		
+			<div class="col-xs-12">
+			<div class="widget-toolbox">
+				<div class="btn-group">
+					<button class="btn btn-sm btn-success" onclick="window.location.href='<webpath:path/>/user/add'">
+						<i class="icon-plus-sign-alt bigger-110"></i>
+						新增
+					</button>
+					
+					<button class="btn btn-sm btn-success">
+						<i class="icon-star-half-full bigger-110"></i>
+						禁用
+					</button>
+		
+					<button class="btn btn-sm btn-danger">
+						<i class="icon-trash bigger-110"></i>
+						删除
+					</button>
+				</div>
+			</div>
+			
+			<div class="pull-left">共条</div>
+				<table id="table-data" class="table table-bordered ">
+					<thead>
+						<tr class="">
+							<th class="center">
+								<label>
+									<input type="checkbox" class="ace">
+									<span class="lbl"></span>
+								</label>
+							</th>
+							<th>活动名称</th>
+							<th>活动类型</th>
+							<th>活动地址</th>
+							<th>活动时间</th>
+							<th>最大人数</th>
+							<th>适用人群</th>
+							<th>联系人</th>
+							<th>联系电话</th>
+							<th class="hidden-480">状态</th>
+		
+							<th width="100">操作</th>
+						</tr>
+					</thead>
+		
+					<tbody>
+					
+						
+						<tr class="tr-highlight">
+							<td class="center" width=10>
+								<label>
+									<input type="checkbox" class="ace">
+									<span class="lbl"></span>
+								</label>
+							</td>
+		
+							<td title=""></td>
+							<td title=""></td>
+							<td title=""></td>
+							<td title=""></td>
+							<td title=""></td>
+							<td title=""></td>
+							<td title=""></td>
+							<td title=""></td>
+							<td title=""></td>
+							
+							<td>
+								<div class="visible-md visible-lg hidden-sm hidden-xs btn-group">
+									
+		
+									<button class="btn btn-xs btn-info" onclick="window.location.href='<webpath:path/>/'">
+										<i class="icon-edit bigger-120"></i>
+									</button>
+									&nbsp;
+		
+									<button class="btn btn-xs btn-danger">
+										<i class="icon-trash bigger-120"></i>
+									</button>
+		
+									
+								</div>
+		
+								
+							</td>
+						</tr>
+						
+						
+		
+						
+		
+						
+		
+						
+					</tbody>
+				</table>
+											
+											
+											
+					
+			</div>
+			
+		</div>
+	</div>
+	
+	
+	
+	
+	
+	
+</div>
+