Merge branch 'master' of http://fywlsoft.cn:50379/other-project/tjmdp

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

 package com.qiankun.controller;
  
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.common.collect.Maps;
+import com.qiankun.entity.ActivityReg;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -48,9 +47,23 @@ public class ActivityController extends BaseController<Object>{
 	
 	@Auth(verifyLogin = false,verifyURL = false)
 	@RequestMapping(value = "/wx/api/activity", method = RequestMethod.POST)
-    public @ResponseBody Activity entityformWX(@RequestBody ActivityVo activityVo, HttpServletResponse response, HttpServletRequest request) throws Exception {
-        Activity activity = activityService.findById(activityVo.getId()); 
-        return activity;
+    public @ResponseBody Map<String,Object> entityformWX(@RequestBody ActivityVo activityVo, HttpServletResponse response, HttpServletRequest request) throws Exception {
+        Map<String,Object> result = Maps.newConcurrentMap();
+	    Activity activity = activityService.findById(activityVo.getId());
+	    result.put("status","ok");
+	    result.put("activity",activity);
+	    result.put("activityRegCount",activity.getActivityReg().size());
+        Iterator<ActivityReg> it = activity.getActivityReg().iterator();
+        boolean currentUserApplyed = false;//当前用户是否报名
+        while (it.hasNext()){
+            ActivityReg reg = it.next();
+            if (reg.getUser().getId().equals(activityVo.getUserId())){
+                currentUserApplyed = true;
+                break;
+            }
+        }
+        result.put("currentUserApplyed",currentUserApplyed);
+        return result;
     }
 	
 	@Auth(verifyLogin = false,verifyURL = false)

src/main/java/com/qiankun/controller/mdp/MdpController.java

@@ -10,10 +10,14 @@ import com.qiankun.annotation.Auth;
 import com.qiankun.config.WxMaConfiguration;
 import com.qiankun.config.WxMaProperties;
 import com.qiankun.dao.UserDao;
+import com.qiankun.entity.Activity;
+import com.qiankun.entity.ActivityReg;
 import com.qiankun.entity.Contacts;
 import com.qiankun.entity.User;
+import com.qiankun.service.ActivityService;
 import com.qiankun.service.UserService;
 import com.qiankun.utils.JwtTokenUtil;
+import com.qiankun.utils.QRCodeUtil;
 import com.qiankun.utils.UserUtils;
 import com.qiankun.vo.DecryptedDataVo;
 import com.qiankun.vo.PaperIdLoginVo;
@@ -32,6 +36,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
@@ -49,6 +54,8 @@ public class MdpController {
     private WxMaProperties propertis;
     @Autowired
     private UserService userService;
+    @Autowired
+    private ActivityService activityService;
     private ResourceBundle rb = ResourceBundle.getBundle("system");
     private String getAppid(){
         return propertis.getConfigs().get(1).getAppid();
@@ -258,4 +265,41 @@ public class MdpController {
         File file = new File(rb.getString("file_path"),imageName);
         return new ResponseEntity<>(FileUtils.readFileToByteArray(file),headers, HttpStatus.OK);
     }
+    @Auth(verifyLogin = false,verifyURL = false)
+    @RequestMapping(value = "/userQrcode",method = RequestMethod.GET)
+    public void getUserQrcode(@RequestParam String id, HttpServletResponse response) throws Exception {
+        QRCodeUtil.generateQRCode(id,100,100,"png",response);
+        response.flushBuffer();
+    }
+    @Auth(verifyURL = false,verifyLogin = false)
+    @RequestMapping(value = "/activity/apply",method = RequestMethod.GET)
+    public Map<String,Object> activityApply(@RequestParam String userId,@RequestParam String activityId){
+        Map<String,Object> result = Maps.newConcurrentMap();
+        User user = userService.findById(userId);
+        if (user == null){
+            result.put("status","error");
+            result.put("errorMsg","用户不存在");
+            return result;
+        }
+        Activity activity = activityService.findById(activityId);
+        if (activity == null){
+            result.put("status","error");
+            result.put("errorMsg","活动不存在");
+            return result;
+        }else if (!activity.isAvailable()){
+            result.put("status","error");
+            result.put("errorMsg","活动已关闭");
+            return result;
+        }else if (activity.getActivityReg().size() >= activity.getMax()){
+            result.put("status","error");
+            result.put("errorMsg","活动报名人数已达上限");
+            return result;
+        }
+        ActivityReg reg = new ActivityReg();
+        reg.setUser(user);
+        reg.setActivity(activity);
+        activityService.saveActivityReg(reg);
+        result.put("status","ok");
+        return result;
+    }
 }

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

+package com.qiankun.dao;
+
+import com.qiankun.dao.core.IDao;
+import com.qiankun.entity.ActivityReg;
+
+public interface ActivityRegDao extends IDao<ActivityReg,String> {
+
+}

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

+package com.qiankun.dao;
+
+import com.qiankun.dao.core.AbsDao;
+import com.qiankun.entity.ActivityReg;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class ActivityRegDaoImpl extends AbsDao<ActivityReg,String> implements ActivityRegDao {
+}

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

 package com.qiankun.service;
 
 import com.qiankun.dao.ActivityDao;
+import com.qiankun.dao.ActivityRegDao;
 import com.qiankun.dao.ActivityTypeDao;
 import com.qiankun.dao.core.Hints;
 import com.qiankun.entity.Activity;
+import com.qiankun.entity.ActivityReg;
 import com.qiankun.entity.ActivityType;
 import com.qiankun.pages.IPageList;
 import org.apache.commons.collections.CollectionUtils;
@@ -18,6 +20,8 @@ public class ActivityService {
 
 	@Autowired
 	private ActivityDao activityDao;
+	@Autowired
+	private ActivityRegDao activityRegDao;
 	
 	@Autowired
 	private ActivityTypeDao activityTypeDao;
@@ -76,6 +80,9 @@ public class ActivityService {
 		ActivityType type = activityTypeDao.find(id);
 		return type;
 	}
-	
 
+    @Transactional
+    public void saveActivityReg(ActivityReg reg) {
+	    activityRegDao.save(reg);
+    }
 }

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

@@ -27,6 +27,7 @@ private String id;
     private String searchStr;
     private String order;
     private String sort;
+    private String userId;//请求用户ID
 
 	public String getId() {
 		return id;
@@ -141,8 +142,11 @@ private String id;
 		this.sort = sort;
 	}
 
-    
-    
-    
-	
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }