上传图片或者视频

xxgl-admin/src/main/java/com/miaxis/pc/controller/ControllerInfoController.java

@@ -0,0 +1,108 @@
+package com.miaxis.pc.controller;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.controller.domain.ControllerInfo;
+import com.miaxis.controller.service.IControllerInfoService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【控制器报价】Controller
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+@RestController
+@RequestMapping("/controller/info")
+@Api(tags={"【pc-控制器报价】"})
+public class ControllerInfoController extends BaseController{
+    @Autowired
+    private IControllerInfoService controllerInfoService;
+
+    /**
+     * 查询控制器报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('controller:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询控制器报价列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<ControllerInfo> list(@ModelAttribute ControllerInfo controllerInfo){
+        startPage();
+        List<ControllerInfo> list = controllerInfoService.selectControllerInfoList(controllerInfo);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出控制器报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('controller:info:export')")
+    @Log(title = "控制器报价", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出控制器报价列表Excel")
+    public Response<String> export(@ModelAttribute ControllerInfo controllerInfo){
+        List<ControllerInfo> list = controllerInfoService.selectControllerInfoList(controllerInfo);
+        ExcelUtil<ControllerInfo> util = new ExcelUtil<ControllerInfo>(ControllerInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取控制器报价详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('controller:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取控制器报价详细信息")
+    public Response<ControllerInfo> getInfo(
+            @ApiParam(name = "id", value = "控制器报价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(controllerInfoService.getById(id));
+    }
+
+    /**
+     * 新增控制器报价
+     */
+//    @PreAuthorize("@ss.hasPermi('controller:info:add')")
+    @Log(title = "控制器报价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增控制器报价")
+    public Response<Integer> add(@RequestBody ControllerInfo controllerInfo){
+        return toResponse(controllerInfoService.save(controllerInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改控制器报价
+     */
+//    @PreAuthorize("@ss.hasPermi('controller:info:edit')")
+    @Log(title = "控制器报价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改控制器报价")
+    public Response<Integer> edit(@RequestBody ControllerInfo controllerInfo){
+        return toResponse(controllerInfoService.updateById(controllerInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除控制器报价
+     */
+//    @PreAuthorize("@ss.hasPermi('controller:info:remove')")
+    @Log(title = "控制器报价", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除控制器报价")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "控制器报价ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(controllerInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

xxgl-admin/src/main/java/com/miaxis/pc/controller/EngineInfoController.java

@@ -0,0 +1,117 @@
+package com.miaxis.pc.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.engine.domain.EngineInfo;
+import com.miaxis.engine.service.IEngineInfoService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【报价】Controller
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+@RestController
+@RequestMapping("/engine/info")
+@Api(tags={"【pc-发动机报价】"})
+public class EngineInfoController extends BaseController{
+    @Autowired
+    private IEngineInfoService engineInfoService;
+
+    /**
+     * 查询报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('engine:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询报价列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<EngineInfo> list(@ModelAttribute EngineInfo engineInfo){
+        startPage();
+        List<EngineInfo> list = engineInfoService.selectEngineInfoList(engineInfo);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('engine:info:export')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出报价列表Excel")
+    public Response<String> export(@ModelAttribute EngineInfo engineInfo){
+        List<EngineInfo> list = engineInfoService.selectEngineInfoList(engineInfo);
+        ExcelUtil<EngineInfo> util = new ExcelUtil<EngineInfo>(EngineInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取报价详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('engine:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取报价详细信息")
+    public Response<EngineInfo> getInfo(
+            @ApiParam(name = "id", value = "报价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(engineInfoService.getById(id));
+    }
+
+    /**
+     * 新增报价
+     */
+//    @PreAuthorize("@ss.hasPermi('engine:info:add')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增报价")
+    public Response<Integer> add(@RequestBody EngineInfo engineInfo){
+        return toResponse(engineInfoService.save(engineInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改报价
+     */
+//    @PreAuthorize("@ss.hasPermi('engine:info:edit')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改报价")
+    public Response<Integer> edit(@RequestBody EngineInfo engineInfo){
+        return toResponse(engineInfoService.updateById(engineInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除报价
+     */
+//    @PreAuthorize("@ss.hasPermi('engine:info:remove')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除报价")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "报价ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(engineInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

xxgl-service/src/main/java/com/miaxis/controller/domain/ControllerInfo.java

@@ -0,0 +1,91 @@
+package com.miaxis.controller.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 控制器报价对象 controller_info
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+@Data
+@TableName("controller_info")
+@ApiModel(value = "ControllerInfo", description = "控制器报价对象 controller_info")
+public class ControllerInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    @TableField("brand")
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    /** 控制器型号 */
+    @Excel(name = "控制器型号")
+    @TableField("controller_model")
+    @ApiModelProperty(value = "控制器型号")
+    private String controllerModel;
+
+    /** 控制器价格 */
+    @Excel(name = "控制器价格")
+    @TableField("controller_price")
+    @ApiModelProperty(value = "控制器价格")
+    private BigDecimal controllerPrice;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setBrand(String brand){
+        this.brand = brand;
+    }
+
+    public String getBrand(){
+        return brand;
+    }
+    public void setControllerModel(String controllerModel){
+        this.controllerModel = controllerModel;
+    }
+
+    public String getControllerModel(){
+        return controllerModel;
+    }
+    public void setControllerPrice(BigDecimal controllerPrice){
+        this.controllerPrice = controllerPrice;
+    }
+
+    public BigDecimal getControllerPrice(){
+        return controllerPrice;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("brand", getBrand())
+            .append("controllerModel", getControllerModel())
+            .append("controllerPrice", getControllerPrice())
+            .append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

xxgl-service/src/main/java/com/miaxis/controller/mapper/ControllerInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.controller.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.controller.domain.ControllerInfo;
+
+/**
+ * 控制器报价Mapper接口
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+public interface ControllerInfoMapper extends BaseMapper<ControllerInfo> {
+    /**
+     * 查询控制器报价列表
+     *
+     * @param controllerInfo 控制器报价
+     * @return 控制器报价集合
+     */
+    public List<ControllerInfo> selectControllerInfoList(ControllerInfo controllerInfo);
+
+}

xxgl-service/src/main/java/com/miaxis/controller/service/IControllerInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.controller.service;
+
+import java.util.List;
+import com.miaxis.controller.domain.ControllerInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 控制器报价Service接口
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+public interface IControllerInfoService extends IService<ControllerInfo>{
+    /**
+     * 查询控制器报价列表
+     *
+     * @param controllerInfo 控制器报价
+     * @return 控制器报价集合
+     */
+    public List<ControllerInfo> selectControllerInfoList(ControllerInfo controllerInfo);
+}

xxgl-service/src/main/java/com/miaxis/controller/service/impl/ControllerInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.controller.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.controller.mapper.ControllerInfoMapper;
+import com.miaxis.controller.domain.ControllerInfo;
+import com.miaxis.controller.service.IControllerInfoService;
+
+/**
+ * 控制器报价Service业务层处理
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+@Service
+public class ControllerInfoServiceImpl extends ServiceImpl<ControllerInfoMapper, ControllerInfo> implements IControllerInfoService {
+    @Autowired
+    private ControllerInfoMapper controllerInfoMapper;
+
+    /**
+     * 查询控制器报价列表
+     *
+     * @param controllerInfo 控制器报价
+     * @return 控制器报价
+     */
+    @Override
+    public List<ControllerInfo> selectControllerInfoList(ControllerInfo controllerInfo){
+        return controllerInfoMapper.selectControllerInfoList(controllerInfo);
+    }
+}

xxgl-service/src/main/java/com/miaxis/engine/domain/EngineInfo.java

@@ -0,0 +1,354 @@
+package com.miaxis.engine.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+/**
+ * 报价对象 engine_info
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+@Data
+@TableName("engine_info")
+@ApiModel(value = "EngineInfo", description = "报价对象 engine_info")
+public class EngineInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 动力品牌 */
+    @Excel(name = "动力品牌")
+    @TableField("brand")
+    @ApiModelProperty(value = "动力品牌")
+    private String brand;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    @TableField("model")
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    /** 发动机主要功率(1500RPM  50HZ) */
+    @Excel(name = "发动机主要功率(1500RPM  50HZ)")
+    @TableField("engine_power_major_1500RPM")
+    @ApiModelProperty(value = "发动机主要功率(1500RPM  50HZ)")
+    private Long enginePowerMajor1500rpm;
+
+    /** 发动机备用功率(1500RPM  50HZ) */
+    @Excel(name = "发动机备用功率(1500RPM  50HZ)")
+    @TableField("engine_power_minor_1500RPM")
+    @ApiModelProperty(value = "发动机备用功率(1500RPM  50HZ)")
+    private Long enginePowerMinor1500rpm;
+
+    /** 推荐机组主要功率(1500RPM  50HZ) */
+    @Excel(name = "推荐机组主要功率(1500RPM  50HZ)")
+    @TableField("unit_power_major_1500RPM")
+    @ApiModelProperty(value = "推荐机组主要功率(1500RPM  50HZ)")
+    private Long unitPowerMajor1500rpm;
+
+    /** 推荐机组备用功率(1500RPM  50HZ) */
+    @Excel(name = "推荐机组备用功率(1500RPM  50HZ)")
+    @TableField("unit_power_minor_1500RPM")
+    @ApiModelProperty(value = "推荐机组备用功率(1500RPM  50HZ)")
+    private Long unitPowerMinor1500rpm;
+
+    /** 发动机主要功率(1800RPM  60HZ) */
+    @Excel(name = "发动机主要功率(1800RPM  60HZ)")
+    @TableField("engine_power_major_1800RPM")
+    @ApiModelProperty(value = "发动机主要功率(1800RPM  60HZ)")
+    private Long enginePowerMajor1800rpm;
+
+    /** 发动机备用功率(1800RPM  60HZ) */
+    @Excel(name = "发动机备用功率(1800RPM  60HZ)")
+    @TableField("engine_power_minor_1800RPM")
+    @ApiModelProperty(value = "发动机备用功率(1800RPM  60HZ)")
+    private Long enginePowerMinor1800rpm;
+
+    /** 推荐机组主要功率(1800RPM  60HZ) */
+    @Excel(name = "推荐机组主要功率(1800RPM  60HZ)")
+    @TableField("unit_power_major_1800RPM")
+    @ApiModelProperty(value = "推荐机组主要功率(1800RPM  60HZ)")
+    private Long unitPowerMajor1800rpm;
+
+    /** 推荐机组备用功率(1800RPM  60HZ) */
+    @Excel(name = "推荐机组备用功率(1800RPM  60HZ)")
+    @TableField("unit_power_minor_1800RPM")
+    @ApiModelProperty(value = "推荐机组备用功率(1800RPM  60HZ)")
+    private Long unitPowerMinor1800rpm;
+
+    /** 油泵形式 */
+    @Excel(name = "油泵形式")
+    @TableField("oil_form")
+    @ApiModelProperty(value = "油泵形式")
+    private String oilForm;
+
+    /** 进气方式 */
+    @Excel(name = "进气方式")
+    @TableField("air_intake_mode")
+    @ApiModelProperty(value = "进气方式")
+    private String airIntakeMode;
+
+    /** 电压 */
+    @Excel(name = "电压")
+    @TableField("voltage")
+    @ApiModelProperty(value = "电压")
+    private String voltage;
+
+    /** 排量 （L） */
+    @Excel(name = "排量 （L）", readConverterExp = "L=")
+    @TableField("displacement")
+    @ApiModelProperty(value = "排量 （L）")
+    private String displacement;
+
+    /** 油耗（g/kw.h) */
+    @Excel(name = "油耗（g/kw.h)", readConverterExp = "油耗（g/kw.h)")
+    @TableField("oil_consumption")
+    @ApiModelProperty(value = "油耗（g/kw.h)")
+    private String oilConsumption;
+
+    /** 水箱重量(Kg) */
+    @Excel(name = "水箱重量(Kg)")
+    @TableField("tank_weight")
+    @ApiModelProperty(value = "水箱重量(Kg)")
+    private Long tankWeight;
+
+    /** 动力尺寸L*W*H(mm) */
+    @Excel(name = "动力尺寸L*W*H(mm)")
+    @TableField("power_size")
+    @ApiModelProperty(value = "动力尺寸L*W*H(mm)")
+    private String powerSize;
+
+    /** 水箱尺寸L*W*H(mm) */
+    @Excel(name = "水箱尺寸L*W*H(mm)")
+    @TableField("tank_size")
+    @ApiModelProperty(value = "水箱尺寸L*W*H(mm)")
+    private String tankSize;
+
+    /** 排放标准 */
+    @Excel(name = "排放标准")
+    @TableField(" emission_standard")
+    @ApiModelProperty(value = "排放标准")
+    private String emissionStandard;
+
+    /** 配置说明 */
+    @Excel(name = "配置说明")
+    @TableField("configuration_description")
+    @ApiModelProperty(value = "配置说明")
+    private String configurationDescription;
+
+    /** 价格 */
+    @Excel(name = "价格")
+    @TableField("price")
+    @ApiModelProperty(value = "价格")
+    private Long price;
+
+    /** 水箱价格 */
+    @Excel(name = "水箱价格")
+    @TableField("tank_price")
+    @ApiModelProperty(value = "水箱价格")
+    private Long tankPrice;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setBrand(String brand){
+        this.brand = brand;
+    }
+
+    public String getBrand(){
+        return brand;
+    }
+    public void setModel(String model){
+        this.model = model;
+    }
+
+    public String getModel(){
+        return model;
+    }
+    public void setEnginePowerMajor1500rpm(Long enginePowerMajor1500rpm){
+        this.enginePowerMajor1500rpm = enginePowerMajor1500rpm;
+    }
+
+    public Long getEnginePowerMajor1500rpm(){
+        return enginePowerMajor1500rpm;
+    }
+    public void setEnginePowerMinor1500rpm(Long enginePowerMinor1500rpm){
+        this.enginePowerMinor1500rpm = enginePowerMinor1500rpm;
+    }
+
+    public Long getEnginePowerMinor1500rpm(){
+        return enginePowerMinor1500rpm;
+    }
+    public void setUnitPowerMajor1500rpm(Long unitPowerMajor1500rpm){
+        this.unitPowerMajor1500rpm = unitPowerMajor1500rpm;
+    }
+
+    public Long getUnitPowerMajor1500rpm(){
+        return unitPowerMajor1500rpm;
+    }
+    public void setUnitPowerMinor1500rpm(Long unitPowerMinor1500rpm){
+        this.unitPowerMinor1500rpm = unitPowerMinor1500rpm;
+    }
+
+    public Long getUnitPowerMinor1500rpm(){
+        return unitPowerMinor1500rpm;
+    }
+    public void setEnginePowerMajor1800rpm(Long enginePowerMajor1800rpm){
+        this.enginePowerMajor1800rpm = enginePowerMajor1800rpm;
+    }
+
+    public Long getEnginePowerMajor1800rpm(){
+        return enginePowerMajor1800rpm;
+    }
+    public void setEnginePowerMinor1800rpm(Long enginePowerMinor1800rpm){
+        this.enginePowerMinor1800rpm = enginePowerMinor1800rpm;
+    }
+
+    public Long getEnginePowerMinor1800rpm(){
+        return enginePowerMinor1800rpm;
+    }
+    public void setUnitPowerMajor1800rpm(Long unitPowerMajor1800rpm){
+        this.unitPowerMajor1800rpm = unitPowerMajor1800rpm;
+    }
+
+    public Long getUnitPowerMajor1800rpm(){
+        return unitPowerMajor1800rpm;
+    }
+    public void setUnitPowerMinor1800rpm(Long unitPowerMinor1800rpm){
+        this.unitPowerMinor1800rpm = unitPowerMinor1800rpm;
+    }
+
+    public Long getUnitPowerMinor1800rpm(){
+        return unitPowerMinor1800rpm;
+    }
+    public void setOilForm(String oilForm){
+        this.oilForm = oilForm;
+    }
+
+    public String getOilForm(){
+        return oilForm;
+    }
+    public void setAirIntakeMode(String airIntakeMode){
+        this.airIntakeMode = airIntakeMode;
+    }
+
+    public String getAirIntakeMode(){
+        return airIntakeMode;
+    }
+    public void setVoltage(String voltage){
+        this.voltage = voltage;
+    }
+
+    public String getVoltage(){
+        return voltage;
+    }
+    public void setDisplacement(String displacement){
+        this.displacement = displacement;
+    }
+
+    public String getDisplacement(){
+        return displacement;
+    }
+    public void setOilConsumption(String oilConsumption){
+        this.oilConsumption = oilConsumption;
+    }
+
+    public String getOilConsumption(){
+        return oilConsumption;
+    }
+    public void setTankWeight(Long tankWeight){
+        this.tankWeight = tankWeight;
+    }
+
+    public Long getTankWeight(){
+        return tankWeight;
+    }
+    public void setPowerSize(String powerSize){
+        this.powerSize = powerSize;
+    }
+
+    public String getPowerSize(){
+        return powerSize;
+    }
+    public void setTankSize(String tankSize){
+        this.tankSize = tankSize;
+    }
+
+    public String getTankSize(){
+        return tankSize;
+    }
+    public void setemissionStandard(String emissionStandard){
+        this.emissionStandard = emissionStandard;
+    }
+
+    public String getemissionStandard(){
+        return emissionStandard;
+    }
+    public void setConfigurationDescription(String configurationDescription){
+        this.configurationDescription = configurationDescription;
+    }
+
+    public String getConfigurationDescription(){
+        return configurationDescription;
+    }
+    public void setPrice(Long price){
+        this.price = price;
+    }
+
+    public Long getPrice(){
+        return price;
+    }
+    public void setTankPrice(Long tankPrice){
+        this.tankPrice = tankPrice;
+    }
+
+    public Long getTankPrice(){
+        return tankPrice;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("brand", getBrand())
+            .append("model", getModel())
+            .append("enginePowerMajor1500rpm", getEnginePowerMajor1500rpm())
+            .append("enginePowerMinor1500rpm", getEnginePowerMinor1500rpm())
+            .append("unitPowerMajor1500rpm", getUnitPowerMajor1500rpm())
+            .append("unitPowerMinor1500rpm", getUnitPowerMinor1500rpm())
+            .append("enginePowerMajor1800rpm", getEnginePowerMajor1800rpm())
+            .append("enginePowerMinor1800rpm", getEnginePowerMinor1800rpm())
+            .append("unitPowerMajor1800rpm", getUnitPowerMajor1800rpm())
+            .append("unitPowerMinor1800rpm", getUnitPowerMinor1800rpm())
+            .append("oilForm", getOilForm())
+            .append("airIntakeMode", getAirIntakeMode())
+            .append("voltage", getVoltage())
+            .append("displacement", getDisplacement())
+            .append("oilConsumption", getOilConsumption())
+            .append("tankWeight", getTankWeight())
+            .append("powerSize", getPowerSize())
+            .append("tankSize", getTankSize())
+            .append(" emissionStandard", getemissionStandard())
+            .append("configurationDescription", getConfigurationDescription())
+            .append("price", getPrice())
+            .append("tankPrice", getTankPrice())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

xxgl-service/src/main/java/com/miaxis/engine/mapper/EngineInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.engine.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.engine.domain.EngineInfo;
+
+/**
+ * 报价Mapper接口
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+public interface EngineInfoMapper extends BaseMapper<EngineInfo> {
+    /**
+     * 查询报价列表
+     *
+     * @param engineInfo 报价
+     * @return 报价集合
+     */
+    public List<EngineInfo> selectEngineInfoList(EngineInfo engineInfo);
+
+}

xxgl-service/src/main/java/com/miaxis/engine/service/IEngineInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.engine.service;
+
+import java.util.List;
+import com.miaxis.engine.domain.EngineInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 报价Service接口
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+public interface IEngineInfoService extends IService<EngineInfo>{
+    /**
+     * 查询报价列表
+     *
+     * @param engineInfo 报价
+     * @return 报价集合
+     */
+    public List<EngineInfo> selectEngineInfoList(EngineInfo engineInfo);
+}

xxgl-service/src/main/java/com/miaxis/engine/service/impl/EngineInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.engine.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.engine.mapper.EngineInfoMapper;
+import com.miaxis.engine.domain.EngineInfo;
+import com.miaxis.engine.service.IEngineInfoService;
+
+/**
+ * 报价Service业务层处理
+ *
+ * @author miaxis
+ * @date 2023-01-29
+ */
+@Service
+public class EngineInfoServiceImpl extends ServiceImpl<EngineInfoMapper, EngineInfo> implements IEngineInfoService {
+    @Autowired
+    private EngineInfoMapper engineInfoMapper;
+
+    /**
+     * 查询报价列表
+     *
+     * @param engineInfo 报价
+     * @return 报价
+     */
+    @Override
+    public List<EngineInfo> selectEngineInfoList(EngineInfo engineInfo){
+        return engineInfoMapper.selectEngineInfoList(engineInfo);
+    }
+}

xxgl-service/src/main/java/com/miaxis/price/domain/PriceInfo.java

@@ -1,18 +1,15 @@
 package com.miaxis.price.domain;
 
-import java.math.BigDecimal;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 /**
  * 报价对象 price_info
  *
@@ -30,428 +27,219 @@ public class PriceInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "主键")
     private Long id;
 
-
-
     /** 机组型号 */
-    @Excel(name = "机组型号", sort=1)
+    @Excel(name = "机组型号")
     @TableField("unit_model")
     @ApiModelProperty(value = "机组型号")
     private String unitModel;
 
     /** 机组功率(kw) */
-    @Excel(name = "机组功率(kw)", sort=2)
+    @Excel(name = "机组功率(kw)")
     @TableField("unit_power_kw")
     @ApiModelProperty(value = "机组功率(kw)")
     private BigDecimal unitPowerKw;
 
     /** 机组功率(kva) */
-    @Excel(name = "机组功率(kva)", sort=3)
+    @Excel(name = "机组功率(kva)")
     @TableField("unit_power_kva")
     @ApiModelProperty(value = "机组功率(kva)")
     private BigDecimal unitPowerKva;
 
     /** 频率(Hz) */
-    @Excel(name = "频率(Hz)", sort=4)
+    @Excel(name = "频率(Hz)")
     @TableField("rate")
     @ApiModelProperty(value = "频率(Hz)")
     private Integer rate;
 
-    /** 品牌 */
-    @Excel(name = "品牌", sort=5)
+    /** 动力品牌 */
+    @Excel(name = "动力品牌")
     @TableField("brand")
-    @ApiModelProperty(value = "品牌")
+    @ApiModelProperty(value = "动力品牌")
     private String brand;
 
     /** 柴油机型号 */
-    @Excel(name = "柴油机型号", sort=6)
+    @Excel(name = "柴油机型号")
     @TableField("diesel_engine_model")
     @ApiModelProperty(value = "柴油机型号")
     private String dieselEngineModel;
 
     /** 转速 */
-    @Excel(name = "转速", sort=7)
+    @Excel(name = "转速")
     @TableField("speed")
     @ApiModelProperty(value = "转速")
     private Integer speed;
 
     /** 动力价格 */
-    @Excel(name = "动力价格", sort=8)
+    @Excel(name = "动力价格")
     @TableField("power_price")
     @ApiModelProperty(value = "动力价格")
     private BigDecimal powerPrice;
 
-    /** 发电机型号 */
-    @Excel(name = "发电机型号", sort=9)
-    @TableField("generator_model")
-    @ApiModelProperty(value = "发电机型号")
-    private String generatorModel;
-
-    /** 发电机价格 */
-    @Excel(name = "发电机价格", sort=10)
-    @TableField("generator_price")
-    @ApiModelProperty(value = "发电机价格")
-    private BigDecimal generatorPrice;
+    /** 发电机型号(仿斯坦福) */
+    @Excel(name = "发电机型号(仿斯坦福)")
+    @TableField("generator_model_fstf")
+    @ApiModelProperty(value = "发电机型号(仿斯坦福)")
+    private String generatorModelFstf;
+
+    /** 发电机价格(仿斯坦福) */
+    @Excel(name = "发电机价格(仿斯坦福)")
+    @TableField("generator_price_fstf")
+    @ApiModelProperty(value = "发电机价格(仿斯坦福)")
+    private BigDecimal generatorPriceFstf;
+
+    /** 发电机型号(斯坦福) */
+    @Excel(name = "发电机型号(斯坦福)")
+    @TableField("generator_model_stf")
+    @ApiModelProperty(value = "发电机型号(斯坦福)")
+    private String generatorModelStf;
+
+    /** 发电机价格(斯坦福) */
+    @Excel(name = "发电机价格(斯坦福)")
+    @TableField("generator_price_stf")
+    @ApiModelProperty(value = "发电机价格(斯坦福)")
+    private BigDecimal generatorPriceStf;
+
+    /** 发电机型号(利来森马) */
+    @Excel(name = "发电机型号(利来森马)")
+    @TableField("generator_model_llsm")
+    @ApiModelProperty(value = "发电机型号(利来森马)")
+    private String generatorModelLlsm;
+
+    /** 发电机价格(利来森马) */
+    @Excel(name = "发电机价格(利来森马)")
+    @TableField("generator_price_llsm")
+    @ApiModelProperty(value = "发电机价格(利来森马)")
+    private BigDecimal generatorPriceLlsm;
+
+    /** 发电机型号(马拉松) */
+    @Excel(name = "发电机型号(马拉松)")
+    @TableField("generator_model_mls")
+    @ApiModelProperty(value = "发电机型号(马拉松)")
+    private String generatorModelMls;
+
+    /** 发电机价格(马拉松) */
+    @Excel(name = "发电机价格(马拉松)")
+    @TableField("generator_price_mls")
+    @ApiModelProperty(value = "发电机价格(马拉松)")
+    private BigDecimal generatorPriceMls;
+
+    /** 发电机型号(美迪奥) */
+    @Excel(name = "发电机型号(美迪奥)")
+    @TableField("generator_model_mda")
+    @ApiModelProperty(value = "发电机型号(美迪奥)")
+    private String generatorModelMda;
+
+    /** 发电机价格(美迪奥) */
+    @Excel(name = "发电机价格(美迪奥)")
+    @TableField("generator_price_mda")
+    @ApiModelProperty(value = "发电机价格(美迪奥)")
+    private BigDecimal generatorPriceMda;
 
     /** 静音机壳价格 */
-    @Excel(name = "静音机壳价格", sort=11)
+    @Excel(name = "静音机壳价格")
     @TableField("mute_price")
     @ApiModelProperty(value = "静音机壳价格")
     private BigDecimal mutePrice;
 
     /** 开架价格 */
-    @Excel(name = "开架价格", sort=12)
+    @Excel(name = "开架价格")
     @TableField("open_price")
     @ApiModelProperty(value = "开架价格")
     private BigDecimal openPrice;
 
     /** ATS型号 */
-    @Excel(name = "ATS型号", sort=13)
+    @Excel(name = "ATS型号")
     @TableField("ats_model")
     @ApiModelProperty(value = "ATS型号")
     private String atsModel;
 
     /** ATS价格 */
-    @Excel(name = "ATS价格", sort=14)
+    @Excel(name = "ATS价格")
     @TableField("ats_price")
     @ApiModelProperty(value = "ATS价格")
     private BigDecimal atsPrice;
 
     /** 电瓶型号 */
-    @Excel(name = "电瓶型号", sort=15)
+    @Excel(name = "电瓶型号")
     @TableField("battery_model")
     @ApiModelProperty(value = "电瓶型号")
     private String batteryModel;
 
     /** 电瓶价格 */
-    @Excel(name = "电瓶价格", sort=16)
+    @Excel(name = "电瓶价格")
     @TableField("battery_price")
     @ApiModelProperty(value = "电瓶价格")
     private BigDecimal batteryPrice;
 
-    /** 控制器铭贝 */
-    @Excel(name = "控制器铭贝", sort=17)
-    @TableField("controller_minbei")
-    @ApiModelProperty(value = "控制器铭贝")
-    private String controllerMinbei;
-
-    /** 控制器价格 */
-    @Excel(name = "控制器价格", sort=18)
-    @TableField("controller_price")
-    @ApiModelProperty(value = "控制器价格")
-    private BigDecimal controllerPrice;
-
-    /** 合计含税成本(静音) */
-    @Excel(name = "合计含税成本(静音)", sort=19)
-    @TableField("total_cost_mute")
-    @ApiModelProperty(value = "合计含税成本(静音)")
-    private BigDecimal totalCostMute;
-
-    /** 合计含税成本(开架) */
-    @Excel(name = "合计含税成本(开架)", sort=20)
-    @TableField("total_cost_open")
-    @ApiModelProperty(value = "合计含税成本(开架)")
-    private BigDecimal totalCostOpen;
-
-    /** 静音尺寸（长） */
-    @Excel(name = "静音尺寸（长）", sort=21)
-    @TableField("mute_long")
-    @ApiModelProperty(value = "静音尺寸（长）")
-    private BigDecimal muteLong;
-
-    /** 静音尺寸（宽） */
-    @Excel(name = "静音尺寸（宽）", sort=22)
-    @TableField("mute_width")
-    @ApiModelProperty(value = "静音尺寸（宽）")
-    private BigDecimal muteWidth;
-
-    /** 静音尺寸（高） */
-    @Excel(name = "静音尺寸（高）", sort=23)
-    @TableField("mute_high")
-    @ApiModelProperty(value = "静音尺寸（高）")
-    private BigDecimal muteHigh;
-
-    /** 开架尺寸（长） */
-    @Excel(name = "开架尺寸（长）", sort=24)
-    @TableField("open_long")
-    @ApiModelProperty(value = "开架尺寸（长）")
-    private BigDecimal openLong;
-
-    /** 开架尺寸（宽） */
-    @Excel(name = "开架尺寸（宽）", sort=25)
-    @TableField("open_width")
-    @ApiModelProperty(value = "开架尺寸（宽）")
-    private BigDecimal openWidth;
-
-    /** 开架尺寸（高） */
-    @Excel(name = "开架尺寸（高）", sort=26)
-    @TableField("open_high")
-    @ApiModelProperty(value = "开架尺寸（高）")
-    private BigDecimal openHigh;
-
-    /** CKD尺寸（长） */
-    @Excel(name = "CKD尺寸（长）", sort=27)
-    @TableField("ckd_long")
-    @ApiModelProperty(value = "CKD尺寸（长）")
-    private BigDecimal ckdLong;
-
-    /** CKD尺寸（宽） */
-    @Excel(name = "CKD尺寸（宽）", sort=28)
-    @TableField("ckd_width")
-    @ApiModelProperty(value = "CKD尺寸（宽）")
-    private BigDecimal ckdWidth;
-
-    /** CKD尺寸（高） */
-    @Excel(name = "CKD尺寸（高）", sort=29)
-    @TableField("ckd_high")
-    @ApiModelProperty(value = "CKD尺寸（高）")
-    private BigDecimal ckdHigh;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setBrand(String brand){
-        this.brand = brand;
-    }
-
-    public String getBrand(){
-        return brand;
-    }
-    public void setUnitModel(String unitModel){
-        this.unitModel = unitModel;
-    }
-
-    public String getUnitModel(){
-        return unitModel;
-    }
-    public void setUnitPowerKw(BigDecimal unitPowerKw){
-        this.unitPowerKw = unitPowerKw;
-    }
-
-    public BigDecimal getUnitPowerKw(){
-        return unitPowerKw;
-    }
-    public void setUnitPowerKva(BigDecimal unitPowerKva){
-        this.unitPowerKva = unitPowerKva;
-    }
-
-    public BigDecimal getUnitPowerKva(){
-        return unitPowerKva;
-    }
-    public void setRate(Integer rate){
-        this.rate = rate;
-    }
-
-    public Integer getRate(){
-        return rate;
-    }
-    public void setDieselEngineModel(String dieselEngineModel){
-        this.dieselEngineModel = dieselEngineModel;
-    }
-
-    public String getDieselEngineModel(){
-        return dieselEngineModel;
-    }
-    public void setSpeed(Integer speed){
-        this.speed = speed;
-    }
-
-    public Integer getSpeed(){
-        return speed;
-    }
-    public void setPowerPrice(BigDecimal powerPrice){
-        this.powerPrice = powerPrice;
-    }
-
-    public BigDecimal getPowerPrice(){
-        return powerPrice;
-    }
-    public void setGeneratorModel(String generatorModel){
-        this.generatorModel = generatorModel;
-    }
-
-    public String getGeneratorModel(){
-        return generatorModel;
-    }
-    public void setGeneratorPrice(BigDecimal generatorPrice){
-        this.generatorPrice = generatorPrice;
-    }
-
-    public BigDecimal getGeneratorPrice(){
-        return generatorPrice;
-    }
-    public void setMutePrice(BigDecimal mutePrice){
-        this.mutePrice = mutePrice;
-    }
-
-    public BigDecimal getMutePrice(){
-        return mutePrice;
-    }
-    public void setOpenPrice(BigDecimal openPrice){
-        this.openPrice = openPrice;
-    }
-
-    public BigDecimal getOpenPrice(){
-        return openPrice;
-    }
-    public void setAtsModel(String atsModel){
-        this.atsModel = atsModel;
-    }
-
-    public String getAtsModel(){
-        return atsModel;
-    }
-    public void setAtsPrice(BigDecimal atsPrice){
-        this.atsPrice = atsPrice;
-    }
-
-    public BigDecimal getAtsPrice(){
-        return atsPrice;
-    }
-    public void setBatteryModel(String batteryModel){
-        this.batteryModel = batteryModel;
-    }
-
-    public String getBatteryModel(){
-        return batteryModel;
-    }
-    public void setBatteryPrice(BigDecimal batteryPrice){
-        this.batteryPrice = batteryPrice;
-    }
-
-    public BigDecimal getBatteryPrice(){
-        return batteryPrice;
-    }
-    public void setControllerMinbei(String controllerMinbei){
-        this.controllerMinbei = controllerMinbei;
-    }
-
-    public String getControllerMinbei(){
-        return controllerMinbei;
-    }
-    public void setControllerPrice(BigDecimal controllerPrice){
-        this.controllerPrice = controllerPrice;
-    }
-
-    public BigDecimal getControllerPrice(){
-        return controllerPrice;
-    }
-    public void setTotalCostMute(BigDecimal totalCostMute){
-        this.totalCostMute = totalCostMute;
-    }
-
-    public BigDecimal getTotalCostMute(){
-        return totalCostMute;
-    }
-    public void setTotalCostOpen(BigDecimal totalCostOpen){
-        this.totalCostOpen = totalCostOpen;
-    }
-
-    public BigDecimal getTotalCostOpen(){
-        return totalCostOpen;
-    }
-    public void setMuteLong(BigDecimal muteLong){
-        this.muteLong = muteLong;
-    }
-
-    public BigDecimal getMuteLong(){
-        return muteLong;
-    }
-    public void setMuteWidth(BigDecimal muteWidth){
-        this.muteWidth = muteWidth;
-    }
-
-    public BigDecimal getMuteWidth(){
-        return muteWidth;
-    }
-    public void setMuteHigh(BigDecimal muteHigh){
-        this.muteHigh = muteHigh;
-    }
-
-    public BigDecimal getMuteHigh(){
-        return muteHigh;
-    }
-    public void setOpenLong(BigDecimal openLong){
-        this.openLong = openLong;
-    }
-
-    public BigDecimal getOpenLong(){
-        return openLong;
-    }
-    public void setOpenWidth(BigDecimal openWidth){
-        this.openWidth = openWidth;
-    }
-
-    public BigDecimal getOpenWidth(){
-        return openWidth;
-    }
-    public void setOpenHigh(BigDecimal openHigh){
-        this.openHigh = openHigh;
-    }
-
-    public BigDecimal getOpenHigh(){
-        return openHigh;
-    }
-    public void setCkdLong(BigDecimal ckdLong){
-        this.ckdLong = ckdLong;
-    }
-
-    public BigDecimal getCkdLong(){
-        return ckdLong;
-    }
-    public void setCkdWidth(BigDecimal ckdWidth){
-        this.ckdWidth = ckdWidth;
-    }
-
-    public BigDecimal getCkdWidth(){
-        return ckdWidth;
-    }
-    public void setCkdHigh(BigDecimal ckdHigh){
-        this.ckdHigh = ckdHigh;
-    }
-
-    public BigDecimal getCkdHigh(){
-        return ckdHigh;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("brand", getBrand())
-            .append("unitModel", getUnitModel())
-            .append("unitPowerKw", getUnitPowerKw())
-            .append("unitPowerKva", getUnitPowerKva())
-            .append("rate", getRate())
-            .append("dieselEngineModel", getDieselEngineModel())
-            .append("speed", getSpeed())
-            .append("powerPrice", getPowerPrice())
-            .append("generatorModel", getGeneratorModel())
-            .append("generatorPrice", getGeneratorPrice())
-            .append("mutePrice", getMutePrice())
-            .append("openPrice", getOpenPrice())
-            .append("atsModel", getAtsModel())
-            .append("atsPrice", getAtsPrice())
-            .append("batteryModel", getBatteryModel())
-            .append("batteryPrice", getBatteryPrice())
-            .append("controllerMinbei", getControllerMinbei())
-            .append("controllerPrice", getControllerPrice())
-            .append("totalCostMute", getTotalCostMute())
-            .append("totalCostOpen", getTotalCostOpen())
-            .append("muteLong", getMuteLong())
-            .append("muteWidth", getMuteWidth())
-            .append("muteHigh", getMuteHigh())
-            .append("openLong", getOpenLong())
-            .append("openWidth", getOpenWidth())
-            .append("openHigh", getOpenHigh())
-            .append("ckdLong", getCkdLong())
-            .append("ckdWidth", getCkdWidth())
-            .append("ckdHigh", getCkdHigh())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+    /** 合计含税成本(静音配仿斯坦福) */
+    @Excel(name = "合计含税成本(静音配仿斯坦福)")
+    @TableField("total_cost_mute_fstf")
+    @ApiModelProperty(value = "合计含税成本(静音配仿斯坦福)")
+    private BigDecimal totalCostMuteFstf;
+
+    /** 合计含税成本(开架配仿斯坦福) */
+    @Excel(name = "合计含税成本(开架配仿斯坦福)")
+    @TableField("total_cost_open_fstf")
+    @ApiModelProperty(value = "合计含税成本(开架配仿斯坦福)")
+    private BigDecimal totalCostOpenFstf;
+
+    /** 合计含税成本(静音配斯坦福) */
+    @Excel(name = "合计含税成本(静音配斯坦福)")
+    @TableField("total_cost_mute_stf")
+    @ApiModelProperty(value = "合计含税成本(静音配斯坦福)")
+    private BigDecimal totalCostMuteStf;
+
+    /** 合计含税成本(开架配斯坦福) */
+    @Excel(name = "合计含税成本(开架配斯坦福)")
+    @TableField("total_cost_open_stf")
+    @ApiModelProperty(value = "合计含税成本(开架配斯坦福)")
+    private BigDecimal totalCostOpenStf;
+
+    /** 合计含税成本(静音配利来森马) */
+    @Excel(name = "合计含税成本(静音配利来森马)")
+    @TableField("total_cost_mute_llsm")
+    @ApiModelProperty(value = "合计含税成本(静音配利来森马)")
+    private BigDecimal totalCostMuteLlsm;
+
+    /** 合计含税成本(开架配利来森马) */
+    @Excel(name = "合计含税成本(开架配利来森马)")
+    @TableField("total_cost_open_llsm")
+    @ApiModelProperty(value = "合计含税成本(开架配利来森马)")
+    private BigDecimal totalCostOpenLlsm;
+
+    /** 合计含税成本(静音配马拉松) */
+    @Excel(name = "合计含税成本(静音配马拉松)")
+    @TableField("total_cost_mute_mls")
+    @ApiModelProperty(value = "合计含税成本(静音配马拉松)")
+    private BigDecimal totalCostMuteMls;
+
+    /** 合计含税成本(开架配马拉松) */
+    @Excel(name = "合计含税成本(开架配马拉松)")
+    @TableField("total_cost_open_mls")
+    @ApiModelProperty(value = "合计含税成本(开架配马拉松)")
+    private BigDecimal totalCostOpenMls;
+
+    /** 合计含税成本(静音配美迪奥) */
+    @Excel(name = "合计含税成本(静音配美迪奥)")
+    @TableField("total_cost_mute_mda")
+    @ApiModelProperty(value = "合计含税成本(静音配美迪奥)")
+    private BigDecimal totalCostMuteMda;
+
+    /** 合计含税成本(开架配美迪奥) */
+    @Excel(name = "合计含税成本(开架配美迪奥)")
+    @TableField("total_cost_open_mda")
+    @ApiModelProperty(value = "合计含税成本(开架配美迪奥)")
+    private BigDecimal totalCostOpenMda;
+
+    /** 静音尺寸（长/宽/高/重量） */
+    @Excel(name = "静音尺寸（长/宽/高/重量）", readConverterExp = "长=/宽/高/重量")
+    @TableField("mute_parms")
+    @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
+    private String muteParms;
+
+    /** 静音尺寸（长/宽/高/重量） */
+    @Excel(name = "静音尺寸（长/宽/高/重量）", readConverterExp = "长=/宽/高/重量")
+    @TableField("open_parms")
+    @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
+    private String openParms;
 }

xxgl-service/src/main/java/com/miaxis/price/dto/PriceInfoDto.java

@@ -1,15 +1,11 @@
 package com.miaxis.price.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 

xxgl-service/src/main/resources/mapper/controller/ControllerInfoMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.controller.mapper.ControllerInfoMapper">
+
+    <resultMap type="ControllerInfo" id="ControllerInfoResult">
+        <result property="id"    column="id"    />
+        <result property="brand"    column="brand"    />
+        <result property="controllerModel"    column="controller_model"    />
+        <result property="controllerPrice"    column="controller_price"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectControllerInfoVo">
+        select * from controller_info
+    </sql>
+
+    <select id="selectControllerInfoList" parameterType="ControllerInfo" resultMap="ControllerInfoResult">
+        <include refid="selectControllerInfoVo"/>
+        <where>
+            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
+            <if test="controllerModel != null  and controllerModel != ''"> and controller_model = #{controllerModel}</if>
+            <if test="controllerPrice != null "> and controller_price = #{controllerPrice}</if>
+        </where>
+    </select>
+
+</mapper>

xxgl-service/src/main/resources/mapper/engine/EngineInfoMapper.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.engine.mapper.EngineInfoMapper">
+
+    <resultMap type="EngineInfo" id="EngineInfoResult">
+        <result property="id"    column="id"    />
+        <result property="brand"    column="brand"    />
+        <result property="model"    column="model"    />
+        <result property="enginePowerMajor1500rpm"    column="engine_power_major_1500RPM"    />
+        <result property="enginePowerMinor1500rpm"    column="engine_power_minor_1500RPM"    />
+        <result property="unitPowerMajor1500rpm"    column="unit_power_major_1500RPM"    />
+        <result property="unitPowerMinor1500rpm"    column="unit_power_minor_1500RPM"    />
+        <result property="enginePowerMajor1800rpm"    column="engine_power_major_1800RPM"    />
+        <result property="enginePowerMinor1800rpm"    column="engine_power_minor_1800RPM"    />
+        <result property="unitPowerMajor1800rpm"    column="unit_power_major_1800RPM"    />
+        <result property="unitPowerMinor1800rpm"    column="unit_power_minor_1800RPM"    />
+        <result property="oilForm"    column="oil_form"    />
+        <result property="airIntakeMode"    column="air_intake_mode"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="displacement"    column="displacement"    />
+        <result property="oilConsumption"    column="oil_consumption"    />
+        <result property="tankWeight"    column="tank_weight"    />
+        <result property="powerSize"    column="power_size"    />
+        <result property="tankSize"    column="tank_size"    />
+        <result property="
+emissionStandard"    column="
+emission_standard"    />
+        <result property="configurationDescription"    column="configuration_description"    />
+        <result property="price"    column="price"    />
+        <result property="tankPrice"    column="tank_price"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectEngineInfoVo">
+        select * from engine_info
+    </sql>
+
+    <select id="selectEngineInfoList" parameterType="EngineInfo" resultMap="EngineInfoResult">
+        <include refid="selectEngineInfoVo"/>
+        <where>
+            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
+            <if test="model != null  and model != ''"> and model = #{model}</if>
+            <if test="enginePowerMajor1500rpm != null "> and engine_power_major_1500RPM = #{enginePowerMajor1500rpm}</if>
+            <if test="enginePowerMinor1500rpm != null "> and engine_power_minor_1500RPM = #{enginePowerMinor1500rpm}</if>
+            <if test="unitPowerMajor1500rpm != null "> and unit_power_major_1500RPM = #{unitPowerMajor1500rpm}</if>
+            <if test="unitPowerMinor1500rpm != null "> and unit_power_minor_1500RPM = #{unitPowerMinor1500rpm}</if>
+            <if test="enginePowerMajor1800rpm != null "> and engine_power_major_1800RPM = #{enginePowerMajor1800rpm}</if>
+            <if test="enginePowerMinor1800rpm != null "> and engine_power_minor_1800RPM = #{enginePowerMinor1800rpm}</if>
+            <if test="unitPowerMajor1800rpm != null "> and unit_power_major_1800RPM = #{unitPowerMajor1800rpm}</if>
+            <if test="unitPowerMinor1800rpm != null "> and unit_power_minor_1800RPM = #{unitPowerMinor1800rpm}</if>
+            <if test="oilForm != null  and oilForm != ''"> and oil_form = #{oilForm}</if>
+            <if test="airIntakeMode != null  and airIntakeMode != ''"> and air_intake_mode = #{airIntakeMode}</if>
+            <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
+            <if test="displacement != null  and displacement != ''"> and displacement = #{displacement}</if>
+            <if test="oilConsumption != null  and oilConsumption != ''"> and oil_consumption = #{oilConsumption}</if>
+            <if test="tankWeight != null "> and tank_weight = #{tankWeight}</if>
+            <if test="powerSize != null  and powerSize != ''"> and power_size = #{powerSize}</if>
+            <if test="tankSize != null  and tankSize != ''"> and tank_size = #{tankSize}</if>
+            <if test="
+emissionStandard != null  and emissionStandard != ''"> and 
+emission_standard = #{
+emissionStandard}</if>
+            <if test="configurationDescription != null  and configurationDescription != ''"> and configuration_description = #{configurationDescription}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="tankPrice != null "> and tank_price = #{tankPrice}</if>
+        </where>
+    </select>
+
+</mapper>

xxgl-service/src/main/resources/mapper/price/PriceInfoMapper.xml

@@ -3,82 +3,101 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.miaxis.price.mapper.PriceInfoMapper">
-
     <resultMap type="PriceInfo" id="PriceInfoResult">
         <result property="id"    column="id"    />
-        <result property="brand"    column="brand"    />
         <result property="unitModel"    column="unit_model"    />
         <result property="unitPowerKw"    column="unit_power_kw"    />
         <result property="unitPowerKva"    column="unit_power_kva"    />
         <result property="rate"    column="rate"    />
+        <result property="brand"    column="brand"    />
         <result property="dieselEngineModel"    column="diesel_engine_model"    />
         <result property="speed"    column="speed"    />
         <result property="powerPrice"    column="power_price"    />
-        <result property="generatorModel"    column="generator_model"    />
-        <result property="generatorPrice"    column="generator_price"    />
+        <result property="generatorModelFstf"    column="generator_model_fstf"    />
+        <result property="generatorPriceFstf"    column="generator_price_fstf"    />
+        <result property="generatorModelStf"    column="generator_model_stf"    />
+        <result property="generatorPriceStf"    column="generator_price_stf"    />
+        <result property="generatorModelLlsm"    column="generator_model_llsm"    />
+        <result property="generatorPriceLlsm"    column="generator_price_llsm"    />
+        <result property="generatorModelMls"    column="generator_model_mls"    />
+        <result property="generatorPriceMls"    column="generator_price_mls"    />
+        <result property="generatorModelMda"    column="generator_model_mda"    />
+        <result property="generatorPriceMda"    column="generator_price_mda"    />
         <result property="mutePrice"    column="mute_price"    />
         <result property="openPrice"    column="open_price"    />
         <result property="atsModel"    column="ats_model"    />
         <result property="atsPrice"    column="ats_price"    />
         <result property="batteryModel"    column="battery_model"    />
         <result property="batteryPrice"    column="battery_price"    />
-        <result property="controllerMinbei"    column="controller_minbei"    />
-        <result property="controllerPrice"    column="controller_price"    />
-        <result property="totalCostMute"    column="total_cost_mute"    />
-        <result property="totalCostOpen"    column="total_cost_open"    />
-        <result property="muteLong"    column="mute_long"    />
-        <result property="muteWidth"    column="mute_width"    />
-        <result property="muteHigh"    column="mute_high"    />
-        <result property="openLong"    column="open_long"    />
-        <result property="openWidth"    column="open_width"    />
-        <result property="openHigh"    column="open_high"    />
-        <result property="ckdLong"    column="ckd_long"    />
-        <result property="ckdWidth"    column="ckd_width"    />
-        <result property="ckdHigh"    column="ckd_high"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="totalCostMuteFstf"    column="total_cost_mute_fstf"    />
+        <result property="totalCostOpenFstf"    column="total_cost_open_fstf"    />
+        <result property="totalCostMuteStf"    column="total_cost_mute_stf"    />
+        <result property="totalCostOpenStf"    column="total_cost_open_stf"    />
+        <result property="totalCostMuteLlsm"    column="total_cost_mute_llsm"    />
+        <result property="totalCostOpenLlsm"    column="total_cost_open_llsm"    />
+        <result property="totalCostMuteMls"    column="total_cost_mute_mls"    />
+        <result property="totalCostOpenMls"    column="total_cost_open_mls"    />
+        <result property="totalCostMuteMda"    column="total_cost_mute_mda"    />
+        <result property="totalCostOpenMda"    column="total_cost_open_mda"    />
+        <result property="muteParms"    column="mute_parms"    />
+        <result property="openParms"    column="open_parms"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectPriceInfoVo">
         select * from price_info
     </sql>
 
-    <select id="selectPriceInfoList" parameterType="PriceInfoDto" resultMap="PriceInfoResult">
+    <select id="selectPriceInfoList" parameterType="PriceInfo" resultMap="PriceInfoResult">
         <include refid="selectPriceInfoVo"/>
         <where>
-            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
-            <if test="unitModel != null  and unitModel != ''"> and unit_model = #{unitModel}</if>
             <if test="unitPowerKwMin != null "> and unit_power_kw <![CDATA[>=]]> #{unitPowerKwMin}</if>
             <if test="unitPowerKwMax != null "> and unit_power_kw <![CDATA[<=]]> #{unitPowerKwMax}</if>
             <if test="unitPowerKvaMin != null "> and unit_power_kva <![CDATA[>=]]> #{unitPowerKvaMin}</if>
             <if test="unitPowerKvaMax != null "> and unit_power_kva <![CDATA[<=]]> #{unitPowerKvaMax}</if>
+            <if test="unitModel != null  and unitModel != ''"> and unit_model = #{unitModel}</if>
+            <if test="unitPowerKw != null "> and unit_power_kw = #{unitPowerKw}</if>
+            <if test="unitPowerKva != null "> and unit_power_kva = #{unitPowerKva}</if>
             <if test="rate != null "> and rate = #{rate}</if>
+            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
             <if test="dieselEngineModel != null  and dieselEngineModel != ''"> and diesel_engine_model = #{dieselEngineModel}</if>
             <if test="speed != null "> and speed = #{speed}</if>
             <if test="powerPrice != null "> and power_price = #{powerPrice}</if>
-            <if test="generatorModel != null  and generatorModel != ''"> and generator_model = #{generatorModel}</if>
-            <if test="generatorPrice != null "> and generator_price = #{generatorPrice}</if>
+            <if test="generatorModelFstf != null  and generatorModelFstf != ''"> and generator_model_fstf = #{generatorModelFstf}</if>
+            <if test="generatorPriceFstf != null "> and generator_price_fstf = #{generatorPriceFstf}</if>
+            <if test="generatorModelStf != null  and generatorModelStf != ''"> and generator_model_stf = #{generatorModelStf}</if>
+            <if test="generatorPriceStf != null "> and generator_price_stf = #{generatorPriceStf}</if>
+            <if test="generatorModelLlsm != null  and generatorModelLlsm != ''"> and generator_model_llsm = #{generatorModelLlsm}</if>
+            <if test="generatorPriceLlsm != null "> and generator_price_llsm = #{generatorPriceLlsm}</if>
+            <if test="generatorModelMls != null  and generatorModelMls != ''"> and generator_model_mls = #{generatorModelMls}</if>
+            <if test="generatorPriceMls != null "> and generator_price_mls = #{generatorPriceMls}</if>
+            <if test="generatorModelMda != null  and generatorModelMda != ''"> and generator_model_mda = #{generatorModelMda}</if>
+            <if test="generatorPriceMda != null "> and generator_price_mda = #{generatorPriceMda}</if>
             <if test="mutePrice != null "> and mute_price = #{mutePrice}</if>
             <if test="openPrice != null "> and open_price = #{openPrice}</if>
             <if test="atsModel != null  and atsModel != ''"> and ats_model = #{atsModel}</if>
             <if test="atsPrice != null "> and ats_price = #{atsPrice}</if>
             <if test="batteryModel != null  and batteryModel != ''"> and battery_model = #{batteryModel}</if>
             <if test="batteryPrice != null "> and battery_price = #{batteryPrice}</if>
-            <if test="controllerMinbei != null  and controllerMinbei != ''"> and controller_minbei = #{controllerMinbei}</if>
-            <if test="controllerPrice != null "> and controller_price = #{controllerPrice}</if>
-            <if test="totalCostMute != null "> and total_cost_mute = #{totalCostMute}</if>
-            <if test="totalCostOpen != null "> and total_cost_open = #{totalCostOpen}</if>
-            <if test="muteLong != null "> and mute_long = #{muteLong}</if>
-            <if test="muteWidth != null "> and mute_width = #{muteWidth}</if>
-            <if test="muteHigh != null "> and mute_high = #{muteHigh}</if>
-            <if test="openLong != null "> and open_long = #{openLong}</if>
-            <if test="openWidth != null "> and open_width = #{openWidth}</if>
-            <if test="openHigh != null "> and open_high = #{openHigh}</if>
-            <if test="ckdLong != null "> and ckd_long = #{ckdLong}</if>
-            <if test="ckdWidth != null "> and ckd_width = #{ckdWidth}</if>
-            <if test="ckdHigh != null "> and ckd_high = #{ckdHigh}</if>
+            <if test="totalCostMuteFstf != null "> and total_cost_mute_fstf = #{totalCostMuteFstf}</if>
+            <if test="totalCostOpenFstf != null "> and total_cost_open_fstf = #{totalCostOpenFstf}</if>
+            <if test="totalCostMuteStf != null "> and total_cost_mute_stf = #{totalCostMuteStf}</if>
+            <if test="totalCostOpenStf != null "> and total_cost_open_stf = #{totalCostOpenStf}</if>
+            <if test="totalCostMuteLlsm != null "> and total_cost_mute_llsm = #{totalCostMuteLlsm}</if>
+            <if test="totalCostOpenLlsm != null "> and total_cost_open_llsm = #{totalCostOpenLlsm}</if>
+            <if test="totalCostMuteMls != null "> and total_cost_mute_mls = #{totalCostMuteMls}</if>
+            <if test="totalCostOpenMls != null "> and total_cost_open_mls = #{totalCostOpenMls}</if>
+            <if test="totalCostMuteMda != null "> and total_cost_mute_mda = #{totalCostMuteMda}</if>
+            <if test="totalCostOpenMda != null "> and total_cost_open_mda = #{totalCostOpenMda}</if>
+            <if test="muteParms != null  and muteParms != ''"> and mute_parms = #{muteParms}</if>
+            <if test="openParms != null  and openParms != ''"> and open_parms = #{openParms}</if>
         </where>
     </select>
+
+
+
+
     <select id="getListByFieldName" resultType="string">
         select distinct (${fieldName}) as vals from price_info order by ${fieldName}