From 4db92c15f1a15e0a78962b51065c05c739e1e5b8 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Thu, 7 Dec 2023 10:28:07 +0800 Subject: [PATCH] fix --- .../bonus/zlpt/equip/api/domain/DevInfo.java | 26 +++++++++++++++++- .../zlpt/equip/api/domain/vo/DevInfoVo.java | 26 ++++++++++++++++++ .../common/core/domain/order/OrderInfo.java | 12 +++++++++ .../core/domain/order/vo/OrderInfoVo.java | 27 +++++++++++++++++++ .../equip/controller/DevInfoController.java | 6 +++++ .../order/controller/OrderInfoController.java | 5 ++++ 6 files changed, 101 insertions(+), 1 deletion(-) diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java index fdbde96..a07c9ca 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java @@ -2,9 +2,9 @@ package com.bonus.zlpt.equip.api.domain; import java.math.BigDecimal; import java.util.List; - import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -22,98 +22,122 @@ public class DevInfo extends BaseEntity /** 设备id */ @Excel(name = "设备id") + @ApiModelProperty(value = "设备id") private Long maId; /** 系统编码 */ @Excel(name = "系统编码") + @ApiModelProperty(value = "系统编码") private String code; /** 类型id */ @Excel(name = "类型id") + @ApiModelProperty(value = "类型id") private Long typeId; /** 设备状态(自有，待上架，上架，在租，下架)考虑数据字典 */ @Excel(name = "设备状态(自有，待上架，上架，在租，下架)考虑数据字典") + @ApiModelProperty(value = "设备状态(自有，待上架，上架，在租，下架)考虑数据字典") private String maStatus; /** 租赁范围 */ @Excel(name = "租赁范围") + @ApiModelProperty(value = "租赁范围") private Long leaseScope; /** 设备所在地 */ @Excel(name = "设备所在地") + @ApiModelProperty(value = "设备所在地") private String location; /** 设备品牌 */ @Excel(name = "设备品牌") + @ApiModelProperty(value = "设备品牌") private String brand; /** 设备型号 */ @Excel(name = "设备型号") + @ApiModelProperty(value = "设备型号") private String modelName; /** 出厂日期 */ @Excel(name = "出厂日期") + @ApiModelProperty(value = "出厂日期") private String productionDate; /** 工作时长 */ @Excel(name = "工作时长") + @ApiModelProperty(value = "工作时长") private String workingHours; /** 整机序列号 */ @Excel(name = "整机序列号") + @ApiModelProperty(value = "整机序列号") private String serialNumber; /** 设备月租价 */ @Excel(name = "设备月租价") + @ApiModelProperty(value = "设备月租价") private String monthLeasePrice; /** 设备天租价 */ @Excel(name = "设备天租价") + @ApiModelProperty(value = "设备天租价") private String dayLeasePrice; /** 设备主照片 */ @Excel(name = "设备主照片") + @ApiModelProperty(value = "设备主照片") private String picUrl; /** 机手月租金 */ @Excel(name = "机手月租金") + @ApiModelProperty(value = "机手月租金") private String jsMonthPrice; /** 机手天租金 */ @Excel(name = "机手天租金") + @ApiModelProperty(value = "机手天租金") private String jsDayPrice; /** 详细描述 */ @Excel(name = "详细描述") + @ApiModelProperty(value = "详细描述") private String description; /** gps编号 */ @Excel(name = "gps编号") + @ApiModelProperty(value = "gps编号") private String gpsCode; /** 设备所属公司 */ @Excel(name = "设备所属公司") + @ApiModelProperty(value = "设备所属公司") private Long ownCo; /** 创建人 */ @Excel(name = "创建人") + @ApiModelProperty(value = "创建人") private Long creator; /** 设备规格 */ @Excel(name = "设备规格") + @ApiModelProperty(value = "设备规格") private String specification; /** 订金 */ @Excel(name = "订金") + @ApiModelProperty(value = "订金") private BigDecimal deposit; /** 是否删除 */ @Excel(name = "是否配备机手") + @ApiModelProperty(value = "是否配备机手") private String isOperator; /** 是否删除 */ @Excel(name = "是否删除") + @ApiModelProperty(value = "是否删除") private String isActive; /**文件附件*/ private List fileList; diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java index ab15b70..c57ed85 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java @@ -1,6 +1,7 @@ package com.bonus.zlpt.equip.api.domain.vo; import com.bonus.zlpt.equip.api.domain.DevInfo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -12,35 +13,60 @@ public class DevInfoVo extends DevInfo { private Integer pageSize; private long parentId; /* 装备类别 grandpa */ + @ApiModelProperty(value = "装备类别") private String typeName; /* 装备组别 parent */ + @ApiModelProperty(value = "装备组别") private String groupName; /* 装备名称 child */ + @ApiModelProperty(value = "装备名称") private String deviceName; + @ApiModelProperty(value = "收藏id") private int collectId; + @ApiModelProperty(value = "公司名称") private String companyName; + @ApiModelProperty(value = "公司logo") private String companyLogoUrl; + @ApiModelProperty(value = "公司入驻时间") private String companyCreateTime; + @ApiModelProperty(value = "公司上架数量") private Long companyUpNum; /* 联系商家，被授权人手机号 */ + @ApiModelProperty(value = "认证人电话") private String authPhone; + @ApiModelProperty(value = "外观图集") private String[] pictures; + @ApiModelProperty(value = "关键词") private String keyWord; /* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */ + @ApiModelProperty(value = "是否审核通过") private String isAudit; + @ApiModelProperty(value = "搜索数量") private Long searchNum; + @ApiModelProperty(value = "检验pdf") private String examinationPdf; + @ApiModelProperty(value = "保险pdf") private String insurancePdf; /** 1上架，2下架*/ + @ApiModelProperty(value = "上下架类别") private String type; /**上下架id*/ + @ApiModelProperty(value = "上下架id") private int upId; + @ApiModelProperty(value = "搜索月租金最下值") private Integer monthLeasePriceMin; + @ApiModelProperty(value = "搜索月租金最大值") private Integer monthLeasePriceMax; + @ApiModelProperty(value = "搜索装备年份最小值") private Integer ageMin; + @ApiModelProperty(value = "搜索装备年份最大值") private Integer ageMax; + @ApiModelProperty(value = "搜索装备工作小时最小值") private Integer workingHoursMin; + @ApiModelProperty(value = "搜索装备工作小时最大值") private Integer workingHoursMax; + @ApiModelProperty(value = "搜索装备月租金排序 ASC or DESC") private String monthLeasePriceOrderBy; // ASC or DESC + @ApiModelProperty(value = "搜索装备更新时间排序 ASC or DESC") private String updateTimeOrderBy; // ASC or DESC } diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java index 8332af2..f7618dd 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -21,45 +22,56 @@ public class OrderInfo extends BaseEntity /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty(value = "订单id") private Long orderId; /** 父id（续租原订单） */ @Excel(name = "父id", readConverterExp = "续=租原订单") + @ApiModelProperty(value = "父id") private Long pId; /** 订单编号 */ @Excel(name = "订单编号") + @ApiModelProperty(value = "订单编号") private String code; /** 订单日期 */ @Excel(name = "订单日期") + @ApiModelProperty(value = "订单日期") private String time; /** 订金 */ @Excel(name = "订金") + @ApiModelProperty(value = "订金") private BigDecimal deposit; /** 订单金额 */ @Excel(name = "订单金额") + @ApiModelProperty(value = "订单金额") private BigDecimal cost; /** 结算周期 */ @Excel(name = "结算周期") + @ApiModelProperty(value = "结算周期") private String payType; /** 供应商id */ @Excel(name = "供应商id") + @ApiModelProperty(value = "供应商id") private String supplier; /** 订单状态（待确认，待上传合同，待发货，已退货，待收货，进行中，临期，超期，驳回，退租申请，续租申请，完结） */ @Excel(name = "订单状态", readConverterExp = "待=确认，待上传合同，待发货，已退货，待收货，进行中，临期，超期，驳回，退租申请，续租申请，完结") + @ApiModelProperty(value = "订单状态") private String orderStatus; /** 下单用户id */ @Excel(name = "下单用户id") + @ApiModelProperty(value = "下单用户id") private Long orderUser; /** 下单企业 */ @Excel(name = "下单企业") + @ApiModelProperty(value = "下单企业") private String orderCompany; } diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java index 87a85be..71ca330 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.common.core.domain.order.vo; import com.bonus.zlpt.common.core.annotation.Excel; import com.bonus.zlpt.common.core.domain.order.OrderInfo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -10,35 +11,61 @@ import lombok.ToString; @ToString public class OrderInfoVo extends OrderInfo { /* 装备类别 grandpa */ + @ApiModelProperty(value = "装备类别") private String typeName; /* 装备组别 parent */ + @ApiModelProperty(value = "装备组别") private String groupName; /* 装备名称 child */ + @ApiModelProperty(value = "装备名称") private String deviceName; + @ApiModelProperty(value = "装备id") private Long maId; + @ApiModelProperty(value = "联系电话") private String orderPhone; + @ApiModelProperty(value = "供应商") private String supplierCompany; /** 需求单位 */ @Excel(name = "需求单位") + @ApiModelProperty(value = "需求单位") private String needCompany; + @ApiModelProperty(value = "设备计划进场时间") private String planStartTime; + @ApiModelProperty(value = "是否需要机手") private String isMachinist; + @ApiModelProperty(value = "设备进场省市县") private Integer addressId; + @ApiModelProperty(value = "详细地址") private String address; + @ApiModelProperty(value = "工期时长") private String duration; + @ApiModelProperty(value = "发票类型") private String invoiceType; + @ApiModelProperty(value = "项目说明") private String description; + @ApiModelProperty(value = "租赁类型") private Long leaseType; + @ApiModelProperty(value = "租赁单价") private String leasePrice; + @ApiModelProperty(value = "机手单价") private String machinistPrice; + @ApiModelProperty(value = "订单合同") private String orderContract; + @ApiModelProperty(value = "机手姓名") private String machinistName; + @ApiModelProperty(value = "联系电话") private String phone; + @ApiModelProperty(value = "物流司机电话") private String logisticsPhone; + @ApiModelProperty(value = "设备实际进场时间") private String realStartTime; + @ApiModelProperty(value = "租方进场确认人") private String renterName; + @ApiModelProperty(value = "出租方进场确认人") private String tenantName; + @ApiModelProperty(value = "进场附件") private String entryAttachment; /* 合同附件 */ + @ApiModelProperty(value = "合同附件") private String contractUrl; } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java index 0bcd201..eb4876a 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java @@ -13,6 +13,8 @@ import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.common.log.annotation.Log; import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import com.bonus.zlpt.equip.service.IDevInfoService; import org.springframework.web.bind.annotation.*; @@ -24,6 +26,7 @@ import javax.servlet.http.HttpServletResponse; * @author xsheng * @date 2023-12-02 */ +@Api(tags = "装备数据接口") @RestController @RequestMapping("/dev") public class DevInfoController extends BaseController @@ -35,6 +38,7 @@ public class DevInfoController extends BaseController * 查询设备信息列表 */ //@RequiresPermissions("equip:info:list") + @ApiOperation(value = "装备列表") @PostMapping("/list") public TableDataInfo list(@RequestBody DevInfoVo devInfo) { @@ -45,6 +49,7 @@ public class DevInfoController extends BaseController @RequiresPermissions("equip:info:list") @GetMapping("/hotList") + @ApiOperation(value = "装备推荐列表") public TableDataInfo hotList(DevInfoVo devInfo) { startPage(devInfo.getPageNum(),devInfo.getPageSize()); @@ -68,6 +73,7 @@ public class DevInfoController extends BaseController /** * 获取设备信息详细信息 */ + @ApiOperation(value = "装备详情") @RequiresPermissions("equip:info:query") @GetMapping(value = "/{maId}") public AjaxResult getInfo(@PathVariable("maId") Long maId) diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java index 319748c..018f002 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java @@ -13,6 +13,8 @@ import com.bonus.zlpt.common.log.annotation.Log; import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; import com.bonus.zlpt.order.feign.EquipClient; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +35,7 @@ import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG; * @author xsheng * @date 2023-12-01 */ +@Api(tags = "订单收据接口") @RestController @RequestMapping("/info") public class OrderInfoController extends BaseController @@ -45,6 +48,7 @@ public class OrderInfoController extends BaseController /** * 查询订单信息列表 */ + @ApiOperation(value = "订单列表") @RequiresPermissions("order:info:list") @GetMapping("/list") public TableDataInfo list(OrderInfoVo orderInfo) @@ -85,6 +89,7 @@ public class OrderInfoController extends BaseController /** * 获取订单信息详细信息 */ + @ApiOperation(value = "订单详情") @RequiresPermissions("order:info:query") @GetMapping(value = "/{orderId}") public AjaxResult getInfo(@PathVariable("orderId") Long orderId)