feats

src/main/java/com/yunzhi/liyuanhui/controller/TaActivityEnrollController.java

@@ -42,12 +42,14 @@ public class TaActivityEnrollController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taActivityEnroll",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/activityEnroll",method= RequestMethod.GET)
     public ResponseBean taActivityEnrollList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value ="activityId") Integer activityId) throws Exception{
 
         IPage<TaActivityEnroll> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaActivityEnroll> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", activityId);
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaActivityEnroll> result = iTaActivityEnrollService.page(pg, queryWrapper);

src/main/java/com/yunzhi/liyuanhui/controller/TaActivityVoteItemController.java

@@ -0,0 +1,111 @@
+package com.yunzhi.liyuanhui.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.liyuanhui.common.BaseController;
+import com.yunzhi.liyuanhui.common.ResponseBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+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.ResponseBody;
+import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+    * 投票项目  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-08-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaActivityVoteItemController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaActivityVoteItemController.class);
+
+    @Autowired
+    public ITaActivityVoteItemService iTaActivityVoteItemService;
+
+    /**
+     *
+     * @param client
+     * @param activityId
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/{client}/activity/{activityId}/voteitem",method= RequestMethod.GET)
+    public ResponseBean taActivityVoteItemList(@PathVariable String client,
+                                               @PathVariable Integer activityId) throws Exception{
+
+        List<TaActivityVoteItem> result = iTaActivityVoteItemService.getAllAvailableItems(activityId);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     *
+     * @param activityId
+     * @param voteItems
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/admin/activity/{activityId}/voteitem",method= RequestMethod.POST)
+    public ResponseBean taActivityVoteItemAdd(@PathVariable Integer activityId,
+                                              @RequestBody List<TaActivityVoteItem> voteItems) throws Exception{
+        if (null == voteItems) {
+            return ResponseBean.error("未发现需要保存内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        List<TaActivityVoteItem> result = iTaActivityVoteItemService.mergeBy(activityId, voteItems);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/activityVoteItem/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taActivityVoteItemDelete(@PathVariable Integer id) throws Exception{
+        if(iTaActivityVoteItemService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taActivityVoteItem 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taActivityVoteItem/{id}",method= RequestMethod.PUT)
+    public ResponseBean taActivityVoteItemUpdate(@PathVariable Integer id,
+                                        @RequestBody TaActivityVoteItem taActivityVoteItem) throws Exception{
+        if (iTaActivityVoteItemService.updateById(taActivityVoteItem)){
+            return ResponseBean.success(taActivityVoteItem);
+        }else {
+            return ResponseBean.error("修改失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taActivityVoteItem/{id}",method= RequestMethod.GET)
+    public ResponseBean taActivityVoteItemGet(@PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaActivityVoteItemService.getById(id));
+    }
+}

src/main/java/com/yunzhi/liyuanhui/entity/SysModule.java

@@ -1,6 +1,9 @@
 package com.yunzhi.liyuanhui.entity;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,6 +26,7 @@ public class SysModule implements Serializable {
     /**
      * 模块编码
      */
+    @TableId(value = "module_code", type = IdType.INPUT)
     private String moduleCode;
 
     /**

src/main/java/com/yunzhi/liyuanhui/entity/TaActivity.java

@@ -119,6 +119,11 @@ public class TaActivity implements Serializable {
      */
     private Integer voteNum;
 
+    /**
+     * 是否报名
+     */
+    private Boolean isEnroll;
+
     /**
      * 报名人数
      */

src/main/java/com/yunzhi/liyuanhui/entity/TaActivityVote.java

@@ -45,7 +45,17 @@ public class TaActivityVote implements Serializable {
     private String activityThumb;
 
     /**
-     * 报名人
+     * 项目ID
+     */
+    private Integer itemId;
+
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 投票人
      */
     private Integer personId;
 

src/main/java/com/yunzhi/liyuanhui/entity/TaActivityVoteItem.java

@@ -0,0 +1,63 @@
+package com.yunzhi.liyuanhui.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 投票项目 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaActivityVoteItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+    @TableId(value = "item_id", type = IdType.AUTO)
+    private Integer itemId;
+
+    /**
+     * 活动ID
+     */
+    private Integer activityId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 票数
+     */
+    private Integer voteNum;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sortNo;
+
+
+}

src/main/java/com/yunzhi/liyuanhui/enums/BaseEnum.java

@@ -0,0 +1,42 @@
+package com.yunzhi.liyuanhui.enums;
+
+public interface BaseEnum {
+
+    /**
+     * 获取枚举标识
+     *
+     * @return
+     */
+    Integer getCode();
+
+    /**
+     * 获取枚举描述
+     *
+     * @return
+     */
+    String getDesc();
+
+    /**
+     * 通过枚举类型和code值获取对应的枚举类型
+     * @param enumType
+     * @param code
+     * @param <T>
+     * @return
+     */
+    static <T extends BaseEnum> T valueOf(Class<? extends BaseEnum> enumType, Integer code) {
+        if (enumType == null || code == null) {
+            return null;
+        }
+        T[] enumConstants = (T[]) enumType.getEnumConstants();
+        if (enumConstants == null) {
+            return null;
+        }
+        for (T enumConstant : enumConstants) {
+            int enumCode = enumConstant.getCode();
+            if (code.equals(enumCode)) {
+                return enumConstant;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/yunzhi/liyuanhui/enums/StatusEnum.java

@@ -0,0 +1,14 @@
+package com.yunzhi.liyuanhui.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum StatusEnum implements BaseEnum {
+    NORMAL(1, "正常"),
+    DELETED(-1, "删除");
+
+    private Integer code;
+    private String desc;
+}

src/main/java/com/yunzhi/liyuanhui/mapper/TaActivityVoteItemMapper.java

@@ -0,0 +1,21 @@
+package com.yunzhi.liyuanhui.mapper;
+
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 投票项目  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-11
+ */
+@Mapper
+public interface TaActivityVoteItemMapper extends BaseMapper<TaActivityVoteItem> {
+
+    List<Integer> selectIdsByActivity(Integer activityId);
+}

src/main/java/com/yunzhi/liyuanhui/service/ITaActivityVoteItemService.java

@@ -0,0 +1,21 @@
+package com.yunzhi.liyuanhui.service;
+
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 投票项目  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-11
+ */
+public interface ITaActivityVoteItemService extends IService<TaActivityVoteItem> {
+
+    List<TaActivityVoteItem> mergeBy(Integer activityId, List<TaActivityVoteItem> voteItems) throws Exception;
+
+    List<TaActivityVoteItem> getAllAvailableItems(Integer activityId);
+}

src/main/java/com/yunzhi/liyuanhui/service/impl/TaActivityVoteItemServiceImpl.java

@@ -0,0 +1,86 @@
+package com.yunzhi.liyuanhui.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
+import com.yunzhi.liyuanhui.mapper.TaActivityVoteItemMapper;
+import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 投票项目  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-11
+ */
+@Service
+public class TaActivityVoteItemServiceImpl extends ServiceImpl<TaActivityVoteItemMapper, TaActivityVoteItem> implements ITaActivityVoteItemService {
+
+    @Autowired
+    TaActivityVoteItemMapper taActivityVoteItemMapper;
+
+    @Override
+    public List<TaActivityVoteItem> mergeBy(Integer activityId, List<TaActivityVoteItem> voteItems) throws Exception {
+        // 如果是一个没有, 则认为是全部删除
+        if (voteItems == null || voteItems.size() == 0) {
+            UpdateWrapper<TaActivityVoteItem> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.set("status", StatusEnum.DELETED.getCode());
+            updateWrapper.eq("activity_id", activityId);
+
+            this.update(updateWrapper);
+            return null;
+        }
+
+        // 如果数据库中没有已经存在的, 则全部保存
+        List<Integer> existsIds = taActivityVoteItemMapper.selectIdsByActivity(activityId);
+        if (null == existsIds || existsIds.size() == 0) {
+            for(TaActivityVoteItem item : voteItems) {
+                item.setActivityId(activityId);
+                this.save(item);
+            }
+        } else {
+
+            // 否则遍历去 merge
+            for(TaActivityVoteItem item : voteItems) {
+                if (null == item.getItemId() || item.getItemId() < 1) {
+                    item.setActivityId(activityId);
+                    this.save(item);
+                } else {
+                    this.updateById(item);
+
+                    // 数据中心已经存在的 减去 正常更新的 , 剩余就是被删除的
+                    existsIds.remove(item.getActivityId());
+                }
+            }
+
+            if (existsIds.size() > 0) {
+                UpdateWrapper<TaActivityVoteItem> updateWrapper1 = new UpdateWrapper<>();
+                updateWrapper1.set("status", StatusEnum.DELETED.getCode());
+                updateWrapper1.in("item_id", existsIds);
+                update(updateWrapper1);
+            }
+        }
+
+        return getAllAvailableItems(activityId);
+    }
+
+    @Override
+    public List<TaActivityVoteItem> getAllAvailableItems(Integer activityId) {
+
+        QueryWrapper<TaActivityVoteItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", activityId);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("sort_no");
+        queryWrapper.orderByDesc("create_date");
+
+        return list(queryWrapper);
+    }
+}

src/main/resources/mapper/TaActivityVoteItemMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.liyuanhui.mapper.TaActivityVoteItemMapper">
+
+    <select id="selectIdsByActivity" resultType="java.lang.Integer">
+        SELECT t.item_id
+        FROM ta_activity_vote_item t
+        WHERE t.activity_id = #{activityId}
+        AND t.`status` = 1
+    </select>
+</mapper>