活动管理和合伙人管理新增内容

common/src/main/java/com/winsun/bean/HhrActivity.java

+package com.winsun.bean;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import lombok.Data;
+
+@SuppressWarnings("serial")
+@TableName("hhr_activity")
+@Data
+public class HhrActivity implements Serializable{
+
+    /**
+     * 主键
+     */
+	@TableId(type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 活动标题
+     */
+    private String title;
+
+    /**
+     * 活动详情
+     */
+    private String desc;
+
+    /**
+     * 活动积分
+     */
+    private int integral;
+
+    /**
+     * 活动封面图片
+     */
+    private String imageUrl;
+
+    /**
+     * 活动类型
+     */
+    private String activityType;
+
+    /**
+     * 活动小类
+     */
+    private String subclass;
+
+    /**
+     * 学生证照片
+     */
+    private String range;
+    
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 排序号
+     */
+    private int sort;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    
+    /**
+     * 创建人
+     */
+    private String creator;
+    
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 删除标记
+     */
+    private int delFlag;
+}

common/src/main/java/com/winsun/bean/HhrUser.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@TableName("hhr_user")
+@Data
+public class HhrUser implements Serializable{
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 身份证号码
+     */
+    private String idCard;
+
+    /**
+     * 年纪
+     */
+    private String grade;
+
+    /**
+     * 预实名
+     */
+    private String ysm;
+
+    /**
+     * 微信头像
+     */
+    private String wxHeadImgUrl;
+
+    /**
+     * 公众号openid
+     */
+    private String openId;
+
+    /**
+     * 身份证照片
+     */
+    private String idcardImgUrl;
+
+    /**
+     * 学生证照片
+     */
+    private String studentImgUrl;
+    
+    /**
+     * 学子公司职位
+     */
+    private String position;
+
+    /**
+     * 上级id
+     */
+    private String parentId;
+
+    /**
+     * 所有上级id
+     */
+    private String parentIds;
+
+    
+    // 非数据库字段
+    /**
+     * 姓名
+     */
+    @TableField(exist = false)
+    private String name;
+}

common/src/main/java/com/winsun/mapper/ActivityMapper.java

+package com.winsun.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.HhrActivity;
+import com.winsun.bean.HhrUser;
+
+/**
+ * 合伙人用户表的Mapper
+ */
+@Mapper
+@Component
+public interface ActivityMapper extends BaseMapper<HhrActivity> {
+}

common/src/main/java/com/winsun/mapper/HhrUserMapper.java

+package com.winsun.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.HhrUser;
+
+/**
+ * 合伙人用户表的Mapper
+ */
+@Mapper
+@Component
+public interface HhrUserMapper extends BaseMapper<HhrUser> {
+}

common/src/main/java/com/winsun/utils/EntityUtil.java

+package com.winsun.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.cglib.beans.BeanMap;
+
+/**
+ * 实体类工具类
+ * @author dongyp
+ *
+ */
+public class EntityUtil {
+	
+	@SuppressWarnings("unchecked")
+	public static List<Map<String, Object>> entityToMap(List<T> list){
+		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
+		for(T entity : list) {
+			resultList.add(BeanMap.create(entity));
+		}
+			
+		return resultList;
+	} 
+}

common/src/main/java/com/winsun/utils/MapUtil.java

+package com.winsun.utils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MapUtil {
+	
+	/**
+	 * 
+	 * @param list 集合
+	 * @param key 作为key的字段名
+	 * @param keyValue 作为key的value值字段名
+	 * @return
+	 */
+	public static Map<String,Object> listToMap(List<Map<String, Object>> list,String key,String keyValue){
+		Map<String,Object> map = new HashMap<String, Object>();
+		for(Map<String, Object> theMap : list) {
+			if(null != theMap.get(key) && null != theMap.get(keyValue)) {
+				map.put(theMap.get(key).toString(), theMap.get(keyValue));
+			}
+		}
+		
+		return map;
+	}
+	
+	/**
+	 * 
+	 * @param list 集合
+	 * @param key 作为key的字段名
+	 * @return
+	 */
+	public static Map<String,Object> listToMap(List<Map<String, Object>> list,String key){
+		Map<String,Object> map = new HashMap<String, Object>();
+		for(Map<String, Object> theMap : list) {
+			if(null != theMap.get(key)) {
+				map.put(theMap.get(key).toString(), theMap);
+			}
+		}
+		
+		return map;
+	}
+}

service-manager/src/main/java/com/winsun/controller/ActivityController.java

+package com.winsun.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.enums.SqlLike;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.winsun.auth.core.annotion.Permission;
+import com.winsun.auth.core.base.controller.BaseController;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.auth.core.shiro.ShiroUser;
+import com.winsun.bean.HhrActivity;
+import com.winsun.mapper.ActivityMapper;
+
+/**
+ * @Author: chancy
+ * @Date: 2020/2/12 17:26
+ */
+@RestController
+@RequestMapping("/activity")
+public class ActivityController extends BaseController {
+
+	private static ActivityMapper activityMapper;
+
+	@Autowired
+	public ActivityController(ActivityMapper activityMapper) {
+		ActivityController.activityMapper = activityMapper;
+	}
+	
+	@Permission(menuname = "查询活动信息", value = "list", method = RequestMethod.POST)
+	public ResponseData<Page<HhrActivity>> list(@RequestParam("title") String title,
+			@RequestParam("activityType") String activityType, @RequestParam("subclass") String subclass,
+			@RequestParam(name = "status", required = false) String status,
+			@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
+			@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
+			@RequestParam(name = "pageNo", required = false) int pageIndex,
+			@RequestParam(name = "pageSize", required = false) int pageSize) {
+		Wrapper<HhrActivity> wrapper = new EntityWrapper<HhrActivity>();
+		wrapper.like(StringUtils.isNotBlank(title), "title", title, SqlLike.DEFAULT);
+		wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
+		wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
+		
+		Page<HhrActivity> page = new Page<>(pageIndex, pageSize);
+		List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
+		page.setRecords(list);
+		return ResponseData.success(page, "查询完毕！");
+	}
+	
+	@Permission(menuname = "新增活动", value = "addActivity", method = RequestMethod.POST)
+	public ResponseData<String> addActivity(@RequestParam("title") String title, @RequestParam("desc") String desc,
+			@RequestParam("integral") String integral, @RequestParam("activityType") String activityType, 
+			@RequestParam("subclass") String subclass,@RequestParam("imageUrl") String imageUrl,
+			@RequestParam("sort") String sort, @RequestParam("range") String range){
+		
+		ShiroUser user = getShiroUser();
+
+		HhrActivity activity = new HhrActivity();
+		activity.setTitle(title);
+		activity.setDesc(desc);
+		activity.setIntegral(Integer.parseInt(integral));
+		activity.setActivityType(activityType);
+		activity.setSubclass(subclass);
+		activity.setSort(Integer.parseInt(sort));
+		activity.setRange(range);
+		activity.setImageUrl(imageUrl);
+		activity.setCreator(user.getName());
+		activity.setCreateTime(new Date());
+		activity.setUpdateTime(new Date());
+		int num = activityMapper.insert(activity);
+		if (num > 0) {
+			return ResponseData.success("修改完毕！");
+		}
+
+		return ResponseData.error("修改失败");
+	}
+	
+	@Permission(menuname = "修改活动", value = "updateActivity", method = RequestMethod.POST)
+	public ResponseData<String> addActivity(@RequestParam("id") String id, 
+			@RequestParam("title") String title, @RequestParam("desc") String desc,
+			@RequestParam("integral") String integral, @RequestParam("activityType") String activityType, 
+			@RequestParam("subclass") String subclass,@RequestParam("imageUrl") String imageUrl,
+			@RequestParam("sort") String sort, @RequestParam("range") String range){
+
+		HhrActivity activity = new HhrActivity();
+		activity.setId(id);
+		activity.setTitle(title);
+		activity.setDesc(desc);
+		activity.setIntegral(Integer.parseInt(integral));
+		activity.setActivityType(activityType);
+		activity.setSubclass(subclass);
+		activity.setSort(Integer.parseInt(sort));
+		activity.setRange(range);
+		activity.setImageUrl(imageUrl);
+		activity.setUpdateTime(new Date());
+		int num = activityMapper.updateById(activity);
+		
+		if (num > 0) {
+			return ResponseData.success("修改完毕！");
+		}
+
+		return ResponseData.error("修改失败");
+	}
+	
+	@Permission(menuname = "删除活动", value = "deleteActivity", method = RequestMethod.POST)
+	public ResponseData<String> deleteActivity(@RequestParam("id") String id){
+
+		HhrActivity activity = new HhrActivity();
+		activity.setId(id);
+		activity.setDelFlag(1);
+		int num = activityMapper.updateById(activity);
+		
+		if (num > 0) {
+			return ResponseData.success("删除完毕！");
+		}
+
+		return ResponseData.error("删除失败");
+	}
+	
+}