springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -174,9 +174,9 @@ } @ApiOperation(value = "车辆登记",response = ComMngVolunteerMngAppletsVO.class) @PostMapping("car/add") public R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) { @ApiOperation(value = "车辆登记") @PostMapping("car/register") public R addComMngCar(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null!=communityId && 0!=communityId) { @@ -185,9 +185,15 @@ comMngCarAppletDTO.setUserName(loginUserInfo.getName()); comMngCarAppletDTO.setUserId(loginUserInfo.getUserId()); comMngCarAppletDTO.setMobile(loginUserInfo.getPhone()); comMngCarAppletDTO.setSource(1); } return communityService.addComMngCarApplet(comMngCarAppletDTO); } @ApiOperation(value = "登记车辆列表",response = ComMngCarVO.class) @GetMapping("car/list") public R comMngCarList() { return communityService.userComMngCarList(this.getUserId()); } }
New file @@ -0,0 +1,60 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @description: 车辆管理 * @author: Null * @date: 2021/3/16 14:28 */ @Data @ApiModel("车辆管理") public class ComMngCarVO implements Serializable { @ApiModelProperty("主键") private Long id; @ApiModelProperty("社区ID") private Long communityId; @ApiModelProperty("小区名称") private String areaName; @ApiModelProperty("小区ID") private Long areaId; @ApiModelProperty("车主姓名") private String userName; @ApiModelProperty("车主用户ID") private Long userId; @ApiModelProperty("车主手机号码") private String mobile; @ApiModelProperty("车牌号") private String plateNum; @ApiModelProperty("车辆品牌") private String brand; @ApiModelProperty("车身颜色") private String color; @ApiModelProperty("车辆型号") private String model; @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("创建人") private String createBy; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1110,7 +1110,14 @@ * @param comCvtBusinessDTO * @return */ @PostMapping("/common/data/car/add") @PostMapping("/common/data/car/user/register") R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO); /** * 小程序用户登记车辆列表 * @param userId * @return */ @GetMapping("/common/data/car/user/list") R userComMngCarList(@RequestParam("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityCommonDataApi.java
@@ -4,10 +4,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComMngCarService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -24,9 +21,25 @@ @Resource private ComMngCarService comMngCarService; @PostMapping("/car/add") /** * 小程序用户车辆登记 * @param comCvtBusinessDTO * @return */ @PostMapping("/car/user/register") public R addComCvtBusiness(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO) { return comMngCarService.addComMngCarApplet(comCvtBusinessDTO); } /** * 小程序用户车辆列表 * @param userId * @return */ @GetMapping("/car/user/list") public R userComMngCarList(@RequestParam("userId") Long userId) { return comMngCarService.userComMngCarList(userId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngCarService.java
@@ -11,4 +11,11 @@ * @return */ R addComMngCarApplet(ComMngCarAppletDTO comCvtBusinessDTO); /** * 小程序用户车辆列表 * @param userId * @return */ R userComMngCarList(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngCarVO; import com.panzhihua.service_community.dao.ComMngCarDAO; import com.panzhihua.service_community.model.dos.ComMngCarDO; import com.panzhihua.service_community.service.ComMngCarService; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @description: @@ -39,4 +43,16 @@ } return R.fail(); } @Override public R userComMngCarList(Long userId) { List<ComMngCarVO> comMngCarVOS = new ArrayList<>(); List<ComMngCarDO> carDOS = comMngCarDAO.selectList(new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getUserId,userId)); carDOS.forEach(carDO->{ ComMngCarVO carVO = new ComMngCarVO(); BeanUtils.copyProperties(carDO,carVO); comMngCarVOS.add(carVO); }); return R.ok(comMngCarVOS); } }
