springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberPositionDTO.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.common.model.vos.grid; import com.panzhihua.common.validated.AddGroup; import com.panzhihua.common.validated.PutGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @Data @ApiModel(value = "网格员定时上报请求参数") public class GridMemberPositionDTO { @ApiModelProperty("经纬度，以,隔开") @NotBlank(groups = {AddGroup.class}, message = "经纬度不能为空") private String lngLat; @ApiModelProperty("经纬度定位地址") @NotBlank(groups = {AddGroup.class}, message = "经纬度定位地址不能为空") private String positionAddress; @ApiModelProperty(value = "网格员id",hidden = true) private Long gridMemberId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -837,4 +837,12 @@ */ @PostMapping("/statistics/event/getGridEventStatistics") R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO); /** * 网格员上报地理位置 * @param memberPositionDTO 请求参数 * @return 上报结果 */ @PostMapping("/eventgridmembergpslog/add") R gridReportPosition(@RequestBody GridMemberPositionDTO memberPositionDTO); } springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
@@ -7,16 +7,19 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO; import com.panzhihua.common.service.auth.TokenService; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.grid.GridService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -110,4 +113,15 @@ return gridService.editionUpdate(); } @ApiOperation(value = "网格员定时上报地理位置-lyq") @PostMapping("/report") public R gridReportPosition(@RequestBody @Validated(AddGroup.class)GridMemberPositionDTO memberPositionDTO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); if(loginUserInfo == null){ return R.fail("请先登录"); } memberPositionDTO.setGridMemberId(loginUserInfo.getUserId()); return gridService.gridReportPosition(memberPositionDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberGpsLogApi.java
@@ -9,6 +9,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO; import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO; import com.panzhihua.service_grid.service.EventGridMemberGpsLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -32,13 +33,13 @@ /** * 新增网格员定时上报地理信息 * @param eventGridMemberGpsLogAddDTO * @param memberPositionDTO 请求参数 * @return 新增结果 */ @PostMapping("/add") R add(@RequestBody EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO){ return eventGridMemberGpsLogService.add(eventGridMemberGpsLogAddDTO); }; public R add(@RequestBody GridMemberPositionDTO memberPositionDTO){ return eventGridMemberGpsLogService.add(memberPositionDTO); } /** * 修改网格员定时上报地理信息 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO; import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO; import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO; /** @@ -20,10 +21,10 @@ /** * 新增网格员定时上报地理信息 * @param eventGridMemberGpsLogAddDTO * @param memberPositionDTO 请求参数 * @return 新增结果 */ R add(EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO); R add(GridMemberPositionDTO memberPositionDTO); /** * 修改网格员定时上报地理信息 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO; import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO; import com.panzhihua.service_grid.dao.*; import com.panzhihua.service_grid.model.dos.*; import com.panzhihua.service_grid.service.EventGridMemberGpsLogService; @@ -32,13 +33,14 @@ private EventGridMemberGpsLogMapper eventGridMemberGpsLogMapper; /** * 新增网格员定时上报地理信息 * @param eventGridMemberGpsLogAddDTO * @param memberPositionDTO 请求参数 * @return 新增结果 */ public R add(EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO){ public R add(GridMemberPositionDTO memberPositionDTO){ EventGridMemberGpsLogDO eventGridMemberGpsLogDO = new EventGridMemberGpsLogDO(); BeanUtils.copyProperties(eventGridMemberGpsLogAddDTO, eventGridMemberGpsLogDO); BeanUtils.copyProperties(memberPositionDTO, eventGridMemberGpsLogDO); eventGridMemberGpsLogDO.setCreateAt(new Date()); eventGridMemberGpsLogDO.setCreateBy(memberPositionDTO.getGridMemberId()); if(eventGridMemberGpsLogMapper.insert(eventGridMemberGpsLogDO)>0){ return R.ok(); }
