新增控制层

wisenergy-service/src/main/java/cn/wisenergy/service/app/PayRecordService.java

@@ -25,5 +25,5 @@ public interface PayRecordService {
      * @param payRecord 充值记录信息
      * @return true 成功 false 失败
      */
-    Boolean add(PayRecord payRecord);
+    R<Boolean> add(PayRecord payRecord);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java

@@ -8,7 +8,8 @@ import cn.wisenergy.model.app.UserLimit;
 *@ Description: 用户查询次数接口定义
 *@ Author     : 86187
 *@ Date       : 2021/1/14 9:33
-*/
+ * @author 86187
+ */
 public interface UserLimitService {
     /**
      * 获取用户查询次数信息

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PayRecordServiceImpl.java

@@ -57,19 +57,19 @@ public class PayRecordServiceImpl extends ServiceImpl<PayRecordMapper, PayRecord
     }
 
     @Override
-    public Boolean add(PayRecord payRecord) {
+    public R<Boolean> add(PayRecord payRecord) {
         log.info("volunteer-service[]PayRecordServiceImpl[]payRecord[]input.param.payRecord:" + payRecord);
         if (null == payRecord) {
-            return false;
+            return R.ok(1, false);
         }
 
         //保存充值记录信息
         int count = payRecordMapper.add(payRecord);
         if (count == 0) {
-            return false;
+            return R.ok(1, false);
         }
 
-        return true;
+        return R.ok(0, true);
     }
 
     /**

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayRecordController.java

 package cn.wisenergy.web.admin.controller.app;
 
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.PayRecord;
+import cn.wisenergy.model.app.Volunteer;
+import cn.wisenergy.model.vo.PayRecordQueryVo;
+import cn.wisenergy.model.vo.PayRecordShowVo;
+import cn.wisenergy.service.app.PayRecordService;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
 
 /**
  * @ Description: PC-我的账户
@@ -15,4 +28,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/pay/record")
 @Slf4j
 public class PayRecordController {
+
+    @Autowired
+    private PayRecordService payRecordService;
+
+    @ApiOperation(value = "保存充值记录", notes = "保存充值记录", httpMethod = "POST")
+    @ApiImplicitParam(name = "payRecord", value = "充值记录信息", dataType = "PayRecord")
+    @PostMapping("/add")
+    public R<Boolean> add(@RequestBody PayRecord payRecord) {
+        log.info("volunteer-service[]PayRecordController[]add[]input.param.payRecord:" + payRecord);
+        if (null == payRecord) {
+            return R.error("入参为空!");
+        }
+
+        return payRecordService.add(payRecord);
+    }
+
+    @ApiOperation(value = "获取充值记录列表", notes = "获取充值记录列表", httpMethod = "GET")
+    @ApiImplicitParam(name = "payVo", value = "充值记录查询参数", dataType = "PayRecord")
+    @GetMapping("/getList")
+    public R<PageInfo<PayRecordShowVo>> getList(@RequestBody PayRecordQueryVo payVo) {
+        log.info("volunteer-service[]PayRecordController[]getList[]input.param.payVo:" + payVo);
+        if (null == payVo) {
+            return R.error("入参为空!");
+        }
+
+        return payRecordService.getList(payVo);
+    }
+
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java

 package cn.wisenergy.web.admin.controller.app;
 
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.SchemeQueryRecord;
+import cn.wisenergy.model.vo.SchemeQueryVo;
+import cn.wisenergy.model.vo.SchemeRecordQueryVo;
+import cn.wisenergy.model.vo.VolunteerVo;
+import cn.wisenergy.service.app.SchemeService;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,4 +27,20 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/scheme")
 @Slf4j
 public class SchemeController {
+
+    @Autowired
+    private SchemeService schemeService;
+
+    @ApiOperation(value = "获取志愿列表", notes = "获取志愿列表", httpMethod = "GET")
+    @ApiImplicitParam(name = "queryVo", value = "志愿查询参数", dataType = "SchemeQueryVo")
+    @GetMapping("/getList")
+    public R<VolunteerVo> getList(@RequestBody SchemeQueryVo queryVo) {
+        log.info("volunteer-service[]SchemeController[]getList[]input.param.queryVo:" + queryVo);
+        if (null == queryVo) {
+            return R.error("入参为空!");
+        }
+
+        return schemeService.getList(queryVo);
+    }
+
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeRecordController.java

 package cn.wisenergy.web.admin.controller.app;
 
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.PayRecord;
+import cn.wisenergy.model.app.SchemeQueryRecord;
+import cn.wisenergy.model.app.Volunteer;
+import cn.wisenergy.model.vo.PayRecordQueryVo;
+import cn.wisenergy.model.vo.PayRecordShowVo;
+import cn.wisenergy.model.vo.SchemeRecordQueryVo;
+import cn.wisenergy.service.app.SchemeRecordService;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @ Description: PC-我的方案
@@ -15,4 +29,46 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/scheme/record")
 @Slf4j
 public class SchemeRecordController {
+
+    @Autowired
+    private SchemeRecordService schemeRecordService;
+
+    @ApiOperation(value = "保存方案查询记录", notes = "保存方案查询记录", httpMethod = "POST")
+    @ApiImplicitParam(name = "query", value = "方案查询信息", dataType = "SchemeQueryRecord")
+    @PostMapping("/add")
+    public R<SchemeQueryRecord> add(@RequestBody SchemeQueryRecord query) {
+        log.info("volunteer-service[]SchemeRecordController[]add[]input.param.query:" + query);
+        if (null == query) {
+            return R.error("入参为空!");
+        }
+
+        return schemeRecordService.add(query);
+    }
+
+    @ApiOperation(value = "获取方案查询记录列表", notes = "获取方案查询记录列表", httpMethod = "GET")
+    @ApiImplicitParam(name = "queryVo", value = "方案查询记录参数", dataType = "SchemeRecordQueryVo")
+    @GetMapping("/getList")
+    public R<PageInfo<SchemeQueryRecord>> getList(SchemeRecordQueryVo queryVo) {
+        log.info("volunteer-service[]SchemeRecordController[]getList[]input.param.queryVo:" + queryVo);
+        if (null == queryVo) {
+            return R.error("入参为空!");
+        }
+
+        return schemeRecordService.getList(queryVo);
+    }
+
+    @ApiOperation(value = "获取充值记录志愿列表", notes = "获取充值记录志愿列表", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true),
+            @ApiImplicitParam(name = "recordId", value = "记录id", dataType = "int", required = true)
+    })
+    @GetMapping("/getVolunteerList")
+    public R<List<Volunteer>> getVolunteerList(Integer userId, Integer recordId) {
+        log.info("volunteer-service[]SchemeRecordController[]getVolunteerList[]input.param.userId:{},recordId:" + userId, recordId);
+        if (null == userId || null == recordId) {
+            return R.error("入参为空!");
+        }
+
+        return schemeRecordService.getVolunteerList(userId, recordId);
+    }
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java

@@ -31,7 +31,7 @@ public class UserController {
       private UserService userService;
 
       @ApiOperation(value = "用户管理",notes = "用户管理",httpMethod = "POST")
-      @ApiImplicitParam(name ="queryVo" )
+      @ApiImplicitParam(name = "queryVo", value = "用户信息", dataType = "UserQueryVo")
       @PostMapping("/manage")
       public R manageUser(@RequestBody UserQueryVo queryVo){
           log.info("UserController[].manageUser[].input.param:queryV0:"+queryVo);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLimitController.java

 package cn.wisenergy.web.admin.controller.app;
 
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.UserLimit;
+import cn.wisenergy.model.app.Volunteer;
+import cn.wisenergy.service.app.UserLimitService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @ Description: PC-用户查询次数
  * @ Author     : 86187
@@ -15,4 +26,19 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/user/limit")
 @Slf4j
 public class UserLimitController {
+
+    @Autowired
+    private UserLimitService userLimitService;
+
+    @ApiOperation(value = "获取用户查询次数", notes = "获取用户查询次数", httpMethod = "GET")
+    @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true)
+    @GetMapping("/getByUserId")
+    public R<UserLimit> getByUserId(Integer userId) {
+        log.info("volunteer-service[]UserLimitController[]getVolunteerList[]input.param.userId:" + userId);
+        if (null == userId ) {
+            return R.error("入参为空!");
+        }
+
+        return userLimitService.getByUserId(userId);
+    }
 }