Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 302d51ec3c223fd32c746d6bc163a840225b6f46

Merge branch 'test_future_wangge' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java

@@ -39,6 +39,9 @@
    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员")
    private Long gridMemberId;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -508,8 +508,8 @@
     * @param eventGridStatisticsDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridData")
    R getGridData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
    @PostMapping("/eventgriddata/getGridStatisticsdData")
    R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);

    /**
     * 查询用户网格

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

@@ -17,6 +17,7 @@
import com.panzhihua.common.service.grid.GridService;

import javax.annotation.Resource;
import javax.validation.Valid;
import javax.ws.rs.PathParam;

import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
@@ -58,9 +59,8 @@
     */
    @GetMapping("/myGridTodoData")
    @ApiOperation(value = "网格待处理统计数据", response= UserEventGridDataVO.class)
    R myTodoGridData(){
    R myTodoGridData(@Valid @ModelAttribute EventGridTodoDataDTO eventGridTodoDataDTO){
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        EventGridTodoDataDTO eventGridTodoDataDTO = new EventGridTodoDataDTO();
        eventGridTodoDataDTO.setUserId(loginUserInfoVO.getUserId());
        return gridService.getGridTodoData(eventGridTodoDataDTO);
    }
@@ -76,7 +76,7 @@
        EventGridStatisticsDataDTO eventGridStatisticsDataDTO = new EventGridStatisticsDataDTO();
        eventGridStatisticsDataDTO.setUserId(loginUserInfoVO.getUserId());
        eventGridStatisticsDataDTO.setGridId(gridId);
        return gridService.getGridData(eventGridStatisticsDataDTO);
        return gridService.getGridStatisticsdData(eventGridStatisticsDataDTO);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java

@@ -98,4 +98,13 @@
        return eventGridDataService.getGridTodoData(eventGridTodoDataDTO);
    }

    /**
     * 网格数据待处理统计信息
     * @param eventGridStatisticsDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridStatisticsdData")
    R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO){
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java

@@ -13,6 +13,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
@@ -45,5 +47,5 @@
     * @param eventGridTodoDataDTO
     * @return
     */
    UserEventGridDataVO getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
    List<UserEventGridDataVO> getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -138,7 +138,7 @@

    @Override
    public R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO) {
        UserEventGridDataVO userEventGridDataVO = eventGridDataMapper.getGridTodoData(eventGridTodoDataDTO);
        List<UserEventGridDataVO> userEventGridDataVO = eventGridDataMapper.getGridTodoData(eventGridTodoDataDTO);
        return R.ok(userEventGridDataVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -49,6 +49,8 @@
    private EventTransferRecordService eventTransferRecordService;
    @Resource
    private CommunityService communityService;
    @Resource
    private EventGridDataMapper eventGridDataMapper;


    /**
@@ -162,6 +164,10 @@
                eventDealStatus=6;//"已撤销"
            }
            eventDetailsVO.setEventDealStatus(eventDealStatus);

            EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
            eventDetailsVO.setGridName(eventGridDataDO.getGridName());

            //查询事件关联附件
            List<EventResourceDO> eventResourceDOList =
                    eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -172,10 +172,61 @@

    <select id="getGridTodoData" resultType="com.panzhihua.common.model.vos.grid.UserEventGridDataVO"
        parameterType="com.panzhihua.common.model.dtos.grid.EventGridTodoDataDTO">
        SELECT e.event_category , COUNT(*) as todoNums
        SELECT IFNULL(SUM(t.todoNums), 0), 1 event_type
        FROM (
        SELECT  IFNULL(count(e.id), 0) as todoNums
        FROM EVENT  e
        WHERE e.event_category = 1 AND event_status = 2 AND  event_process_status = 1 and process_type = 1  AND grid_id = #{eventGridTodoDataDTO.gridId}
        GROUP BY e.event_category
        WHERE e.event_category = 1 AND event_status = 2
        AND event_process_status = 1 AND process_type = 1
        AND grid_id = #{eventGridTodoDataDTO.gridId}
        AND e.event_type = 1
        GROUP BY e.event_type
        ) t
        UNION ALL
        SELECT IFNULL(SUM(t.todoNums), 0), 2 event_type
        FROM (
        SELECT  IFNULL(count(e.id), 0) as todoNums
        FROM EVENT  e
        WHERE e.event_category = 1 AND event_status = 2
        AND event_process_status = 1 AND process_type = 1
        AND grid_id = #{eventGridTodoDataDTO.gridId}
        AND e.event_type =2
        GROUP BY e.event_type
        ) t
        UNION ALL
        SELECT IFNULL(SUM(t.todoNums), 0), 3 event_type
        FROM (
        SELECT  IFNULL(count(e.id), 0) as todoNums
        FROM EVENT  e
        WHERE e.event_category = 1 AND event_status = 2
        AND event_process_status = 1 AND process_type = 1
        AND grid_id = #{eventGridTodoDataDTO.gridId}
        AND e.event_type =3
        GROUP BY e.event_type
        ) t
        UNION ALL
        SELECT IFNULL(SUM(t.todoNums), 0), 4 event_type
        FROM (
        SELECT  IFNULL(count(e.id), 0) as todoNums
        FROM EVENT  e
        WHERE e.event_category = 1 AND event_status = 2
        AND event_process_status = 1 AND process_type = 1
        AND grid_id = #{eventGridTodoDataDTO.gridId}
        AND e.event_type =4
        GROUP BY e.event_type
        ) t
        UNION ALL
        SELECT IFNULL(SUM(t.todoNums), 0), 5 event_type
        FROM (
        SELECT  IFNULL(count(e.id), 0) as todoNums
        FROM EVENT  e
        WHERE e.event_category = 1 AND event_status = 2
        AND event_process_status = 1 AND process_type = 1
        AND grid_id = #{eventGridTodoDataDTO.gridId}
        AND e.event_type =5
        GROUP BY e.event_type
        ) t

    </select>

</mapper>