报价

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

@@ -0,0 +1,140 @@
+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.price.domain.PriceInfo;
+import com.miaxis.price.domain.PriceInfo60hz;
+import com.miaxis.price.dto.PriceInfoDto;
+import com.miaxis.price.service.IPriceInfo60hzService;
+import com.miaxis.price.service.IPriceInfoService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【报价】Controller
+ *
+ * @author miaxis
+ * @date 2023-01-10
+ */
+@RestController
+@RequestMapping("/price/info")
+@Api(tags={"【pc-60hz机组报价】"})
+public class PriceInfo60hzController extends BaseController{
+    @Autowired
+    private IPriceInfo60hzService priceInfo60hzService;
+
+    /**
+     * 查询报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('price: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<PriceInfo60hz> list(@ModelAttribute PriceInfoDto priceInfoTDto){
+        startPage();
+        List<PriceInfo60hz> list = priceInfo60hzService.selectPriceInfo60hzList(priceInfoTDto);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导入报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('price:info:import')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.IMPORT)
+    @PostMapping("/import")
+    @ApiOperation("导入报价列表Excel")
+    public Response<String> importPrice(@RequestPart("file")MultipartFile file) throws Exception {
+        ExcelUtil<PriceInfo60hz> util = new ExcelUtil<PriceInfo60hz>(PriceInfo60hz.class);
+        List<PriceInfo60hz> list = util.importExcel(file.getInputStream(),2,false);
+        priceInfo60hzService.saveBatch(list);
+        return Response.success();
+    }
+
+    /**
+     * 导出报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('price:info:export')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出报价列表Excel")
+    public Response<String> export(@ModelAttribute PriceInfoDto priceInfo){
+        List<PriceInfo60hz> list = priceInfo60hzService.selectPriceInfo60hzList(priceInfo);
+        ExcelUtil<PriceInfo60hz> util = new ExcelUtil<PriceInfo60hz>(PriceInfo60hz.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 查询字段所有枚举值
+     */
+//    @PreAuthorize("@ss.hasPermi('price:info:query')")
+    @GetMapping(value = "/field/{name}")
+    @ApiOperation("查询字段所有枚举值")
+    public Response<List<String>> getFieldName(
+            @ApiParam(name = "name", value = "字段名", required = true)
+            @PathVariable("name") String name
+    ){
+        return Response.success(priceInfo60hzService.getListByFieldName(name));
+    }
+
+    /**
+     * 获取报价详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('price:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取报价详细信息")
+    public Response<PriceInfo60hz> getInfo(
+            @ApiParam(name = "id", value = "报价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(priceInfo60hzService.getById(id));
+    }
+
+    /**
+     * 新增报价
+     */
+//    @PreAuthorize("@ss.hasPermi('price:info:add')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增报价")
+    public Response<Integer> add(@RequestBody PriceInfo60hz priceInfo){
+        return toResponse(priceInfo60hzService.save(priceInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改报价
+     */
+//    @PreAuthorize("@ss.hasPermi('price:info:edit')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改报价")
+    public Response<Integer> edit(@RequestBody PriceInfo60hz priceInfo){
+        return toResponse(priceInfo60hzService.updateById(priceInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除报价
+     */
+//    @PreAuthorize("@ss.hasPermi('price: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(priceInfo60hzService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -25,8 +25,8 @@ import java.util.List;
  * @date 2023-01-10
  */
 @RestController
-@RequestMapping("/price/info")
-@Api(tags={"【pc-报价】"})
+@RequestMapping("/price60hz/info")
+@Api(tags={"【pc-50hz机组报价】"})
 public class PriceInfoController extends BaseController{
     @Autowired
     private IPriceInfoService priceInfoService;

xxgl-service/main/java/com/miaxis/fdj/controller/Fdj60hzInfoController.java

@@ -1,117 +0,0 @@
-package com.miaxis.fdj.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.fdj.domain.Fdj60hzInfo;
-import com.miaxis.fdj.service.IFdj60hzInfoService;
-import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
-
-/**
- * 【发电机60hz报价】Controller
- *
- * @author miaxis
- * @date 2023-02-09
- */
-@RestController
-@RequestMapping("/fdj/info")
-@Api(tags={"【小程序-发电机60hz报价】"})
-public class Fdj60hzInfoController extends BaseController{
-    @Autowired
-    private IFdj60hzInfoService fdj60hzInfoService;
-
-    /**
-     * 查询发电机60hz报价列表
-     */
-    @PreAuthorize("@ss.hasPermi('fdj:info:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询发电机60hz报价列表")
-        @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<Fdj60hzInfo> list(@ModelAttribute Fdj60hzInfo fdj60hzInfo){
-        startPage();
-        List<Fdj60hzInfo> list = fdj60hzInfoService.selectFdj60hzInfoList(fdj60hzInfo);
-        return toResponsePageInfo(list);
-    }
-    
-    /**
-     * 导出发电机60hz报价列表
-     */
-    @PreAuthorize("@ss.hasPermi('fdj:info:export')")
-    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出发电机60hz报价列表Excel")
-    public Response<String> export(@ModelAttribute Fdj60hzInfo fdj60hzInfo){
-        List<Fdj60hzInfo> list = fdj60hzInfoService.selectFdj60hzInfoList(fdj60hzInfo);
-        ExcelUtil<Fdj60hzInfo> util = new ExcelUtil<Fdj60hzInfo>(Fdj60hzInfo.class);
-        return util.exportExcel(list, "info");
-    }
-
-    /**
-     * 获取发电机60hz报价详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('fdj:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取发电机60hz报价详细信息")
-    public Response<Fdj60hzInfo> getInfo(
-            @ApiParam(name = "id", value = "发电机60hz报价参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(fdj60hzInfoService.getById(id));
-    }
-
-    /**
-     * 新增发电机60hz报价
-     */
-    @PreAuthorize("@ss.hasPermi('fdj:info:add')")
-    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增发电机60hz报价")
-    public Response<Integer> add(@RequestBody Fdj60hzInfo fdj60hzInfo){
-        return toResponse(fdj60hzInfoService.save(fdj60hzInfo) ? 1 : 0);
-    }
-
-    /**
-     * 修改发电机60hz报价
-     */
-    @PreAuthorize("@ss.hasPermi('fdj:info:edit')")
-    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改发电机60hz报价")
-    public Response<Integer> edit(@RequestBody Fdj60hzInfo fdj60hzInfo){
-        return toResponse(fdj60hzInfoService.updateById(fdj60hzInfo) ? 1 : 0);
-    }
-
-    /**
-     * 删除发电机60hz报价
-     */
-    @PreAuthorize("@ss.hasPermi('fdj:info:remove')")
-    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除发电机60hz报价")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "发电机60hz报价ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(fdj60hzInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-}

xxgl-service/main/java/com/miaxis/fdj/domain/Fdj60hzInfo.java

@@ -1,220 +0,0 @@
-package com.miaxis.fdj.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;
-/**
- * 发电机60hz报价对象 fdj_60hz_info
- *
- * @author miaxis
- * @date 2023-02-09
- */
-@Data
-@TableName("fdj_60hz_info")
-@ApiModel(value = "Fdj60hzInfo", description = "发电机60hz报价对象 fdj_60hz_info")
-public class Fdj60hzInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 型号规格 */
-    @Excel(name = "型号规格")
-    @TableField("fdj_model")
-    @ApiModelProperty(value = "型号规格")
-    private String fdjModel;
-
-    /** 标准止口 */
-    @Excel(name = "标准止口")
-    @TableField("standard_seam")
-    @ApiModelProperty(value = "标准止口")
-    private String standardSeam;
-
-    /** 频率(Hz) */
-    @Excel(name = "频率(Hz)")
-    @TableField("rate")
-    @ApiModelProperty(value = "频率(Hz)")
-    private Integer rate;
-
-    /** 功率 3-ph/50Hz/380-440V(kw) */
-    @Excel(name = "功率 3-ph/50Hz/380-440V(kw)")
-    @TableField("fdj_power_kw")
-    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kw)")
-    private BigDecimal fdjPowerKw;
-
-    /** 功率 3-ph/50Hz/380-440V(kva) */
-    @Excel(name = "功率 3-ph/50Hz/380-440V(kva)")
-    @TableField("fdj_power_kva")
-    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kva)")
-    private BigDecimal fdjPowerKva;
-
-    /** 含税出厂价（单支点） */
-    @Excel(name = "含税出厂价（单支点）", readConverterExp = "单=支点")
-    @TableField("single_fulcrum_price")
-    @ApiModelProperty(value = "含税出厂价（单支点）")
-    private String singleFulcrumPrice;
-
-    /** 含税出厂价（双支点） */
-    @Excel(name = "含税出厂价（双支点）", readConverterExp = "双=支点")
-    @TableField("double_fulcrum_price")
-    @ApiModelProperty(value = "含税出厂价（双支点）")
-    private String doubleFulcrumPrice;
-
-    /** 含税出厂价（包装箱价格） */
-    @Excel(name = "含税出厂价（包装箱价格）", readConverterExp = "包=装箱价格")
-    @TableField("packing_box_price")
-    @ApiModelProperty(value = "含税出厂价（包装箱价格）")
-    private String packingBoxPrice;
-
-    /** 含税出厂价（仪表箱） */
-    @Excel(name = "含税出厂价（仪表箱）", readConverterExp = "仪=表箱")
-    @TableField("instrument_box_price")
-    @ApiModelProperty(value = "含税出厂价（仪表箱）")
-    private String instrumentBoxPrice;
-
-    /** 含税出厂价（空开） */
-    @Excel(name = "含税出厂价（空开）", readConverterExp = "空=开")
-    @TableField("air_switch_price")
-    @ApiModelProperty(value = "含税出厂价（空开）")
-    private String airSwitchPrice;
-
-    /** 包装尺寸
-（长宽高） */
-    @Excel(name = "包装尺寸
-（长宽高）", readConverterExp = "长=宽高")
-    @TableField("open_parms")
-    @ApiModelProperty(value = "包装尺寸
-（长宽高）")
-    private String openParms;
-
-    /** 净重/毛重（KG） */
-    @Excel(name = "净重/毛重（KG）", readConverterExp = "K=G")
-    @TableField("weight")
-    @ApiModelProperty(value = "净重/毛重（KG）")
-    private String weight;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setFdjModel(String fdjModel){
-        this.fdjModel = fdjModel;
-    }
-
-    public String getFdjModel(){
-        return fdjModel;
-    }
-    public void setStandardSeam(String standardSeam){
-        this.standardSeam = standardSeam;
-    }
-
-    public String getStandardSeam(){
-        return standardSeam;
-    }
-    public void setRate(Integer rate){
-        this.rate = rate;
-    }
-
-    public Integer getRate(){
-        return rate;
-    }
-    public void setFdjPowerKw(BigDecimal fdjPowerKw){
-        this.fdjPowerKw = fdjPowerKw;
-    }
-
-    public BigDecimal getFdjPowerKw(){
-        return fdjPowerKw;
-    }
-    public void setFdjPowerKva(BigDecimal fdjPowerKva){
-        this.fdjPowerKva = fdjPowerKva;
-    }
-
-    public BigDecimal getFdjPowerKva(){
-        return fdjPowerKva;
-    }
-    public void setSingleFulcrumPrice(String singleFulcrumPrice){
-        this.singleFulcrumPrice = singleFulcrumPrice;
-    }
-
-    public String getSingleFulcrumPrice(){
-        return singleFulcrumPrice;
-    }
-    public void setDoubleFulcrumPrice(String doubleFulcrumPrice){
-        this.doubleFulcrumPrice = doubleFulcrumPrice;
-    }
-
-    public String getDoubleFulcrumPrice(){
-        return doubleFulcrumPrice;
-    }
-    public void setPackingBoxPrice(String packingBoxPrice){
-        this.packingBoxPrice = packingBoxPrice;
-    }
-
-    public String getPackingBoxPrice(){
-        return packingBoxPrice;
-    }
-    public void setInstrumentBoxPrice(String instrumentBoxPrice){
-        this.instrumentBoxPrice = instrumentBoxPrice;
-    }
-
-    public String getInstrumentBoxPrice(){
-        return instrumentBoxPrice;
-    }
-    public void setAirSwitchPrice(String airSwitchPrice){
-        this.airSwitchPrice = airSwitchPrice;
-    }
-
-    public String getAirSwitchPrice(){
-        return airSwitchPrice;
-    }
-    public void setOpenParms(String openParms){
-        this.openParms = openParms;
-    }
-
-    public String getOpenParms(){
-        return openParms;
-    }
-    public void setWeight(String weight){
-        this.weight = weight;
-    }
-
-    public String getWeight(){
-        return weight;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fdjModel", getFdjModel())
-            .append("standardSeam", getStandardSeam())
-            .append("rate", getRate())
-            .append("fdjPowerKw", getFdjPowerKw())
-            .append("fdjPowerKva", getFdjPowerKva())
-            .append("singleFulcrumPrice", getSingleFulcrumPrice())
-            .append("doubleFulcrumPrice", getDoubleFulcrumPrice())
-            .append("packingBoxPrice", getPackingBoxPrice())
-            .append("instrumentBoxPrice", getInstrumentBoxPrice())
-            .append("airSwitchPrice", getAirSwitchPrice())
-            .append("openParms", getOpenParms())
-            .append("weight", getWeight())
-            .append("updateTime", getUpdateTime())
-            .append("createTime", getCreateTime())
-            .toString();
-    }
-}

xxgl-service/main/java/com/miaxis/fdj/mapper/Fdj60hzInfoMapper.java

@@ -1,22 +0,0 @@
-package com.miaxis.fdj.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.fdj.domain.Fdj60hzInfo;
-
-/**
- * 发电机60hz报价Mapper接口
- *
- * @author miaxis
- * @date 2023-02-09
- */
-public interface Fdj60hzInfoMapper extends BaseMapper<Fdj60hzInfo> {
-    /**
-     * 查询发电机60hz报价列表
-     *
-     * @param fdj60hzInfo 发电机60hz报价
-     * @return 发电机60hz报价集合
-     */
-    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo);
-
-}

xxgl-service/main/java/com/miaxis/fdj/service/IFdj60hzInfoService.java

@@ -1,21 +0,0 @@
-package com.miaxis.fdj.service;
-
-import java.util.List;
-import com.miaxis.fdj.domain.Fdj60hzInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 发电机60hz报价Service接口
- *
- * @author miaxis
- * @date 2023-02-09
- */
-public interface IFdj60hzInfoService extends IService<Fdj60hzInfo>{
-    /**
-     * 查询发电机60hz报价列表
-     *
-     * @param fdj60hzInfo 发电机60hz报价
-     * @return 发电机60hz报价集合
-     */
-    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo);
-}

xxgl-service/main/java/com/miaxis/fdj/service/impl/Fdj60hzInfoServiceImpl.java

@@ -1,36 +0,0 @@
-package com.miaxis.fdj.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.fdj.mapper.Fdj60hzInfoMapper;
-import com.miaxis.fdj.domain.Fdj60hzInfo;
-import com.miaxis.fdj.service.IFdj60hzInfoService;
-
-/**
- * 发电机60hz报价Service业务层处理
- *
- * @author miaxis
- * @date 2023-02-09
- */
-@Service
-public class Fdj60hzInfoServiceImpl extends ServiceImpl<Fdj60hzInfoMapper, Fdj60hzInfo> implements IFdj60hzInfoService {
-    @Autowired
-    private Fdj60hzInfoMapper fdj60hzInfoMapper;
-
-    /**
-     * 查询发电机60hz报价列表
-     *
-     * @param fdj60hzInfo 发电机60hz报价
-     * @return 发电机60hz报价
-     */
-    @Override
-    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo){
-        return fdj60hzInfoMapper.selectFdj60hzInfoList(fdj60hzInfo);
-    }
-}

xxgl-service/main/resources/mapper/fdj/Fdj60hzInfoMapper.xml

@@ -1,47 +0,0 @@
-<?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.fdj.mapper.Fdj60hzInfoMapper">
-
-    <resultMap type="Fdj60hzInfo" id="Fdj60hzInfoResult">
-        <result property="id"    column="id"    />
-        <result property="fdjModel"    column="fdj_model"    />
-        <result property="standardSeam"    column="standard_seam"    />
-        <result property="rate"    column="rate"    />
-        <result property="fdjPowerKw"    column="fdj_power_kw"    />
-        <result property="fdjPowerKva"    column="fdj_power_kva"    />
-        <result property="singleFulcrumPrice"    column="single_fulcrum_price"    />
-        <result property="doubleFulcrumPrice"    column="double_fulcrum_price"    />
-        <result property="packingBoxPrice"    column="packing_box_price"    />
-        <result property="instrumentBoxPrice"    column="instrument_box_price"    />
-        <result property="airSwitchPrice"    column="air_switch_price"    />
-        <result property="openParms"    column="open_parms"    />
-        <result property="weight"    column="weight"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createTime"    column="create_time"    />
-    </resultMap>
-
-    <sql id="selectFdj60hzInfoVo">
-        select * from fdj_60hz_info
-    </sql>
-
-    <select id="selectFdj60hzInfoList" parameterType="Fdj60hzInfo" resultMap="Fdj60hzInfoResult">
-        <include refid="selectFdj60hzInfoVo"/>
-        <where>
-            <if test="fdjModel != null  and fdjModel != ''"> and fdj_model = #{fdjModel}</if>
-            <if test="standardSeam != null  and standardSeam != ''"> and standard_seam = #{standardSeam}</if>
-            <if test="rate != null "> and rate = #{rate}</if>
-            <if test="fdjPowerKw != null "> and fdj_power_kw = #{fdjPowerKw}</if>
-            <if test="fdjPowerKva != null "> and fdj_power_kva = #{fdjPowerKva}</if>
-            <if test="singleFulcrumPrice != null  and singleFulcrumPrice != ''"> and single_fulcrum_price = #{singleFulcrumPrice}</if>
-            <if test="doubleFulcrumPrice != null  and doubleFulcrumPrice != ''"> and double_fulcrum_price = #{doubleFulcrumPrice}</if>
-            <if test="packingBoxPrice != null  and packingBoxPrice != ''"> and packing_box_price = #{packingBoxPrice}</if>
-            <if test="instrumentBoxPrice != null  and instrumentBoxPrice != ''"> and instrument_box_price = #{instrumentBoxPrice}</if>
-            <if test="airSwitchPrice != null  and airSwitchPrice != ''"> and air_switch_price = #{airSwitchPrice}</if>
-            <if test="openParms != null  and openParms != ''"> and open_parms = #{openParms}</if>
-            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
-        </where>
-    </select>
-
-</mapper>

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

@@ -184,35 +184,6 @@ public class PriceInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "电瓶价格")
     private BigDecimal batteryPrice;
 
-//    /** 合计含税成本(静音配仿斯坦福) */
-//    @Excel(name = "合计含税成本(配仿斯坦福)", sort=27)
-//    @TableField("total_cost_mute_fstf")
-//    @ApiModelProperty(value = "合计含税成本(配仿斯坦福)")
-//    private BigDecimal totalCostMuteFstf;
-//
-//    /** 合计含税成本(开架配仿斯坦福) */
-//    @Excel(name = "合计含税成本(开架配仿斯坦福)", sort=28)
-//    @TableField("total_cost_open_fstf")
-//    @ApiModelProperty(value = "合计含税成本(配仿斯坦福)")
-//    private BigDecimal totalCostOpenFstf;
-//
-//    /** 合计含税成本(静音配斯坦福) */
-//    @Excel(name = "合计含税成本(静音配斯坦福)", sort=29)
-//    @TableField("total_cost_mute_stf")
-//    @ApiModelProperty(value = "合计含税成本(配斯坦福)")
-//    private BigDecimal totalCostMuteStf;
-//
-//    /** 合计含税成本(开架配斯坦福) */
-//    @Excel(name = "合计含税成本(开架配斯坦福)", sort=30)
-//    @TableField("total_cost_open_stf")
-//    @ApiModelProperty(value = "合计含税成本(配斯坦福)")
-//    private BigDecimal totalCostOpenStf;
-//
-//    /** 合计含税成本(静音配利来森马) */
-//    @Excel(name = "合计含税成本(静音配利来森马)", sort=31)
-//    @TableField("total_cost_mute_llsm")
-//    @ApiModelProperty(value = "合计含税成本(配利来森马)")
-//    private BigDecimal totalCostMuteLlsm;
 
     /** 静音尺寸（长/宽/高/重量） */
     @Excel(name = "静音尺寸（长/宽/高/重量）", sort=27)

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

@@ -0,0 +1,206 @@
+package com.miaxis.price.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 java.math.BigDecimal;
+/**
+ * 报价对象 price_info
+ *
+ * @author miaxis
+ * @date 2023-01-10
+ */
+@Data
+@TableName("price_info_60hz")
+@ApiModel(value = "PriceInfo60hz", description = "报价对象 price_info_60hz")
+public class PriceInfo60hz extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 机组型号 */
+    @Excel(name = "机组型号", sort=1)
+    @TableField("unit_model")
+    @ApiModelProperty(value = "机组型号")
+    private String unitModel;
+
+    /** 机组功率(kw) */
+    @Excel(name = "机组功率(kw)", sort=2)
+    @TableField("unit_power_kw")
+    @ApiModelProperty(value = "机组功率(kw)")
+    private BigDecimal unitPowerKw;
+
+    /** 机组功率(kva) */
+    @Excel(name = "机组功率(kva)", sort=3)
+    @TableField("unit_power_kva")
+    @ApiModelProperty(value = "机组功率(kva)")
+    private BigDecimal unitPowerKva;
+
+    /** 机组功率(kw) */
+    @Excel(name = "机组备用功率(kw)", sort=4)
+    @TableField("unit_power_kw_spare")
+    @ApiModelProperty(value = "机组备用功率(kw)")
+    private BigDecimal unitPowerKwSpare;
+
+    /** 机组功率(kva) */
+    @Excel(name = "机组备用功率(kva)", sort=5)
+    @TableField("unit_power_kva_spare")
+    @ApiModelProperty(value = "机组备用功率(kva)")
+    private BigDecimal unitPowerKvaSpare;
+
+
+    /** 频率(Hz) */
+    @Excel(name = "频率(Hz)", sort=6)
+    @TableField("rate")
+    @ApiModelProperty(value = "频率(Hz)")
+    private Integer rate;
+
+    /** 动力品牌 */
+    @Excel(name = "动力品牌", sort=7)
+    @TableField("brand")
+    @ApiModelProperty(value = "动力品牌")
+    private String brand;
+
+    /** 柴油机型号 */
+    @Excel(name = "柴油机型号", sort=8)
+    @TableField("diesel_engine_model")
+    @ApiModelProperty(value = "柴油机型号")
+    private String dieselEngineModel;
+
+    /** 转速 */
+    @Excel(name = "转速", sort=9)
+    @TableField("speed")
+    @ApiModelProperty(value = "转速")
+    private Integer speed;
+
+    /** 动力价格 */
+    @Excel(name = "动力价格", sort=10)
+    @TableField("power_price")
+    @ApiModelProperty(value = "动力价格")
+    private BigDecimal powerPrice;
+
+    /** 发电机型号(仿斯坦福) */
+    @Excel(name = "发电机型号(仿斯坦福)", sort=11)
+    @TableField("generator_model_fstf")
+    @ApiModelProperty(value = "发电机型号(仿斯坦福)")
+    private String generatorModelFstf;
+
+    /** 发电机价格(仿斯坦福) */
+    @Excel(name = "发电机价格(仿斯坦福)", sort=12)
+    @TableField("generator_price_fstf")
+    @ApiModelProperty(value = "发电机价格(仿斯坦福)")
+    private BigDecimal generatorPriceFstf;
+
+    /** 发电机型号(斯坦福) */
+    @Excel(name = "发电机型号(斯坦福)", sort=13)
+    @TableField("generator_model_stf")
+    @ApiModelProperty(value = "发电机型号(斯坦福)")
+    private String generatorModelStf;
+
+    /** 发电机价格(斯坦福) */
+    @Excel(name = "发电机价格(斯坦福)", sort=14)
+    @TableField("generator_price_stf")
+    @ApiModelProperty(value = "发电机价格(斯坦福)")
+    private BigDecimal generatorPriceStf;
+
+    /** 发电机型号(利来森马) */
+    @Excel(name = "发电机型号(利来森马)", sort=15)
+    @TableField("generator_model_llsm")
+    @ApiModelProperty(value = "发电机型号(利来森马)")
+    private String generatorModelLlsm;
+
+    /** 发电机价格(利来森马) */
+    @Excel(name = "发电机价格(利来森马)", sort=16)
+    @TableField("generator_price_llsm")
+    @ApiModelProperty(value = "发电机价格(利来森马)")
+    private BigDecimal generatorPriceLlsm;
+
+    /** 发电机型号(马拉松) */
+    @Excel(name = "发电机型号(马拉松)", sort=17)
+    @TableField("generator_model_mls")
+    @ApiModelProperty(value = "发电机型号(马拉松)")
+    private String generatorModelMls;
+
+    /** 发电机价格(马拉松) */
+    @Excel(name = "发电机价格(马拉松)", sort=18)
+    @TableField("generator_price_mls")
+    @ApiModelProperty(value = "发电机价格(马拉松)")
+    private BigDecimal generatorPriceMls;
+
+    /** 发电机型号(美迪奥) */
+    @Excel(name = "发电机型号(美迪奥)", sort=19)
+    @TableField("generator_model_mda")
+    @ApiModelProperty(value = "发电机型号(美迪奥)")
+    private String generatorModelMda;
+
+    /** 发电机价格(美迪奥) */
+    @Excel(name = "发电机价格(美迪奥)", sort=20)
+    @TableField("generator_price_mda")
+    @ApiModelProperty(value = "发电机价格(美迪奥)")
+    private BigDecimal generatorPriceMda;
+
+    /** 静音机壳价格 */
+    @Excel(name = "静音机壳价格", sort=21)
+    @TableField("mute_price")
+    @ApiModelProperty(value = "静音机壳价格")
+    private BigDecimal mutePrice;
+
+    /** 开架价格 */
+    @Excel(name = "开架价格", sort=22)
+    @TableField("open_price")
+    @ApiModelProperty(value = "开架价格")
+    private BigDecimal openPrice;
+
+    /** ATS型号 */
+    @Excel(name = "ATS型号", sort=23)
+    @TableField("ats_model")
+    @ApiModelProperty(value = "ATS型号")
+    private String atsModel;
+
+    /** ATS价格 */
+    @Excel(name = "ATS价格", sort=24)
+    @TableField("ats_price")
+    @ApiModelProperty(value = "ATS价格")
+    private BigDecimal atsPrice;
+
+    /** 电瓶型号 */
+    @Excel(name = "电瓶型号", sort=25)
+    @TableField("battery_model")
+    @ApiModelProperty(value = "电瓶型号")
+    private String batteryModel;
+
+    /** 电瓶价格 */
+    @Excel(name = "电瓶价格", sort=26)
+    @TableField("battery_price")
+    @ApiModelProperty(value = "电瓶价格")
+    private BigDecimal batteryPrice;
+
+
+    /** 静音尺寸（长/宽/高/重量） */
+    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=27)
+    @TableField("mute_parms")
+    @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
+    private String muteParms;
+
+    /** 静音尺寸（长/宽/高/重量） */
+    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=28)
+    @TableField("open_parms")
+    @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
+    private String openParms;
+
+
+    /** 静音尺寸（长/宽/高/重量） */
+    @Excel(name = "备注", sort=29)
+    @TableField("remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

xxgl-service/src/main/java/com/miaxis/price/mapper/PriceInfo60hzMapper.java

@@ -0,0 +1,25 @@
+package com.miaxis.price.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.price.domain.PriceInfo;
+import com.miaxis.price.domain.PriceInfo60hz;
+import com.miaxis.price.dto.PriceInfoDto;
+
+/**
+ * 报价(60hz)Mapper接口
+ *
+ * @author miaxis
+ * @date 2023-04-25
+ */
+public interface PriceInfo60hzMapper extends BaseMapper<PriceInfo60hz> {
+    /**
+     * 查询报价(60hz)列表
+     *
+     * @return 报价(60hz)集合
+     */
+    public List<PriceInfo60hz> selectPriceInfo60hzList(PriceInfoDto dto);
+
+    List<String> getListByFieldName(String name);
+
+}

xxgl-service/src/main/java/com/miaxis/price/service/IPriceInfo60hzService.java

@@ -0,0 +1,23 @@
+package com.miaxis.price.service;
+
+import java.util.List;
+import com.miaxis.price.domain.PriceInfo60hz;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.price.dto.PriceInfoDto;
+
+/**
+ * 报价(60hz)Service接口
+ *
+ * @author miaxis
+ * @date 2023-04-25
+ */
+public interface IPriceInfo60hzService extends IService<PriceInfo60hz>{
+    /**
+     * 查询报价(60hz)列表
+     *
+     * @return 报价(60hz)集合
+     */
+    public List<PriceInfo60hz> selectPriceInfo60hzList(PriceInfoDto priceInfoDto);
+
+    List<String> getListByFieldName(String name);
+}

xxgl-service/src/main/java/com/miaxis/price/service/impl/PriceInfo60hzServiceImpl.java

@@ -0,0 +1,43 @@
+package com.miaxis.price.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 com.miaxis.price.domain.PriceInfo;
+import com.miaxis.price.dto.PriceInfoDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.price.mapper.PriceInfo60hzMapper;
+import com.miaxis.price.domain.PriceInfo60hz;
+import com.miaxis.price.service.IPriceInfo60hzService;
+
+/**
+ * 报价(60hz)Service业务层处理
+ *
+ * @author miaxis
+ * @date 2023-04-25
+ */
+@Service
+public class PriceInfo60hzServiceImpl extends ServiceImpl<PriceInfo60hzMapper, PriceInfo60hz> implements IPriceInfo60hzService {
+    @Autowired
+    private PriceInfo60hzMapper priceInfo60hzMapper;
+
+    /**
+     * 查询报价(60hz)列表
+     *
+     * @return 报价(60hz)
+     */
+    @Override
+    public List<PriceInfo60hz> selectPriceInfo60hzList(PriceInfoDto dto){
+        return priceInfo60hzMapper.selectPriceInfo60hzList(dto);
+    }
+
+    @Override
+    public List<String> getListByFieldName(String name) {
+
+        return priceInfo60hzMapper.getListByFieldName(name);
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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.price.mapper.PriceInfo60hzMapper">
+
+    <resultMap type="PriceInfo60hz" id="PriceInfo60hzResult">
+        <result property="id"    column="id"    />
+        <result property="unitModel"    column="unit_model"    />
+        <result property="unitPowerKw"    column="unit_power_kw"    />
+        <result property="unitPowerKva"    column="unit_power_kva"    />
+        <result property="unitPowerKwSpare"    column="unit_power_kw_spare"    />
+        <result property="unitPowerKvaSpare"    column="unit_power_kva_spare"    />
+        <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="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="muteParms"    column="mute_parms"    />
+        <result property="openParms"    column="open_parms"    />
+        <result property="remark"    column="remark"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectPriceInfo60hzVo">
+        select * from price_info_60hz
+    </sql>
+
+    <select id="selectPriceInfo60hzList" parameterType="PriceInfo60hz" resultMap="PriceInfo60hzResult">
+        <include refid="selectPriceInfo60hzVo"/>
+        <where>
+            <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="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="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}
+
+    </select>
+
+</mapper>