Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-28 098b507166a2b23f0256d5c4f097e7f05f11e9be

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java

@@ -1,10 +1,11 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,16 +24,27 @@
public class ComSwPatrolRecordApi {

    @Resource
    private ComSwPatrolRecordService comMngPopulationService;
    private ComSwPatrolRecordService comSwPatrolRecordService;

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordDTO 查询参数
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("/page")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordDTO comSwPatrolRecordDTO){
        return comMngPopulationService.pagePatrolRecord(comSwPatrolRecordDTO);
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        return comSwPatrolRecordService.pagePatrolRecord(comSwPatrolRecordPageDTO);
    }

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    @PostMapping("/addPatrolRecord")
    @Transactional(rollbackFor = Exception.class)
    public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
        return comSwPatrolRecordService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

}