Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-07 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java

@@ -5,9 +5,8 @@
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCardUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -18,7 +17,6 @@

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;

/**
 *
@@ -32,7 +30,6 @@
@RequestMapping("/event")
@Api(tags = {"网格综治事件管理 @chendong", "宣传教育 @chendong","特殊人群上报(开发中..) @chendong"})
public class EventApi extends BaseController {


    @Resource
    private GridService gridService;
@@ -48,7 +45,7 @@
        ClazzUtils.setIfStringIsEmpty(eventRevokeDTO);
        LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
        eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
        eventRevokeDTO.setUserName(loginUserInfoVO.getName());
        eventRevokeDTO.setUserName(loginUserInfoVO.getNickName());
        return gridService.emergenciesRevoke(eventRevokeDTO);
    }

@@ -76,17 +73,17 @@
    }
    /**
     * 重新发布事件
     * @param commonEventRepublicDTO 重新发布事件传递对象
     * @param commonEventRepublishDTO 重新发布事件传递对象
     * @return 修改结果
     */
    @PutMapping("/republish")
    @ApiOperation(value = "重新发布事件", response = R.class)
    R republish(@Validated @RequestBody CommonEventRepublicDTO commonEventRepublicDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventRepublicDTO);
    R republish(@Validated @RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventRepublishDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventRepublicDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventRepublicDTO.setUserName(loginUserInfoVO.getName());
        return gridService.republishEvent(commonEventRepublicDTO);
        commonEventRepublishDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventRepublishDTO.setUserName(loginUserInfoVO.getNickName());
        return gridService.republishEvent(commonEventRepublishDTO);
    }


@@ -101,8 +98,17 @@
        ClazzUtils.setIfStringIsEmpty(commonEventPublicDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventPublicDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventPublicDTO.setUserName(loginUserInfoVO.getName());
        commonEventPublicDTO.setUserName(loginUserInfoVO.getNickName());
        return gridService.draftRelease(commonEventPublicDTO);
    }

    /**
     * 查询社区列表
     * @return 查找结果
     */
    @GetMapping("/actList")
    @ApiOperation(value = "查询社区列表", response = ComActVO.class)
    R actList(){
        return gridService.actList();
    }
}