调整投票接口

menduner/menduner-system-biz/pom.xml

@@ -24,6 +24,14 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
+
+        <!-- 依赖服务 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-biz-ip</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <!-- 依赖服务 -->
         <dependency>
             <groupId>com.citu</groupId>
@@ -95,6 +103,10 @@
             <artifactId>citu-spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-biz-ip</artifactId>
+        </dependency>
 
     </dependencies>
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/votingactivity/VotingActivityJoinUserController.java

@@ -29,48 +29,52 @@ import com.citu.framework.apilog.core.annotation.ApiAccessLog;
 import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
 
 
-
+/**
+ * @eo.api-type http
+ * @eo.groupName 新门墩儿.投票活动.后台
+ * @eo.path /admin-api/menduner/system/mde/voting-activity
+ */
 @Tag(name = "管理后台 - 投票参与人")
 @RestController
-@RequestMapping("/mde/voting-activity-join-user")
+@RequestMapping("/menduner/system/mde/voting-activity-join-user")
 @Validated
 public class VotingActivityJoinUserController {
 
     @Resource
     private VotingActivityJoinUserService votingActivityJoinUserService;
 
-    @PostMapping("/create")
-    @Operation(summary = "创建投票参与人")
-//    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:create')")
-    public CommonResult<Long> createVotingActivityJoinUser(@Valid @RequestBody VotingActivityJoinUserSaveReqVO createReqVO) {
-        return success(votingActivityJoinUserService.createVotingActivityJoinUser(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新投票参与人")
-//    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:update')")
-    public CommonResult<Boolean> updateVotingActivityJoinUser(@Valid @RequestBody VotingActivityJoinUserSaveReqVO updateReqVO) {
-        votingActivityJoinUserService.updateVotingActivityJoinUser(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除投票参与人")
-    @Parameter(name = "id", description = "编号", required = true)
-//    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:delete')")
-    public CommonResult<Boolean> deleteVotingActivityJoinUser(@RequestParam("id") Long id) {
-        votingActivityJoinUserService.deleteVotingActivityJoinUser(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得投票参与人")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-//    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:query')")
-    public CommonResult<VotingActivityJoinUserRespVO> getVotingActivityJoinUser(@RequestParam("id") Long id) {
-        VotingActivityJoinUserDO votingActivityJoinUser = votingActivityJoinUserService.getVotingActivityJoinUser(id);
-        return success(BeanUtils.toBean(votingActivityJoinUser, VotingActivityJoinUserRespVO.class));
-    }
+//    @PostMapping("/create")
+//    @Operation(summary = "创建投票参与人")
+////    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:create')")
+//    public CommonResult<Long> createVotingActivityJoinUser(@Valid @RequestBody VotingActivityJoinUserSaveReqVO createReqVO) {
+//        return success(votingActivityJoinUserService.createVotingActivityJoinUser(createReqVO));
+//    }
+
+//    @PutMapping("/update")
+//    @Operation(summary = "更新投票参与人")
+////    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:update')")
+//    public CommonResult<Boolean> updateVotingActivityJoinUser(@Valid @RequestBody VotingActivityJoinUserSaveReqVO updateReqVO) {
+//        votingActivityJoinUserService.updateVotingActivityJoinUser(updateReqVO);
+//        return success(true);
+//    }
+
+//    @DeleteMapping("/delete")
+//    @Operation(summary = "删除投票参与人")
+//    @Parameter(name = "id", description = "编号", required = true)
+////    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:delete')")
+//    public CommonResult<Boolean> deleteVotingActivityJoinUser(@RequestParam("id") Long id) {
+//        votingActivityJoinUserService.deleteVotingActivityJoinUser(id);
+//        return success(true);
+//    }
+
+//    @GetMapping("/get")
+//    @Operation(summary = "获得投票参与人")
+//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+////    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-user:query')")
+//    public CommonResult<VotingActivityJoinUserRespVO> getVotingActivityJoinUser(@RequestParam("id") Long id) {
+//        VotingActivityJoinUserDO votingActivityJoinUser = votingActivityJoinUserService.getVotingActivityJoinUser(id);
+//        return success(BeanUtils.toBean(votingActivityJoinUser, VotingActivityJoinUserRespVO.class));
+//    }
 
     @GetMapping("/page")
     @Operation(summary = "获得投票参与人分页")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/votingactivity/vo/VotingActivityJoinUserSaveReqVO.java

@@ -25,25 +25,27 @@ public class VotingActivityJoinUserSaveReqVO {
     @Schema(description = "投票人id")
     private String ip;
 
-    @Schema(description = "投票人电话")
-    private String phone;
-
-    @Schema(description = "投票人头像")
-    private String headImg;
-
-    @Schema(description = "投票人姓名", example = "王五")
-    private String nickName;
-
-    @Schema(description = "邀请人", example = "2573")
-    private Integer inviterUserId;
-
-    @Schema(description = "邀请电话")
-    private String inviterUserPhone;
-
-    @Schema(description = "邀请人姓名", example = "张三")
-    private String inviterNickName;
-
-    @Schema(description = "邀请渠道/方式")
-    private String inviterChannel;
+    private String userAgent;
+
+//    @Schema(description = "投票人电话")
+//    private String phone;
+//
+//    @Schema(description = "投票人头像")
+//    private String headImg;
+//
+//    @Schema(description = "投票人姓名", example = "王五")
+//    private String nickName;
+//
+//    @Schema(description = "邀请人", example = "2573")
+//    private Integer inviterUserId;
+//
+//    @Schema(description = "邀请电话")
+//    private String inviterUserPhone;
+//
+//    @Schema(description = "邀请人姓名", example = "张三")
+//    private String inviterNickName;
+//
+//    @Schema(description = "邀请渠道/方式")
+//    private String inviterChannel;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/votingactivity/AppVotingActivityJoinItemController.java

@@ -29,8 +29,8 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 
 /**
  * @eo.api-type http
- * @eo.groupName 新门墩儿.投票活动.后台
- * @eo.path /admin-api/menduner/system/mde/voting-activity
+ * @eo.groupName 新门墩儿.投票活动.前台
+ * @eo.path /app-api/menduner/system/mde/voting-activity
  */
 @Tag(name = "管理后台 - 投票活动参与被投票的")
 @RestController
@@ -42,7 +42,7 @@ public class AppVotingActivityJoinItemController {
     private VotingActivityJoinItemService votingActivityJoinItemService;
 
     @PostMapping("/page")
-    @Operation(summary = "获得投票活动参与被投票的分页")
+    @Operation(summary = "获得投票活动参与被投票项的分页")
 //    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-item:query')")
     public CommonResult<PageResult<VotingActivityJoinItemRespVO>> getVotingActivityJoinItemPage(@Valid VotingActivityJoinItemPageReqVO pageReqVO) {
         PageResult<VotingActivityJoinItemDO> pageResult = votingActivityJoinItemService.getVotingActivityJoinItemPage(pageReqVO);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/votingactivity/AppVotingActivityJoinUserController.java

@@ -5,6 +5,7 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.common.util.servlet.ServletUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
 import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.admin.votingactivity.vo.VotingActivityJoinUserPageReqVO;
@@ -19,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
@@ -28,7 +30,12 @@ import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.citu.framework.common.pojo.CommonResult.success;
 
 
-@Tag(name = "管理后台 - 投票参与人")
+/**
+ * @eo.api-type http
+ * @eo.groupName 新门墩儿.投票活动.前台
+ * @eo.path /app-api/menduner-system/mde/voting-activity
+ */
+@Tag(name = "投票参与人")
 @RestController
 @RequestMapping("/menduner/system/mde/voting-activity-join-user")
 @Validated
@@ -39,8 +46,10 @@ public class AppVotingActivityJoinUserController {
 
     @PostMapping("/voting")
     @Operation(summary = "投票")
-    public CommonResult<Long> createVotingActivityJoinUser(@Valid @RequestBody VotingActivityJoinUserSaveReqVO createReqVO) {
+    public CommonResult<Long> createVotingActivityJoinUser(@Valid @RequestBody VotingActivityJoinUserSaveReqVO createReqVO, HttpServletRequest request) {
         createReqVO.setUserId(LoginUserContext.getUserId());
+        createReqVO.setIp(ServletUtils.getClientIP(request));
+        createReqVO.setUserAgent(ServletUtils.getUserAgent(request));
         return success(votingActivityJoinUserService.createVotingActivityJoinUser(createReqVO));
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/votingactivity/VotingActivityJoinUserDO.java

@@ -68,4 +68,13 @@ public class VotingActivityJoinUserDO extends BaseDO {
      */
     private String inviterChannel;
 
+
+    private String userAgent;
+
+    private String province;
+
+    private String city;
+
+    private String district;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/votingactivity/VotingActivityJoinItemMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import com.citu.module.menduner.system.controller.admin.votingactivity.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 投票活动参与被投票的 Mapper
@@ -34,4 +35,7 @@ public interface VotingActivityJoinItemMapper extends BaseMapperX<VotingActivity
 
     @Select("select ifnull(max(num),0) from mde_voting_activity_join_item where voting_activity_id =#{votingActivityId} ")
     Integer getNum(@Param("votingActivityId") Long votingActivityId);
+
+    @Update("update mde_voting_activity_join_item  set voting_activity_join_item_num =voting_activity_join_item_num+1   where voting_activity_join_item_id=#{votingActivityJoinItemId}")
+    void votingAdd(Long votingActivityJoinItemId);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/votingactivity/VotingActivityJoinItemService.java

@@ -52,4 +52,5 @@ public interface VotingActivityJoinItemService {
      */
     PageResult<VotingActivityJoinItemDO> getVotingActivityJoinItemPage(VotingActivityJoinItemPageReqVO pageReqVO);
 
+    void votingAdd(Long votingActivityJoinItemId);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/votingactivity/VotingActivityJoinItemServiceImpl.java

@@ -79,4 +79,9 @@ public class VotingActivityJoinItemServiceImpl implements VotingActivityJoinItem
             return votingActivityJoinItemMapper.selectPage(pageReqVO);
         }
 
+        @Override
+        public void votingAdd(Long votingActivityJoinItemId) {
+            votingActivityJoinItemMapper.votingAdd(votingActivityJoinItemId);
+        }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/votingactivity/VotingActivityJoinUserServiceImpl.java

@@ -1,6 +1,9 @@
 package com.citu.module.menduner.system.service.votingactivity;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.citu.framework.ip.core.Area;
+import com.citu.framework.ip.core.utils.IPUtils;
 import com.citu.module.menduner.system.dal.dataobject.votingactivity.VotingActivityDO;
 import com.citu.module.menduner.system.dal.dataobject.votingactivity.VotingActivityJoinItemDO;
 import com.citu.module.menduner.system.dal.dataobject.votingactivity.VotingActivityJoinUserDO;
@@ -83,11 +86,21 @@ public class VotingActivityJoinUserServiceImpl implements VotingActivityJoinUser
 
             // 插入
             VotingActivityJoinUserDO votingActivityJoinUser = BeanUtils.toBean(createReqVO, VotingActivityJoinUserDO.class);
+            // todo 工具问题，暂时不加入此信息
+//            Area area = IPUtils.getArea(votingActivityJoinUser.getIp());
+//            votingActivityJoinUser.setProvince(area.getParent().getName());
+//            votingActivityJoinUser.setCity(area.getName());
+//            votingActivityJoinUser.setDistrict(area.getParent().getParent().getName());
+
             votingActivityJoinUserMapper.insert(votingActivityJoinUser);
+            votingActivityJoinItemService.votingAdd(votingActivityJoinUser.getVotingActivityJoinItemId());
             // 返回
+
             return votingActivityJoinUser.getVotingActivityJoinUserId();
         }
 
+
+
         @Override
         public void updateVotingActivityJoinUser(VotingActivityJoinUserSaveReqVO updateReqVO) {
                     // 校验存在