springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java
New file @@ -0,0 +1,67 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO; import com.panzhihua.common.model.dtos.community.PageComMngCarDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngCarVO; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; 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 javax.annotation.Resource; /** * @description: 社区管理基础数据库管理接口 * @author: Null * @date: 2021/3/11 13:26 */ @Slf4j @Api(tags = {"社区管理/基础数据库"}) @RestController @RequestMapping("/common/data") public class CommonDataApi extends BaseController { @Resource private CommunityService communityService; @Value("${excel.convenientUrl}") private String excelConvenientUrl="http://panzhihua.nhys.cdnhxx.com/web/bianminfuwudaoru.xlsx"; // FTP 登录用户名 @Value("${ftp.username}") private String userName; // FTP 登录密码 @Value("${ftp.password}") private String password; // FTP 服务器地址IP地址 @Value("${ftp.host}") private String host; // FTP 端口 @Value("${ftp.port}") private int port; @Value("${ftp.url}") private String url; @ApiOperation(value = "分页查询车辆管理列表",response = ComMngCarVO.class) @PostMapping("/car/page") public R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO) { return communityService.pageQueryComMngCar(pageComMngCarDTO); } @ApiOperation(value = "新增/编辑车辆信息") @PostMapping("/car/save") public R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); comMngCarSaveDTO.setCreateBy(userId); return communityService.saveComMngCar(comMngCarSaveDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarSaveDTO.java
New file @@ -0,0 +1,69 @@ package com.panzhihua.common.model.dtos.community; 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.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; /** * @description: 后端辆登记参数 * @author: Null * @date: 2021/3/16 14:37 */ @Data @ApiModel("后端辆登记/修改参数") public class ComMngCarSaveDTO implements Serializable { @ApiModelProperty(value = "车辆主键ID") private Long id; @ApiModelProperty(value = "车牌号") @NotBlank(groups = {AddGroup.class},message = "车牌号不能为空") private String plateNum; @ApiModelProperty(value = "车辆品牌") @NotBlank(groups = {AddGroup.class},message = "车辆品牌不能为空") private String brand; @ApiModelProperty(value = "车身颜色") @NotBlank(groups = {AddGroup.class},message = "车身颜色不能为空") private String color; @ApiModelProperty(value = "车辆型号") @NotBlank(groups = {AddGroup.class},message = "车辆型号不能为空") private String model; @ApiModelProperty(value = "小区ID") @Min(value = 1,groups = {AddGroup.class},message = "用户小区id不能为空") @NotNull(groups = {AddGroup.class},message = "用户小区id不能为空") private Long areaId; @ApiModelProperty(value = "车主姓名") @NotBlank(groups = {AddGroup.class},message = "车主姓名不能为空") private String userName; @ApiModelProperty(value = "车主手机号码") @NotBlank(groups = {AddGroup.class},message = "车主手机号码不能为空") private String mobile; @ApiModelProperty(value = "社区ID",hidden = true) private Long communityId; @ApiModelProperty(value = "小区名称",hidden = true) private String areaName; @ApiModelProperty(value = "车主ID",hidden = true) private Long userId; @ApiModelProperty(value = "创建人",hidden = true) private Long createBy; @ApiModelProperty(value = "数据来源：1-小程序 2-后台录入",hidden = true) private Integer source; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngCarDTO.java
New file @@ -0,0 +1,29 @@ package com.panzhihua.common.model.dtos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @description: 车辆管理列表请求参数 * @author: Null * @date: 2021/3/11 10:36 */ @Data @ApiModel("车辆管理列表请求参数") public class PageComMngCarDTO { @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; @ApiModelProperty("车主姓名") private String name; @ApiModelProperty(value = "分页-当前页数",example = "1") private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java
@@ -23,6 +23,9 @@ @ApiModelProperty("社区ID") private Long communityId; @ApiModelProperty("社区名称") private String communityName; @ApiModelProperty("小区名称") private String areaName;
@@ -1156,4 +1156,9 @@ @GetMapping("/common/data/car/user/list") R userComMngCarList(@RequestParam("userId") Long userId); @PostMapping("/common/data/car/page") R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO); @PostMapping("/common/data/car/save") R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -14,6 +14,7 @@ import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.user.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -536,5 +537,13 @@ */ @PostMapping("export") R export(@RequestBody ExportUserDTO exportUserDTO); /** * 通过手机号码查询用户信息 * @param phone * @return */ @GetMapping("getUserByPhone") R getSysUserVOByPhone(@RequestParam(value = "phone") String phone); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
New file @@ -0,0 +1,70 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO; import com.panzhihua.common.model.dtos.community.PageComMngCarDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngCarVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; 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 javax.annotation.Resource; /** * @description: 社区管理基础数据库管理接口 * @author: Null * @date: 2021/3/11 13:26 */ @Slf4j @Api(tags = {"社区管理/基础数据库"}) @RestController @RequestMapping("/common/data") public class CommonDataApi extends BaseController { @Resource private CommunityService communityService; @Value("${excel.convenientUrl}") private String excelConvenientUrl="http://panzhihua.nhys.cdnhxx.com/web/bianminfuwudaoru.xlsx"; // FTP 登录用户名 @Value("${ftp.username}") private String userName; // FTP 登录密码 @Value("${ftp.password}") private String password; // FTP 服务器地址IP地址 @Value("${ftp.host}") private String host; // FTP 端口 @Value("${ftp.port}") private int port; @Value("${ftp.url}") private String url; @ApiOperation(value = "分页查询车辆管理列表",response = ComMngCarVO.class) @PostMapping("/car/page") public R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO) { pageComMngCarDTO.setCommunityId(this.getCommunityId()); return communityService.pageQueryComMngCar(pageComMngCarDTO); } @ApiOperation(value = "新增/编辑车辆信息") @PostMapping("/car/save") public R saveComMngCar(@RequestBody @Validated(AddGroup.class) ComMngCarSaveDTO comMngCarSaveDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); comMngCarSaveDTO.setCreateBy(userId); return communityService.saveComMngCar(comMngCarSaveDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/ServiceCommunityApplication.java
@@ -4,9 +4,11 @@ import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; @SpringCloudApplication @EnableFeignClients(basePackages = {"com.panzhihua.common.service"}) @EnableEurekaClient @EnableCircuitBreaker @ComponentScan({"com.panzhihua.service_community","com.panzhihua.common"}) springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
File was renamed from springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityCommonDataApi.java @@ -1,6 +1,8 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO; import com.panzhihua.common.model.dtos.community.PageComMngCarDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComMngCarService; import lombok.extern.slf4j.Slf4j; @@ -16,7 +18,7 @@ @Slf4j @RestController @RequestMapping("/common/data") public class CommunityCommonDataApi { public class CommonDataApi { @Resource private ComMngCarService comMngCarService; @@ -42,4 +44,13 @@ return comMngCarService.userComMngCarList(userId); } @PostMapping("/car/page") public R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO) { return comMngCarService.pageQueryComMngCar(pageComMngCarDTO); } @PostMapping("/car/save") public R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO) { return comMngCarService.saveComMngCar(comMngCarSaveDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
@@ -1,8 +1,14 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageComMngCarDTO; import com.panzhihua.common.model.vos.community.ComMngCarVO; import com.panzhihua.service_community.model.dos.ComMngCarDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** * @description: 车辆管理 @@ -12,4 +18,35 @@ @Mapper public interface ComMngCarDAO extends BaseMapper<ComMngCarDO> { @Select("<script> " + " SELECT " + " t.id, " + " t.community_id AS communityId, " + " t1.`name` AS communityName, " + " t.area_id AS areaId, " + " t2.area_name AS areaName, " + " t.user_id userId, " + " t.user_name AS userName, " + " t.mobile, " + " t.plate_num AS plateNum, " + " t.brand, " + " t.color, " + " t.model, " + " t.create_at AS createAt, " + " t3.`name` AS createBy " + "FROM " + " com_mng_car t " + " LEFT JOIN com_act t1 ON t.community_id = t1.community_id " + " LEFT JOIN com_mng_struct_area t2 ON t2.id = t.area_id " + " LEFT JOIN sys_user t3 ON t.create_by = t3.user_id " + " WHERE t.source =2 " + "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name.trim() != ""'>" + " and t.user_name LIKE concat( #{pageComMngCarDTO.name}, '%' ) " + " </if> " + "<if test='pageComMngCarDTO.communityId != null and pageComMngCarDTO.communityId != 0'>" + " and t.community_id = #{pageComMngCarDTO.communityId} " + " </if> " + " order by t.create_at desc"+ "</script>") IPage<ComMngCarVO> pageQueryComMngCar(Page page, @Param(value = "pageComMngCarDTO") PageComMngCarDTO pageComMngCarDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngCarService.java
@@ -1,6 +1,8 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO; import com.panzhihua.common.model.dtos.community.PageComMngCarDTO; import com.panzhihua.common.model.vos.R; public interface ComMngCarService { @@ -18,4 +20,18 @@ * @return */ R userComMngCarList(Long userId); /** * 分页查询车辆管理列表 * @param pageComMngCarDTO * @return */ R pageQueryComMngCar(PageComMngCarDTO pageComMngCarDTO); /** * 新增或修改车辆信息 * @param comMngCarSaveDTO * @return */ R saveComMngCar(ComMngCarSaveDTO comMngCarSaveDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -1,16 +1,25 @@ package com.panzhihua.service_community.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO; import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO; import com.panzhihua.common.model.dtos.community.PageComMngCarDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngCarVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_community.dao.ComMngCarDAO; import com.panzhihua.service_community.dao.ComMngStructAreaDAO; import com.panzhihua.service_community.model.dos.ComMngCarDO; import com.panzhihua.service_community.model.dos.ComMngStructAreaDO; import com.panzhihua.service_community.service.ComMngCarService; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; @@ -27,6 +36,10 @@ @Resource private ComMngCarDAO comMngCarDAO; @Resource private ComMngStructAreaDAO comMngStructAreaDAO; @Resource private UserService userService; @Override public R addComMngCarApplet(ComMngCarAppletDTO comCvtBusinessDTO) { @@ -55,4 +68,59 @@ }); return R.ok(comMngCarVOS); } @Override public R pageQueryComMngCar(PageComMngCarDTO pageComMngCarDTO) { Page page = new Page<>(); Long pageNum = pageComMngCarDTO.getPageNum(); Long pageSize = pageComMngCarDTO.getPageSize(); if (null == pageNum || 0 == pageNum) { pageNum = 1l; } if (null == pageSize || 0 == pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComMngCarVO> iPage = comMngCarDAO.pageQueryComMngCar(page, pageComMngCarDTO); return R.ok(iPage); } @Override public R saveComMngCar(ComMngCarSaveDTO comMngCarSaveDTO) { int count = comMngCarDAO.selectCount(new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum())); if (count > 0) { return R.ok("车辆已存在"); } ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(comMngCarSaveDTO.getAreaId()); if (ObjectUtils.isEmpty(comMngStructAreaDO)) { return R.fail("小区不存在"); } if (ObjectUtils.isEmpty(comMngCarSaveDTO.getMobile())) { return R.fail("车主手机号码不能为空"); } ComMngCarDO comMngCarDO = new ComMngCarDO(); BeanUtils.copyProperties(comMngCarSaveDTO, comMngCarDO); comMngCarDO.setAreaName(comMngStructAreaDO.getAreaName()); comMngCarDO.setCommunityId(comMngStructAreaDO.getCommunityId()); comMngCarDO.setCreateAt(new Date()); comMngCarDO.setSource(2); R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(comMngCarSaveDTO.getMobile()); if(R.isOk(sysUserVOR)){ SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()),SysUserVO.class); comMngCarSaveDTO.setUserId(sysUserVO.getUserId()); } if(null!=comMngCarDO.getId() && comMngCarDO.getId()!=0){ boolean update = this.updateById(comMngCarDO); if (update) { return R.ok(); } }else{ boolean insert = this.save(comMngCarDO); if (insert) { return R.ok(); } } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -14,10 +14,7 @@ import com.panzhihua.service_user.service.SysUserInputService; import com.panzhihua.service_user.service.UserService; 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.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -595,4 +592,14 @@ public R export(@RequestBody ExportUserDTO exportUserDTO){ return userService.export(exportUserDTO); } /** * 通过手机号码查询用户信息 * @param phone * @return */ @GetMapping("getUserByPhone") public R getSysUserVOByPhone(@RequestParam(value = "phone") String phone){ return userService.getSysUserVOByPhone(phone); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -344,4 +344,11 @@ * @return List<EexcelUserDTO> excel内容 */ R export(ExportUserDTO exportUserDTO); /** * 通过手机号码查询用户信息 * @param phone * @return */ R getSysUserVOByPhone(String phone); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1505,7 +1505,18 @@ List<EexcelUserDTO> eexcelUserDTOS=userDao.selectExport(exportUserDTO); return R.ok(eexcelUserDTOS); } @Override public R getSysUserVOByPhone(String phone) { SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone)); if (ObjectUtils.isEmpty(sysUserDO)) { return R.fail("用户不存在"); } SysUserVO sysUserVO = new SysUserVO(); BeanUtils.copyProperties(sysUserDO,sysUserVO); return R.ok(sysUserVO); } public static void main(String[] args) { // String encode = new BCryptPasswordEncoder().encode("lbsq123456"); // System.out.println(encode);
