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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

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

@@ -4,7 +4,6 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.dtos.user.IndexDataDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
@@ -28,6 +27,8 @@
import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;

import static java.util.Objects.isNull;

/**
 * ClassName   ComEventController
@@ -132,7 +133,7 @@
    @PostMapping("/list")
    public R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO) {
        ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
        return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent), ComEventVO.class));
        return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent,this.getLoginUserInfo()), ComEventVO.class));
    }

    /**
@@ -153,9 +154,10 @@
    })
    @PostMapping("/page")
    public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
        log.info("==============分页参数"+comEventVO);
        Page pagination = new Page(pageNo, pageSize);
        ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
        return comEventService.pageByComEvent(comEvent, pagination);
        return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
    }


@@ -175,7 +177,7 @@
    public R remove(@PathVariable Long id) {
        ComEvent comEvent = new ComEvent();
        comEvent.setId(id);
        comEvent.setEventProcessStatus(8);
        comEvent.setEventProcessStatus(9);
        return comEventService.updateComEvent(comEvent);
    }

@@ -229,7 +231,7 @@
            @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
    })
    @PutMapping("/accept/Request")
    public R acceptRequest(@RequestParam("id") Long id,@RequestParam("specterId") Long specterId) {
    public R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId) {
        return comEventService.acceptRequest(id, specterId);
    }

@@ -247,10 +249,13 @@
    })
    @PutMapping("/reject/Request")
    public R rejectRequest(@RequestParam("id") Long id) {
        ComEvent comEvent = new ComEvent();
        comEvent.setId(id);
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.REJECT.getCode());
        return comEventService.updateComEvent(comEvent);
        ComEvent comEvent = comEventService.getById(id);
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
        comEvent.setSpecialistName("待分配");
        comEvent.setSpecialistId(null);
        comEvent.setSpecialistName("待分配");
        comEvent.setSpecialistId(0L);
        return R.ok(comEventService.updateById(comEvent));
    }

    /**
@@ -282,7 +287,7 @@
    @ApiOperation("专家调解处理")
    @PutMapping("/conciliation/Request")
    public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
        return comEventService.conciliationEvent(comEventConciliationVO);
        return comEventService.conciliationEvent(comEventConciliationVO, getLoginUserInfo());
    }

    /**
@@ -318,18 +323,19 @@

    /**
     * 大屏事件统计
     *
     * @param indexDataDTO 查询参数
     * */
     */
    @PostMapping("/indexData")
    public R indexData(@RequestBody IndexDateDTO indexDataDTO ){
    public R indexData(@RequestBody IndexDateDTO indexDataDTO) {
        return comEventService.indexData(indexDataDTO);
    }

    /**
     * 大屏事件统计（事件和专家各级别占比）
     * */
     */
    @GetMapping("/indexData/event")
    public R eventIndexData(@RequestParam Integer type){
    public R eventIndexData(@RequestParam Integer type) {
        return comEventService.eventIndexData(type);
    }
}