diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java index 437d87919..439e5b5ab 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java @@ -282,30 +282,30 @@ public class BasicdataVehicleEntity extends TenantEntity { */ @ApiModelProperty(value = "GPS型号") private String gpsModel; - /** - * 预留1 - */ - @ApiModelProperty(value = "预留1") - private String reserve1; - /** - * 预留2 - */ - @ApiModelProperty(value = "预留2") - private String reserve2; - /** - * 预留3 - */ - @ApiModelProperty(value = "预留3") - private String reserve3; - /** - * 预留4 - */ - @ApiModelProperty(value = "预留4") - private String reserve4; - /** - * 预留5 - */ - @ApiModelProperty(value = "预留5") - private String reserve5; +// /** +// * 预留1 +// */ +// @ApiModelProperty(value = "预留1") +// private String reserve1; +// /** +// * 预留2 +// */ +// @ApiModelProperty(value = "预留2") +// private String reserve2; +// /** +// * 预留3 +// */ +// @ApiModelProperty(value = "预留3") +// private String reserve3; +// /** +// * 预留4 +// */ +// @ApiModelProperty(value = "预留4") +// private String reserve4; +// /** +// * 预留5 +// */ +// @ApiModelProperty(value = "预留5") +// private String reserve5; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehiclePhotoEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehiclePhotoEntity.java new file mode 100644 index 000000000..491c60ec3 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehiclePhotoEntity.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 车辆照片信息表 实体类 + * + * @author lmy + * @since 2023-05-19 + */ +@Data +@TableName("logpm_basicdata_vehicle_photo") +@ApiModel(value = "BasicdataVehiclePhoto对象", description = "车辆照片信息表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataVehiclePhotoEntity extends TenantEntity { + + /** + * 关联车辆信息表主键id + */ + @ApiModelProperty(value = "关联车辆信息表主键id") + private Long masterId; + /** + * 车辆历史照片 + */ + @ApiModelProperty(value = "车辆历史照片") + private String photoUrl; + /** + * + */ + @ApiModelProperty(value = "") + private String reserve1; + /** + * + */ + @ApiModelProperty(value = "") + private String reserve2; + /** + * + */ + @ApiModelProperty(value = "") + private String reserve3; + /** + * + */ + @ApiModelProperty(value = "") + private String reserve4; + /** + * + */ + @ApiModelProperty(value = "") + private String reserve5; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataVehiclePhotoClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataVehiclePhotoClient.java new file mode 100644 index 000000000..64a513605 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataVehiclePhotoClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import org.springblade.common.constant.LauncherConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 车辆照片信息表 Feign接口类 + * + * @author lmy + * @since 2023-05-19 + */ +@FeignClient( + value = LauncherConstant.APPLICATION_BASICDATA_NAME +) +public interface IBasicdataVehiclePhotoClient { + + String API_PREFIX = "vehiclephoto/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取车辆照片信息表列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehiclePhotoVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehiclePhotoVO.java new file mode 100644 index 000000000..b041db6e5 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehiclePhotoVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 车辆照片信息表 视图实体类 + * + * @author lmy + * @since 2023-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataVehiclePhotoVO extends BasicdataVehiclePhotoEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehicleVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehicleVO.java index 468eb034c..2ab061ba3 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehicleVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataVehicleVO.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.vo; import com.logpm.basicdata.entity.BasicdataVehicleEntity; +import io.swagger.annotations.ApiModelProperty; import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,6 +32,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class BasicdataVehicleVO extends BasicdataVehicleEntity { private static final long serialVersionUID = 1L; - //历史照片 + @ApiModelProperty(value = "历史照片") private String historicPhotos; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java index fdaa14850..01cca302b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java @@ -16,7 +16,11 @@ */ package com.logpm.basicdata.controller; +import com.alibaba.nacos.common.utils.StringUtils; import com.logpm.basicdata.dto.BasicdataVehicleDTO; +import com.logpm.basicdata.dto.BasicdataVehiclePhotoDTO; +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import com.logpm.basicdata.service.IBasicdataVehiclePhotoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -30,6 +34,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -61,15 +66,23 @@ public class BasicdataVehicleController extends BladeController { private final IBasicdataVehicleService basicdataVehicleService; + private final IBasicdataVehiclePhotoService basicdataVehiclePhotoService; + + /** * 车辆信息表 详情 */ @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入basicdataVehicle") - public R detail(BasicdataVehicleEntity basicdataVehicle) { + public R detail(BasicdataVehicleDTO basicdataVehicle) { BasicdataVehicleEntity detail = basicdataVehicleService.getOne(Condition.getQueryWrapper(basicdataVehicle)); - return R.data(detail); + //查询历史照片 + BasicdataVehicleVO basicdataVehicleVO = new BasicdataVehicleVO(); + BeanUtils.copyProperties(detail,basicdataVehicleVO); + List urls =basicdataVehicleService.selectPhotoBymasterId(basicdataVehicleVO.getId()); + if (urls.size()>0){basicdataVehicleVO.setHistoricPhotos(StringUtils.join(urls, ","));} + return R.data(basicdataVehicleVO); } /** * 车辆信息表 分页 @@ -89,7 +102,6 @@ public class BasicdataVehicleController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入basicdataVehicle") public R> page(BasicdataVehicleDTO basicdataVehicle, Query query) { - log.info("接收>>>>>>>>>>>>{}",query); IPage pages = basicdataVehicleService.selectBasicdataVehiclePage(Condition.getPage(query), basicdataVehicle); return R.data(pages); } @@ -100,7 +112,7 @@ public class BasicdataVehicleController extends BladeController { @PostMapping("/save") @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入basicdataVehicle") - public R save(@Valid @RequestBody BasicdataVehicleEntity basicdataVehicle) { + public R save(@Valid @RequestBody BasicdataVehicleDTO basicdataVehicle) { return R.status(basicdataVehicleService.save(basicdataVehicle)); } @@ -110,7 +122,16 @@ public class BasicdataVehicleController extends BladeController { @PostMapping("/update") @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入basicdataVehicle") - public R update(@Valid @RequestBody BasicdataVehicleEntity basicdataVehicle) { + public R update(@Valid @RequestBody BasicdataVehicleDTO basicdataVehicle) { + //查询原有的数据 + BasicdataVehicleEntity detail = basicdataVehicleService.getOneById(basicdataVehicle.getId()); + if (null != detail.getVehiclePhoto() && !detail.getVehiclePhoto().equals(basicdataVehicle.getVehiclePhoto())){ + BasicdataVehiclePhotoDTO basicdataVehiclePhoto = new BasicdataVehiclePhotoDTO(); + basicdataVehiclePhoto.setPhotoUrl(basicdataVehicle.getVehiclePhoto()); + basicdataVehiclePhoto.setMasterId(basicdataVehicle.getId()); + //添加历史照片 + basicdataVehiclePhotoService.save(basicdataVehiclePhoto); + } return R.status(basicdataVehicleService.updateById(basicdataVehicle)); } @@ -120,7 +141,7 @@ public class BasicdataVehicleController extends BladeController { @PostMapping("/submit") @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入basicdataVehicle") - public R submit(@Valid @RequestBody BasicdataVehicleEntity basicdataVehicle) { + public R submit(@Valid @RequestBody BasicdataVehicleDTO basicdataVehicle) { return R.status(basicdataVehicleService.saveOrUpdate(basicdataVehicle)); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehiclePhotoController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehiclePhotoController.java new file mode 100644 index 000000000..7900bd89e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehiclePhotoController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import com.logpm.basicdata.vo.BasicdataVehiclePhotoVO; +import com.logpm.basicdata.excel.BasicdataVehiclePhotoExcel; +import com.logpm.basicdata.service.IBasicdataVehiclePhotoService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 车辆照片信息表 控制器 + * + * @author lmy + * @since 2023-05-19 + */ +@RestController +@AllArgsConstructor +@RequestMapping("blade-basicdataVehiclePhoto/basicdataVehiclePhoto") +@Api(value = "车辆照片信息表", tags = "车辆照片信息表接口") +public class BasicdataVehiclePhotoController extends BladeController { + + private final IBasicdataVehiclePhotoService basicdataVehiclePhotoService; + + /** + * 车辆照片信息表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataVehiclePhoto") + public R detail(BasicdataVehiclePhotoEntity basicdataVehiclePhoto) { + BasicdataVehiclePhotoEntity detail = basicdataVehiclePhotoService.getOne(Condition.getQueryWrapper(basicdataVehiclePhoto)); + return R.data(detail); + } + /** + * 车辆照片信息表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataVehiclePhoto") + public R> list(@ApiIgnore @RequestParam Map basicdataVehiclePhoto, Query query) { + IPage pages = basicdataVehiclePhotoService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataVehiclePhoto, BasicdataVehiclePhotoEntity.class)); + return R.data(pages); + } + + /** + * 车辆照片信息表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataVehiclePhoto") + public R> page(BasicdataVehiclePhotoVO basicdataVehiclePhoto, Query query) { + IPage pages = basicdataVehiclePhotoService.selectBasicdataVehiclePhotoPage(Condition.getPage(query), basicdataVehiclePhoto); + return R.data(pages); + } + + /** + * 车辆照片信息表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataVehiclePhoto") + public R save(@Valid @RequestBody BasicdataVehiclePhotoEntity basicdataVehiclePhoto) { + return R.status(basicdataVehiclePhotoService.save(basicdataVehiclePhoto)); + } + + /** + * 车辆照片信息表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataVehiclePhoto") + public R update(@Valid @RequestBody BasicdataVehiclePhotoEntity basicdataVehiclePhoto) { + return R.status(basicdataVehiclePhotoService.updateById(basicdataVehiclePhoto)); + } + + /** + * 车辆照片信息表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicdataVehiclePhoto") + public R submit(@Valid @RequestBody BasicdataVehiclePhotoEntity basicdataVehiclePhoto) { + return R.status(basicdataVehiclePhotoService.saveOrUpdate(basicdataVehiclePhoto)); + } + + /** + * 车辆照片信息表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataVehiclePhotoService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataVehiclePhoto") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataVehiclePhoto") + public void exportBasicdataVehiclePhoto(@ApiIgnore @RequestParam Map basicdataVehiclePhoto, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataVehiclePhoto, BasicdataVehiclePhotoEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataVehiclePhoto::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataVehiclePhotoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataVehiclePhotoService.exportBasicdataVehiclePhoto(queryWrapper); + ExcelUtil.export(response, "车辆照片信息表数据" + DateUtil.time(), "车辆照片信息表数据表", list, BasicdataVehiclePhotoExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataVehiclePhotoDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataVehiclePhotoDTO.java new file mode 100644 index 000000000..ce98d5492 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataVehiclePhotoDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 车辆照片信息表 数据传输对象实体类 + * + * @author lmy + * @since 2023-05-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataVehiclePhotoDTO extends BasicdataVehiclePhotoEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehiclePhotoExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehiclePhotoExcel.java new file mode 100644 index 000000000..11f8043fc --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehiclePhotoExcel.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 车辆照片信息表 Excel实体类 + * + * @author lmy + * @since 2023-05-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataVehiclePhotoExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除;1-未删除，2-已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除;1-未删除，2-已删除") + private Integer isDeleted; + /** + * 关联车辆信息表主键id + */ + @ColumnWidth(20) + @ExcelProperty("关联车辆信息表主键id") + private String masterId; + /** + * 车辆历史照片 + */ + @ColumnWidth(20) + @ExcelProperty("车辆历史照片") + private String photoUrl; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String reserve1; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String reserve2; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String reserve3; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String reserve4; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String reserve5; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataVehiclePhotoClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataVehiclePhotoClient.java new file mode 100644 index 000000000..47e9272d2 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataVehiclePhotoClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import com.logpm.basicdata.service.IBasicdataVehiclePhotoService; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 车辆照片信息表 Feign实现类 + * + * @author lmy + * @since 2023-05-19 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataVehiclePhotoClient implements IBasicdataVehiclePhotoClient { + + private final IBasicdataVehiclePhotoService basicdataVehiclePhotoService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicdataVehiclePhotoService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java index 4236b6c74..a99fe774e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java @@ -52,4 +52,5 @@ public interface BasicdataVehicleMapper extends BaseMapper exportBasicdataVehicle(@Param("ew") Wrapper queryWrapper); + List selectPhotoBymasterId(Long id); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index bf5f673ec..62dfd402d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml @@ -159,5 +159,18 @@ + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehiclePhotoMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehiclePhotoMapper.java new file mode 100644 index 000000000..ae16e3064 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehiclePhotoMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import com.logpm.basicdata.vo.BasicdataVehiclePhotoVO; +import com.logpm.basicdata.excel.BasicdataVehiclePhotoExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 车辆照片信息表 Mapper 接口 + * + * @author lmy + * @since 2023-05-19 + */ +public interface BasicdataVehiclePhotoMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataVehiclePhoto + * @return + */ + List selectBasicdataVehiclePhotoPage(IPage page, BasicdataVehiclePhotoVO basicdataVehiclePhoto); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataVehiclePhoto(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehiclePhotoMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehiclePhotoMapper.xml new file mode 100644 index 000000000..fdada9e82 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehiclePhotoMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehiclePhotoService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehiclePhotoService.java new file mode 100644 index 000000000..92fa79078 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehiclePhotoService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import com.logpm.basicdata.vo.BasicdataVehiclePhotoVO; +import com.logpm.basicdata.excel.BasicdataVehiclePhotoExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 车辆照片信息表 服务类 + * + * @author lmy + * @since 2023-05-19 + */ +public interface IBasicdataVehiclePhotoService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataVehiclePhoto + * @return + */ + IPage selectBasicdataVehiclePhotoPage(IPage page, BasicdataVehiclePhotoVO basicdataVehiclePhoto); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataVehiclePhoto(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java index de34c2e8c..5df7b1320 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java @@ -49,5 +49,16 @@ public interface IBasicdataVehicleService extends BaseService exportBasicdataVehicle(Wrapper queryWrapper); - + /** + * 查询历史照片 + * + * @return + */ + List selectPhotoBymasterId(Long id); + /** + * 根据Id查询 + * + * @return + */ + BasicdataVehicleEntity getOneById(Long id); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehiclePhotoServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehiclePhotoServiceImpl.java new file mode 100644 index 000000000..0748540e4 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehiclePhotoServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import com.logpm.basicdata.entity.BasicdataVehiclePhotoEntity; +import com.logpm.basicdata.vo.BasicdataVehiclePhotoVO; +import com.logpm.basicdata.excel.BasicdataVehiclePhotoExcel; +import com.logpm.basicdata.mapper.BasicdataVehiclePhotoMapper; +import com.logpm.basicdata.service.IBasicdataVehiclePhotoService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 车辆照片信息表 服务实现类 + * + * @author lmy + * @since 2023-05-19 + */ +@Service +public class BasicdataVehiclePhotoServiceImpl extends BaseServiceImpl implements IBasicdataVehiclePhotoService { + + @Override + public IPage selectBasicdataVehiclePhotoPage(IPage page, BasicdataVehiclePhotoVO basicdataVehiclePhoto) { + return page.setRecords(baseMapper.selectBasicdataVehiclePhotoPage(page, basicdataVehiclePhoto)); + } + + + @Override + public List exportBasicdataVehiclePhoto(Wrapper queryWrapper) { + List basicdataVehiclePhotoList = baseMapper.exportBasicdataVehiclePhoto(queryWrapper); + //basicdataVehiclePhotoList.forEach(basicdataVehiclePhoto -> { + // basicdataVehiclePhoto.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataVehiclePhoto.getType())); + //}); + return basicdataVehiclePhotoList; + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java index f783a731e..d657bbbe9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java @@ -52,4 +52,14 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl selectPhotoBymasterId(Long id) { + return baseMapper.selectPhotoBymasterId(id); + } + + @Override + public BasicdataVehicleEntity getOneById(Long id) { + return baseMapper.selectById(id); + } + }