From ebf80a679ec46dfe0e7ab8372970e351e86b8768 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 17 May 2022 14:47:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HighGasOilPriceController.java | 5 +- .../bweb/controller/HighOrderController.java | 3 + hai-bweb/src/test/common/ExcelTest.java | 50 +- .../com/hai/dao/HighGasOilPriceMapper.java | 28 +- .../dao/HighGasOilPriceOfficialMapper.java | 125 ++ .../dao/HighGasOilPriceOfficialMapperExt.java | 7 + .../HighGasOilPriceOfficialSqlProvider.java | 332 ++++++ .../hai/dao/HighGasOilPriceSqlProvider.java | 14 + .../java/com/hai/entity/HighGasOilPrice.java | 16 + .../hai/entity/HighGasOilPriceExample.java | 60 + .../hai/entity/HighGasOilPriceOfficial.java | 232 ++++ .../HighGasOilPriceOfficialExample.java | 1003 +++++++++++++++++ .../java/com/hai/service/CommonService.java | 7 + .../HighGasOilPriceOfficialService.java | 32 + .../hai/service/impl/CommonServiceImpl.java | 10 + .../HighGasDiscountOilPriceServiceImpl.java | 4 +- .../impl/HighGasOilGunNoServiceImpl.java | 2 +- .../HighGasOilPriceOfficialServiceImpl.java | 106 ++ 18 files changed, 2016 insertions(+), 20 deletions(-) create mode 100644 hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapper.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapperExt.java create mode 100644 hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialSqlProvider.java create mode 100644 hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficial.java create mode 100644 hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficialExample.java create mode 100644 hai-service/src/main/java/com/hai/service/HighGasOilPriceOfficialService.java create mode 100644 hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceOfficialServiceImpl.java diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasOilPriceController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasOilPriceController.java index 5dcd3704..fb000583 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighGasOilPriceController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasOilPriceController.java @@ -56,7 +56,7 @@ public class HighGasOilPriceController { if (body.getLong("storeId") == null || StringUtils.isBlank(body.getString("oilNo")) || body.getBigDecimal("priceGun") == null - || body.getBigDecimal("priceVip") == null + || body.getBigDecimal("preferentialMargin") == null ) { log.error("HighGasDiscountOilPriceController -> editGasOilPrice() error!",""); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); @@ -85,7 +85,8 @@ public class HighGasOilPriceController { price.setMerchantStoreId(body.getLong("storeId")); price.setOilNo(Integer.parseInt(oilNo.getCodeValue())); price.setOilNoName(oilNo.getCodeName()); - price.setPriceVip(body.getBigDecimal("priceVip")); + price.setPriceVip(body.getBigDecimal("priceGun").subtract(body.getBigDecimal("preferentialMargin"))); + price.setPreferentialMargin(body.getBigDecimal("preferentialMargin")); price.setPriceGun(body.getBigDecimal("priceGun")); price.setPriceOfficial(new BigDecimal("8")); price.setOilType(Integer.parseInt(oilNo.getExt1())); diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java index 3db7ae49..87af02e9 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java @@ -202,6 +202,9 @@ public class HighOrderController { } else if (userInfoModel.getSecUser().getObjectType() == 2) { map.put("merchantId", userInfoModel.getMerchant().getId()); + + } else if (userInfoModel.getSecUser().getObjectType() == 3) { + map.put("merchantId", userInfoModel.getMerchant().getId()); } map.put("orderNo", orderNo); diff --git a/hai-bweb/src/test/common/ExcelTest.java b/hai-bweb/src/test/common/ExcelTest.java index d38b9892..1cb76985 100644 --- a/hai-bweb/src/test/common/ExcelTest.java +++ b/hai-bweb/src/test/common/ExcelTest.java @@ -3,15 +3,22 @@ package common; import com.BWebApplication; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.hai.entity.SecRegion; +import com.hai.service.CommonService; +import com.hai.service.HighGasOilPriceOfficialService; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; +import javax.annotation.Resource; import java.io.FileOutputStream; import java.io.OutputStreamWriter; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -27,14 +34,53 @@ import java.util.Map; @WebAppConfiguration public class ExcelTest { + @Resource + private HighGasOilPriceOfficialService gasOilPriceOfficialService; + + @Resource + private CommonService commonService; @Test public void test(){ try { + gasOilPriceOfficialService.refreshPriceOfficial(); +/* + String dataStr = "{\"showapi_res_error\":\"\",\"showapi_res_id\":\"62831ba20de376a006cb8421\",\"showapi_res_code\":0,\"showapi_fee_num\":1,\"showapi_res_body\":{\"ret_code\":0,\"list\":[{\"p0\":\"8.38\",\"p89\":\"8.06\",\"ct\":\"2022-05-17 07:00:00.263\",\"p90\":\"\",\"p92\":\"8.67\",\"p93\":\"\",\"prov\":\"山东\",\"p95\":\"9.30\",\"p98\":\"10.02\",\"p97\":\"\"},{\"p0\":\"8.91\",\"p89\":\"9.02\",\"ct\":\"2022-05-17 07:00:00.270\",\"p90\":\"\",\"p92\":\"9.56\",\"p93\":\"\",\"prov\":\"西藏\",\"p95\":\"10.11\",\"p98\":\"11.27\",\"p97\":\"\"},{\"p0\":\"8.36\",\"p89\":\"8.07\",\"ct\":\"2022-05-17 07:00:00.242\",\"p90\":\"\",\"p92\":\"8.65\",\"p93\":\"\",\"prov\":\"上海\",\"p95\":\"9.21\",\"p98\":\"10.21\",\"p97\":\"\"},{\"p0\":\"8.37\",\"p89\":\"8.05\",\"ct\":\"2022-05-17 07:00:00.259\",\"p90\":\"\",\"p92\":\"8.65\",\"p93\":\"\",\"prov\":\"福建\",\"p95\":\"9.23\",\"p98\":\"10.11\",\"p97\":\"\"},{\"p0\":\"8.29\",\"p89\":\"0\",\"ct\":\"2022-05-17 07:00:00.300\",\"p90\":\"\",\"p92\":\"8.65\",\"p93\":\"\",\"prov\":\"吉林\",\"p95\":\"9.33\",\"p98\":\"10.17\",\"p97\":\"\"},{\"p0\":\"8.46\",\"p89\":\"8.08\",\"ct\":\"2022-05-17 07:00:00.265\",\"p90\":\"\",\"p92\":\"8.63\",\"p93\":\"\",\"prov\":\"山西\",\"p95\":\"9.32\",\"p98\":\"10.02\",\"p97\":\"\"},{\"p0\":\"8.27\",\"p89\":\"8.03\",\"ct\":\"2022-05-17 07:00:00.260\",\"p90\":\"\",\"p92\":\"8.69\",\"p93\":\"\",\"prov\":\"甘肃\",\"p95\":\"9.28\",\"p98\":\"9.85\",\"p97\":\"\"},{\"p0\":\"8.25\",\"p89\":\"8.1\",\"ct\":\"2022-05-17 07:00:00.259\",\"p90\":\"\",\"p92\":\"8.58\",\"p93\":\"\",\"prov\":\"宁夏\",\"p95\":\"9.07\",\"p98\":\"10.33\",\"p97\":\"\"},{\"p0\":\"8.41\",\"p89\":\"8.15\",\"ct\":\"2022-05-17 07:00:00.269\",\"p90\":\"\",\"p92\":\"8.78\",\"p93\":\"\",\"prov\":\"四川\",\"p95\":\"9.38\",\"p98\":\"10.20\",\"p97\":\"\"},{\"p0\":\"8.39\",\"p89\":\"8.05\",\"ct\":\"2022-05-17 07:00:00.269\",\"p90\":\"\",\"p92\":\"8.69\",\"p93\":\"\",\"prov\":\"河北\",\"p95\":\"9.18\",\"p98\":\"10.01\",\"p97\":\"\"},{\"p0\":\"8.37\",\"p89\":\"0\",\"ct\":\"2022-05-17 07:00:00.270\",\"p90\":\"\",\"p92\":\"8.70\",\"p93\":\"\",\"prov\":\"河南\",\"p95\":\"9.29\",\"p98\":\"9.94\",\"p97\":\"\"},{\"p0\":\"8.36\",\"p89\":\"8.03\",\"ct\":\"2022-05-17 07:00:00.307\",\"p90\":\"\",\"p92\":\"8.66\",\"p93\":\"\",\"prov\":\"浙江\",\"p95\":\"9.21\",\"p98\":\"10.09\",\"p97\":\"\"},{\"p0\":\"8.43\",\"p89\":\"8.14\",\"ct\":\"2022-05-17 07:00:00.264\",\"p90\":\"\",\"p92\":\"8.75\",\"p93\":\"\",\"prov\":\"广西\",\"p95\":\"9.45\",\"p98\":\"10.50\",\"p97\":\"\"},{\"p0\":\"8.44\",\"p89\":\"8.27\",\"ct\":\"2022-05-17 07:00:00.250\",\"p90\":\"\",\"p92\":\"8.74\",\"p93\":\"\",\"prov\":\"重庆\",\"p95\":\"9.24\",\"p98\":\"10.41\",\"p97\":\"\"},{\"p0\":\"8.37\",\"p89\":\"0\",\"ct\":\"2022-05-17 07:00:00.306\",\"p90\":\"\",\"p92\":\"8.70\",\"p93\":\"\",\"prov\":\"湖北\",\"p95\":\"9.32\",\"p98\":\"10.22\",\"p97\":\"\"},{\"p0\":\"8.45\",\"p89\":\"8.08867362\",\"ct\":\"2022-05-17 07:00:00.308\",\"p90\":\"\",\"p92\":\"8.63\",\"p93\":\"\",\"prov\":\"湖南\",\"p95\":\"9.18\",\"p98\":\"9.98\",\"p97\":\"\"},{\"p0\":\"8.47\",\"p89\":\"9.03\",\"ct\":\"2022-05-17 07:00:00.268\",\"p90\":\"\",\"p92\":\"9.80\",\"p93\":\"\",\"prov\":\"海南\",\"p95\":\"10.42\",\"p98\":\"11.81\",\"p97\":\"\"},{\"p0\":\"8.43\",\"p89\":\"8.04\",\"ct\":\"2022-05-17 07:00:00.250\",\"p90\":\"\",\"p92\":\"8.64\",\"p93\":\"\",\"prov\":\"江西\",\"p95\":\"9.28\",\"p98\":\"10.78\",\"p97\":\"\"},{\"p0\":\"8.44\",\"p89\":\"8.14\",\"ct\":\"2022-05-17 07:00:00.304\",\"p90\":\"\",\"p92\":\"8.84\",\"p93\":\"\",\"prov\":\"云南\",\"p95\":\"9.49\",\"p98\":\"10.17\",\"p97\":\"\"},{\"p0\":\"8.16\",\"p89\":\"5.7\",\"ct\":\"2022-05-17 07:00:00.290\",\"p90\":\"\",\"p92\":\"8.65\",\"p93\":\"\",\"prov\":\"黑龙江\",\"p95\":\"9.27\",\"p98\":\"10.51\",\"p97\":\"\"},{\"p0\":\"8.24\",\"p89\":\"0\",\"ct\":\"2022-05-17 07:00:00.258\",\"p90\":\"\",\"p92\":\"8.62\",\"p93\":\"\",\"prov\":\"内蒙古\",\"p95\":\"9.20\",\"p98\":\"10.09\",\"p97\":\"\"},{\"p0\":\"8.28\",\"p89\":\"0\",\"ct\":\"2022-05-17 07:00:00.257\",\"p90\":\"\",\"p92\":\"8.67\",\"p93\":\"\",\"prov\":\"辽宁\",\"p95\":\"9.25\",\"p98\":\"10.07\",\"p97\":\"\"},{\"p0\":\"8.38\",\"p89\":\"8.09\",\"ct\":\"2022-05-17 07:00:00.263\",\"p90\":\"\",\"p92\":\"8.71\",\"p93\":\"\",\"prov\":\"广东\",\"p95\":\"9.43\",\"p98\":\"10.57\",\"p97\":\"\"},{\"p0\":\"8.29\",\"p89\":\"8.12\",\"ct\":\"2022-05-17 07:00:00.262\",\"p90\":\"\",\"p92\":\"8.65\",\"p93\":\"\",\"prov\":\"青海\",\"p95\":\"9.27\",\"p98\":\"10.10\",\"p97\":\"\"},{\"p0\":\"8.39\",\"p89\":\"8.05\",\"ct\":\"2022-05-17 07:00:00.249\",\"p90\":\"\",\"p92\":\"8.69\",\"p93\":\"\",\"prov\":\"天津\",\"p95\":\"9.18\",\"p98\":\"10.49\",\"p97\":\"\"},{\"p0\":\"8.48\",\"p89\":\"8.32\",\"ct\":\"2022-05-17 07:00:00.266\",\"p90\":\"\",\"p92\":\"8.82\",\"p93\":\"\",\"prov\":\"贵州\",\"p95\":\"9.32\",\"p98\":\"10.22\",\"p97\":\"\"},{\"p0\":\"8.26\",\"p89\":\"8.08\",\"ct\":\"2022-05-17 07:00:00.267\",\"p90\":\"\",\"p92\":\"8.57\",\"p93\":\"\",\"prov\":\"陕西\",\"p95\":\"9.05\",\"p98\":\"10.11\",\"p97\":\"\"},{\"p0\":\"8.17\",\"p89\":\"0\",\"ct\":\"2022-05-17 07:00:00.285\",\"p90\":\"\",\"p92\":\"8.48\",\"p93\":\"\",\"prov\":\"新疆\",\"p95\":\"9.11\",\"p98\":\"10.24\",\"p97\":\"\"},{\"p0\":\"8.34\",\"p89\":\"8.11\",\"ct\":\"2022-05-17 07:00:00.249\",\"p90\":\"\",\"p92\":\"8.66\",\"p93\":\"\",\"prov\":\"江苏\",\"p95\":\"9.21\",\"p98\":\"9.89\",\"p97\":\"\"},{\"p0\":\"8.43\",\"p89\":\"8.14\",\"ct\":\"2022-05-17 07:00:00.235\",\"p90\":\"\",\"p92\":\"8.69\",\"p93\":\"\",\"prov\":\"北京\",\"p95\":\"9.25\",\"p98\":\"10.23\",\"p97\":\"\"},{\"p0\":\"8.42\",\"p89\":\"8.1\",\"ct\":\"2022-05-17 07:00:00.257\",\"p90\":\"\",\"p92\":\"8.63\",\"p93\":\"\",\"prov\":\"安徽\",\"p95\":\"9.23\",\"p98\":\"10.06\",\"p97\":\"\"}]}}"; + + JSONObject dataObject = JSONObject.parseObject(dataStr); + if (dataObject.getInteger("showapi_res_code").equals(0)) { + JSONObject resBody = dataObject.getJSONObject("showapi_res_body"); + + JSONArray oilArray = resBody.getJSONArray("list"); + for (Object oil : oilArray) { + JSONObject oilObject = (JSONObject) oil; + System.out.println(); + + SecRegion region = commonService.getRegionsByName(oilObject.getString("prov")); + if (region != null) { + BigDecimal oilNo92 = oilObject.getBigDecimal("p92"); + if (oilNo92 != null) { + gasOilPriceOfficialService.editPrice(region.getRegionId(), 92, oilNo92); + } + + BigDecimal oilNo95 = oilObject.getBigDecimal("p95"); + if (oilNo95 != null) { + gasOilPriceOfficialService.editPrice(region.getRegionId(), 95, oilNo95); + } + + BigDecimal oilNo98 = oilObject.getBigDecimal("p98"); + if (oilNo98 != null) { + gasOilPriceOfficialService.editPrice(region.getRegionId(), 98, oilNo98); + } - List list = new ArrayList<>(); - EasyExcel.read("F:\\卡券列表记录.xlsx", ExcelModel.class, new DemoDataListener()).sheet().doRead(); + BigDecimal oilNo0 = oilObject.getBigDecimal("p0"); + if (oilNo0 != null) { + gasOilPriceOfficialService.editPrice(region.getRegionId(), 0, oilNo0); + } + } + } + }*/ }catch (Exception e){ e.printStackTrace(); diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java index c466a009..482c4dd4 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapper.java @@ -40,17 +40,17 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt { @Insert({ "insert into high_gas_oil_price (merchant_store_id, oil_no, ", - "oil_no_name, price_vip, ", - "price_gun, price_official, ", - "oil_type, oil_type_name, ", - "`status`, ext_1, ext_2, ", - "ext_3)", + "oil_no_name, preferential_margin, ", + "price_vip, price_gun, ", + "price_official, oil_type, ", + "oil_type_name, `status`, ", + "ext_1, ext_2, ext_3)", "values (#{merchantStoreId,jdbcType=BIGINT}, #{oilNo,jdbcType=INTEGER}, ", - "#{oilNoName,jdbcType=VARCHAR}, #{priceVip,jdbcType=DECIMAL}, ", - "#{priceGun,jdbcType=DECIMAL}, #{priceOfficial,jdbcType=DECIMAL}, ", - "#{oilType,jdbcType=INTEGER}, #{oilTypeName,jdbcType=VARCHAR}, ", - "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{oilNoName,jdbcType=VARCHAR}, #{preferentialMargin,jdbcType=DECIMAL}, ", + "#{priceVip,jdbcType=DECIMAL}, #{priceGun,jdbcType=DECIMAL}, ", + "#{priceOfficial,jdbcType=DECIMAL}, #{oilType,jdbcType=INTEGER}, ", + "#{oilTypeName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighGasOilPrice record); @@ -65,6 +65,7 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt { @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT), @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.INTEGER), @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="preferential_margin", property="preferentialMargin", jdbcType=JdbcType.DECIMAL), @Result(column="price_vip", property="priceVip", jdbcType=JdbcType.DECIMAL), @Result(column="price_gun", property="priceGun", jdbcType=JdbcType.DECIMAL), @Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL), @@ -79,8 +80,9 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt { @Select({ "select", - "id, merchant_store_id, oil_no, oil_no_name, price_vip, price_gun, price_official, ", - "oil_type, oil_type_name, `status`, ext_1, ext_2, ext_3", + "id, merchant_store_id, oil_no, oil_no_name, preferential_margin, price_vip, ", + "price_gun, price_official, oil_type, oil_type_name, `status`, ext_1, ext_2, ", + "ext_3", "from high_gas_oil_price", "where id = #{id,jdbcType=BIGINT}" }) @@ -89,6 +91,7 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt { @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT), @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.INTEGER), @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="preferential_margin", property="preferentialMargin", jdbcType=JdbcType.DECIMAL), @Result(column="price_vip", property="priceVip", jdbcType=JdbcType.DECIMAL), @Result(column="price_gun", property="priceGun", jdbcType=JdbcType.DECIMAL), @Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL), @@ -115,6 +118,7 @@ public interface HighGasOilPriceMapper extends HighGasOilPriceMapperExt { "set merchant_store_id = #{merchantStoreId,jdbcType=BIGINT},", "oil_no = #{oilNo,jdbcType=INTEGER},", "oil_no_name = #{oilNoName,jdbcType=VARCHAR},", + "preferential_margin = #{preferentialMargin,jdbcType=DECIMAL},", "price_vip = #{priceVip,jdbcType=DECIMAL},", "price_gun = #{priceGun,jdbcType=DECIMAL},", "price_official = #{priceOfficial,jdbcType=DECIMAL},", diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapper.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapper.java new file mode 100644 index 00000000..1b20316f --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapper.java @@ -0,0 +1,125 @@ +package com.hai.dao; + +import com.hai.entity.HighGasOilPriceOfficial; +import com.hai.entity.HighGasOilPriceOfficialExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface HighGasOilPriceOfficialMapper extends HighGasOilPriceOfficialMapperExt { + @SelectProvider(type=HighGasOilPriceOfficialSqlProvider.class, method="countByExample") + long countByExample(HighGasOilPriceOfficialExample example); + + @DeleteProvider(type=HighGasOilPriceOfficialSqlProvider.class, method="deleteByExample") + int deleteByExample(HighGasOilPriceOfficialExample example); + + @Delete({ + "delete from high_gas_oil_price_official", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_gas_oil_price_official (region_id, region_name, ", + "oil_no, oil_no_name, ", + "price_official, oil_type, ", + "oil_type_name, `status`, ", + "ext_1, ext_2, ext_3)", + "values (#{regionId,jdbcType=BIGINT}, #{regionName,jdbcType=VARCHAR}, ", + "#{oilNo,jdbcType=INTEGER}, #{oilNoName,jdbcType=VARCHAR}, ", + "#{priceOfficial,jdbcType=DECIMAL}, #{oilType,jdbcType=INTEGER}, ", + "#{oilTypeName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(HighGasOilPriceOfficial record); + + @InsertProvider(type=HighGasOilPriceOfficialSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighGasOilPriceOfficial record); + + @SelectProvider(type=HighGasOilPriceOfficialSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="region_id", property="regionId", jdbcType=JdbcType.BIGINT), + @Result(column="region_name", property="regionName", jdbcType=JdbcType.VARCHAR), + @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.INTEGER), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL), + @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER), + @Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(HighGasOilPriceOfficialExample example); + + @Select({ + "select", + "id, region_id, region_name, oil_no, oil_no_name, price_official, oil_type, oil_type_name, ", + "`status`, ext_1, ext_2, ext_3", + "from high_gas_oil_price_official", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="region_id", property="regionId", jdbcType=JdbcType.BIGINT), + @Result(column="region_name", property="regionName", jdbcType=JdbcType.VARCHAR), + @Result(column="oil_no", property="oilNo", jdbcType=JdbcType.INTEGER), + @Result(column="oil_no_name", property="oilNoName", jdbcType=JdbcType.VARCHAR), + @Result(column="price_official", property="priceOfficial", jdbcType=JdbcType.DECIMAL), + @Result(column="oil_type", property="oilType", jdbcType=JdbcType.INTEGER), + @Result(column="oil_type_name", property="oilTypeName", jdbcType=JdbcType.VARCHAR), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + HighGasOilPriceOfficial selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighGasOilPriceOfficialSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighGasOilPriceOfficial record, @Param("example") HighGasOilPriceOfficialExample example); + + @UpdateProvider(type=HighGasOilPriceOfficialSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighGasOilPriceOfficial record, @Param("example") HighGasOilPriceOfficialExample example); + + @UpdateProvider(type=HighGasOilPriceOfficialSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighGasOilPriceOfficial record); + + @Update({ + "update high_gas_oil_price_official", + "set region_id = #{regionId,jdbcType=BIGINT},", + "region_name = #{regionName,jdbcType=VARCHAR},", + "oil_no = #{oilNo,jdbcType=INTEGER},", + "oil_no_name = #{oilNoName,jdbcType=VARCHAR},", + "price_official = #{priceOfficial,jdbcType=DECIMAL},", + "oil_type = #{oilType,jdbcType=INTEGER},", + "oil_type_name = #{oilTypeName,jdbcType=VARCHAR},", + "`status` = #{status,jdbcType=INTEGER},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(HighGasOilPriceOfficial record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapperExt.java new file mode 100644 index 00000000..a625ff03 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface HighGasOilPriceOfficialMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialSqlProvider.java new file mode 100644 index 00000000..540fa423 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceOfficialSqlProvider.java @@ -0,0 +1,332 @@ +package com.hai.dao; + +import com.hai.entity.HighGasOilPriceOfficial; +import com.hai.entity.HighGasOilPriceOfficialExample.Criteria; +import com.hai.entity.HighGasOilPriceOfficialExample.Criterion; +import com.hai.entity.HighGasOilPriceOfficialExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighGasOilPriceOfficialSqlProvider { + + public String countByExample(HighGasOilPriceOfficialExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_gas_oil_price_official"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighGasOilPriceOfficialExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_gas_oil_price_official"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighGasOilPriceOfficial record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_gas_oil_price_official"); + + if (record.getRegionId() != null) { + sql.VALUES("region_id", "#{regionId,jdbcType=BIGINT}"); + } + + if (record.getRegionName() != null) { + sql.VALUES("region_name", "#{regionName,jdbcType=VARCHAR}"); + } + + if (record.getOilNo() != null) { + sql.VALUES("oil_no", "#{oilNo,jdbcType=INTEGER}"); + } + + if (record.getOilNoName() != null) { + sql.VALUES("oil_no_name", "#{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceOfficial() != null) { + sql.VALUES("price_official", "#{priceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getOilType() != null) { + sql.VALUES("oil_type", "#{oilType,jdbcType=INTEGER}"); + } + + if (record.getOilTypeName() != null) { + sql.VALUES("oil_type_name", "#{oilTypeName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(HighGasOilPriceOfficialExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("region_id"); + sql.SELECT("region_name"); + sql.SELECT("oil_no"); + sql.SELECT("oil_no_name"); + sql.SELECT("price_official"); + sql.SELECT("oil_type"); + sql.SELECT("oil_type_name"); + sql.SELECT("`status`"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("high_gas_oil_price_official"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + HighGasOilPriceOfficial record = (HighGasOilPriceOfficial) parameter.get("record"); + HighGasOilPriceOfficialExample example = (HighGasOilPriceOfficialExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_gas_oil_price_official"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getRegionId() != null) { + sql.SET("region_id = #{record.regionId,jdbcType=BIGINT}"); + } + + if (record.getRegionName() != null) { + sql.SET("region_name = #{record.regionName,jdbcType=VARCHAR}"); + } + + if (record.getOilNo() != null) { + sql.SET("oil_no = #{record.oilNo,jdbcType=INTEGER}"); + } + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceOfficial() != null) { + sql.SET("price_official = #{record.priceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getOilType() != null) { + sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}"); + } + + if (record.getOilTypeName() != null) { + sql.SET("oil_type_name = #{record.oilTypeName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_oil_price_official"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("region_id = #{record.regionId,jdbcType=BIGINT}"); + sql.SET("region_name = #{record.regionName,jdbcType=VARCHAR}"); + sql.SET("oil_no = #{record.oilNo,jdbcType=INTEGER}"); + sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + sql.SET("price_official = #{record.priceOfficial,jdbcType=DECIMAL}"); + sql.SET("oil_type = #{record.oilType,jdbcType=INTEGER}"); + sql.SET("oil_type_name = #{record.oilTypeName,jdbcType=VARCHAR}"); + sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + HighGasOilPriceOfficialExample example = (HighGasOilPriceOfficialExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighGasOilPriceOfficial record) { + SQL sql = new SQL(); + sql.UPDATE("high_gas_oil_price_official"); + + if (record.getRegionId() != null) { + sql.SET("region_id = #{regionId,jdbcType=BIGINT}"); + } + + if (record.getRegionName() != null) { + sql.SET("region_name = #{regionName,jdbcType=VARCHAR}"); + } + + if (record.getOilNo() != null) { + sql.SET("oil_no = #{oilNo,jdbcType=INTEGER}"); + } + + if (record.getOilNoName() != null) { + sql.SET("oil_no_name = #{oilNoName,jdbcType=VARCHAR}"); + } + + if (record.getPriceOfficial() != null) { + sql.SET("price_official = #{priceOfficial,jdbcType=DECIMAL}"); + } + + if (record.getOilType() != null) { + sql.SET("oil_type = #{oilType,jdbcType=INTEGER}"); + } + + if (record.getOilTypeName() != null) { + sql.SET("oil_type_name = #{oilTypeName,jdbcType=VARCHAR}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, HighGasOilPriceOfficialExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java index 0a028dea..8287ae2e 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighGasOilPriceSqlProvider.java @@ -40,6 +40,10 @@ public class HighGasOilPriceSqlProvider { sql.VALUES("oil_no_name", "#{oilNoName,jdbcType=VARCHAR}"); } + if (record.getPreferentialMargin() != null) { + sql.VALUES("preferential_margin", "#{preferentialMargin,jdbcType=DECIMAL}"); + } + if (record.getPriceVip() != null) { sql.VALUES("price_vip", "#{priceVip,jdbcType=DECIMAL}"); } @@ -89,6 +93,7 @@ public class HighGasOilPriceSqlProvider { sql.SELECT("merchant_store_id"); sql.SELECT("oil_no"); sql.SELECT("oil_no_name"); + sql.SELECT("preferential_margin"); sql.SELECT("price_vip"); sql.SELECT("price_gun"); sql.SELECT("price_official"); @@ -131,6 +136,10 @@ public class HighGasOilPriceSqlProvider { sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); } + if (record.getPreferentialMargin() != null) { + sql.SET("preferential_margin = #{record.preferentialMargin,jdbcType=DECIMAL}"); + } + if (record.getPriceVip() != null) { sql.SET("price_vip = #{record.priceVip,jdbcType=DECIMAL}"); } @@ -179,6 +188,7 @@ public class HighGasOilPriceSqlProvider { sql.SET("merchant_store_id = #{record.merchantStoreId,jdbcType=BIGINT}"); sql.SET("oil_no = #{record.oilNo,jdbcType=INTEGER}"); sql.SET("oil_no_name = #{record.oilNoName,jdbcType=VARCHAR}"); + sql.SET("preferential_margin = #{record.preferentialMargin,jdbcType=DECIMAL}"); sql.SET("price_vip = #{record.priceVip,jdbcType=DECIMAL}"); sql.SET("price_gun = #{record.priceGun,jdbcType=DECIMAL}"); sql.SET("price_official = #{record.priceOfficial,jdbcType=DECIMAL}"); @@ -210,6 +220,10 @@ public class HighGasOilPriceSqlProvider { sql.SET("oil_no_name = #{oilNoName,jdbcType=VARCHAR}"); } + if (record.getPreferentialMargin() != null) { + sql.SET("preferential_margin = #{preferentialMargin,jdbcType=DECIMAL}"); + } + if (record.getPriceVip() != null) { sql.SET("price_vip = #{priceVip,jdbcType=DECIMAL}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java b/hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java index cc422ef4..94f7c58c 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java +++ b/hai-service/src/main/java/com/hai/entity/HighGasOilPrice.java @@ -33,6 +33,11 @@ public class HighGasOilPrice implements Serializable { */ private String oilNoName; + /** + * 优惠幅度 + */ + private BigDecimal preferentialMargin; + /** * 优惠价 */ @@ -103,6 +108,14 @@ public class HighGasOilPrice implements Serializable { this.oilNoName = oilNoName; } + public BigDecimal getPreferentialMargin() { + return preferentialMargin; + } + + public void setPreferentialMargin(BigDecimal preferentialMargin) { + this.preferentialMargin = preferentialMargin; + } + public BigDecimal getPriceVip() { return priceVip; } @@ -191,6 +204,7 @@ public class HighGasOilPrice implements Serializable { && (this.getMerchantStoreId() == null ? other.getMerchantStoreId() == null : this.getMerchantStoreId().equals(other.getMerchantStoreId())) && (this.getOilNo() == null ? other.getOilNo() == null : this.getOilNo().equals(other.getOilNo())) && (this.getOilNoName() == null ? other.getOilNoName() == null : this.getOilNoName().equals(other.getOilNoName())) + && (this.getPreferentialMargin() == null ? other.getPreferentialMargin() == null : this.getPreferentialMargin().equals(other.getPreferentialMargin())) && (this.getPriceVip() == null ? other.getPriceVip() == null : this.getPriceVip().equals(other.getPriceVip())) && (this.getPriceGun() == null ? other.getPriceGun() == null : this.getPriceGun().equals(other.getPriceGun())) && (this.getPriceOfficial() == null ? other.getPriceOfficial() == null : this.getPriceOfficial().equals(other.getPriceOfficial())) @@ -210,6 +224,7 @@ public class HighGasOilPrice implements Serializable { result = prime * result + ((getMerchantStoreId() == null) ? 0 : getMerchantStoreId().hashCode()); result = prime * result + ((getOilNo() == null) ? 0 : getOilNo().hashCode()); result = prime * result + ((getOilNoName() == null) ? 0 : getOilNoName().hashCode()); + result = prime * result + ((getPreferentialMargin() == null) ? 0 : getPreferentialMargin().hashCode()); result = prime * result + ((getPriceVip() == null) ? 0 : getPriceVip().hashCode()); result = prime * result + ((getPriceGun() == null) ? 0 : getPriceGun().hashCode()); result = prime * result + ((getPriceOfficial() == null) ? 0 : getPriceOfficial().hashCode()); @@ -232,6 +247,7 @@ public class HighGasOilPrice implements Serializable { sb.append(", merchantStoreId=").append(merchantStoreId); sb.append(", oilNo=").append(oilNo); sb.append(", oilNoName=").append(oilNoName); + sb.append(", preferentialMargin=").append(preferentialMargin); sb.append(", priceVip=").append(priceVip); sb.append(", priceGun=").append(priceGun); sb.append(", priceOfficial=").append(priceOfficial); diff --git a/hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java index 1212ee50..82cf93ae 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceExample.java @@ -375,6 +375,66 @@ public class HighGasOilPriceExample { return (Criteria) this; } + public Criteria andPreferentialMarginIsNull() { + addCriterion("preferential_margin is null"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginIsNotNull() { + addCriterion("preferential_margin is not null"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginEqualTo(BigDecimal value) { + addCriterion("preferential_margin =", value, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginNotEqualTo(BigDecimal value) { + addCriterion("preferential_margin <>", value, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginGreaterThan(BigDecimal value) { + addCriterion("preferential_margin >", value, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("preferential_margin >=", value, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginLessThan(BigDecimal value) { + addCriterion("preferential_margin <", value, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginLessThanOrEqualTo(BigDecimal value) { + addCriterion("preferential_margin <=", value, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginIn(List values) { + addCriterion("preferential_margin in", values, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginNotIn(List values) { + addCriterion("preferential_margin not in", values, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("preferential_margin between", value1, value2, "preferentialMargin"); + return (Criteria) this; + } + + public Criteria andPreferentialMarginNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("preferential_margin not between", value1, value2, "preferentialMargin"); + return (Criteria) this; + } + public Criteria andPriceVipIsNull() { addCriterion("price_vip is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficial.java b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficial.java new file mode 100644 index 00000000..9354ddac --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficial.java @@ -0,0 +1,232 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * high_gas_oil_price_official + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighGasOilPriceOfficial implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 区域id + */ + private Long regionId; + + /** + * 区域名称 + */ + private String regionName; + + /** + * 油号 + */ + private Integer oilNo; + + /** + * 油品名称 + */ + private String oilNoName; + + /** + * 官方指导价【国标价】 + */ + private BigDecimal priceOfficial; + + /** + * 油品类型 1:汽油:2:柴油;3:天然气 + */ + private Integer oilType; + + /** + * 燃油类型名 1:汽油:2:柴油;3:天然气 + */ + private String oilTypeName; + + /** + * 状态 0:删除 1:正常 + */ + private Integer status; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getRegionId() { + return regionId; + } + + public void setRegionId(Long regionId) { + this.regionId = regionId; + } + + public String getRegionName() { + return regionName; + } + + public void setRegionName(String regionName) { + this.regionName = regionName; + } + + public Integer getOilNo() { + return oilNo; + } + + public void setOilNo(Integer oilNo) { + this.oilNo = oilNo; + } + + public String getOilNoName() { + return oilNoName; + } + + public void setOilNoName(String oilNoName) { + this.oilNoName = oilNoName; + } + + public BigDecimal getPriceOfficial() { + return priceOfficial; + } + + public void setPriceOfficial(BigDecimal priceOfficial) { + this.priceOfficial = priceOfficial; + } + + public Integer getOilType() { + return oilType; + } + + public void setOilType(Integer oilType) { + this.oilType = oilType; + } + + public String getOilTypeName() { + return oilTypeName; + } + + public void setOilTypeName(String oilTypeName) { + this.oilTypeName = oilTypeName; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + HighGasOilPriceOfficial other = (HighGasOilPriceOfficial) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId())) + && (this.getRegionName() == null ? other.getRegionName() == null : this.getRegionName().equals(other.getRegionName())) + && (this.getOilNo() == null ? other.getOilNo() == null : this.getOilNo().equals(other.getOilNo())) + && (this.getOilNoName() == null ? other.getOilNoName() == null : this.getOilNoName().equals(other.getOilNoName())) + && (this.getPriceOfficial() == null ? other.getPriceOfficial() == null : this.getPriceOfficial().equals(other.getPriceOfficial())) + && (this.getOilType() == null ? other.getOilType() == null : this.getOilType().equals(other.getOilType())) + && (this.getOilTypeName() == null ? other.getOilTypeName() == null : this.getOilTypeName().equals(other.getOilTypeName())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getRegionId() == null) ? 0 : getRegionId().hashCode()); + result = prime * result + ((getRegionName() == null) ? 0 : getRegionName().hashCode()); + result = prime * result + ((getOilNo() == null) ? 0 : getOilNo().hashCode()); + result = prime * result + ((getOilNoName() == null) ? 0 : getOilNoName().hashCode()); + result = prime * result + ((getPriceOfficial() == null) ? 0 : getPriceOfficial().hashCode()); + result = prime * result + ((getOilType() == null) ? 0 : getOilType().hashCode()); + result = prime * result + ((getOilTypeName() == null) ? 0 : getOilTypeName().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", regionId=").append(regionId); + sb.append(", regionName=").append(regionName); + sb.append(", oilNo=").append(oilNo); + sb.append(", oilNoName=").append(oilNoName); + sb.append(", priceOfficial=").append(priceOfficial); + sb.append(", oilType=").append(oilType); + sb.append(", oilTypeName=").append(oilTypeName); + sb.append(", status=").append(status); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficialExample.java b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficialExample.java new file mode 100644 index 00000000..1f03fb63 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighGasOilPriceOfficialExample.java @@ -0,0 +1,1003 @@ +package com.hai.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class HighGasOilPriceOfficialExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighGasOilPriceOfficialExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andRegionIdIsNull() { + addCriterion("region_id is null"); + return (Criteria) this; + } + + public Criteria andRegionIdIsNotNull() { + addCriterion("region_id is not null"); + return (Criteria) this; + } + + public Criteria andRegionIdEqualTo(Long value) { + addCriterion("region_id =", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdNotEqualTo(Long value) { + addCriterion("region_id <>", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdGreaterThan(Long value) { + addCriterion("region_id >", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdGreaterThanOrEqualTo(Long value) { + addCriterion("region_id >=", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdLessThan(Long value) { + addCriterion("region_id <", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdLessThanOrEqualTo(Long value) { + addCriterion("region_id <=", value, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdIn(List values) { + addCriterion("region_id in", values, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdNotIn(List values) { + addCriterion("region_id not in", values, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdBetween(Long value1, Long value2) { + addCriterion("region_id between", value1, value2, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionIdNotBetween(Long value1, Long value2) { + addCriterion("region_id not between", value1, value2, "regionId"); + return (Criteria) this; + } + + public Criteria andRegionNameIsNull() { + addCriterion("region_name is null"); + return (Criteria) this; + } + + public Criteria andRegionNameIsNotNull() { + addCriterion("region_name is not null"); + return (Criteria) this; + } + + public Criteria andRegionNameEqualTo(String value) { + addCriterion("region_name =", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotEqualTo(String value) { + addCriterion("region_name <>", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameGreaterThan(String value) { + addCriterion("region_name >", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameGreaterThanOrEqualTo(String value) { + addCriterion("region_name >=", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameLessThan(String value) { + addCriterion("region_name <", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameLessThanOrEqualTo(String value) { + addCriterion("region_name <=", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameLike(String value) { + addCriterion("region_name like", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotLike(String value) { + addCriterion("region_name not like", value, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameIn(List values) { + addCriterion("region_name in", values, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotIn(List values) { + addCriterion("region_name not in", values, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameBetween(String value1, String value2) { + addCriterion("region_name between", value1, value2, "regionName"); + return (Criteria) this; + } + + public Criteria andRegionNameNotBetween(String value1, String value2) { + addCriterion("region_name not between", value1, value2, "regionName"); + return (Criteria) this; + } + + public Criteria andOilNoIsNull() { + addCriterion("oil_no is null"); + return (Criteria) this; + } + + public Criteria andOilNoIsNotNull() { + addCriterion("oil_no is not null"); + return (Criteria) this; + } + + public Criteria andOilNoEqualTo(Integer value) { + addCriterion("oil_no =", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotEqualTo(Integer value) { + addCriterion("oil_no <>", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoGreaterThan(Integer value) { + addCriterion("oil_no >", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoGreaterThanOrEqualTo(Integer value) { + addCriterion("oil_no >=", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoLessThan(Integer value) { + addCriterion("oil_no <", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoLessThanOrEqualTo(Integer value) { + addCriterion("oil_no <=", value, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoIn(List values) { + addCriterion("oil_no in", values, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotIn(List values) { + addCriterion("oil_no not in", values, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoBetween(Integer value1, Integer value2) { + addCriterion("oil_no between", value1, value2, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNotBetween(Integer value1, Integer value2) { + addCriterion("oil_no not between", value1, value2, "oilNo"); + return (Criteria) this; + } + + public Criteria andOilNoNameIsNull() { + addCriterion("oil_no_name is null"); + return (Criteria) this; + } + + public Criteria andOilNoNameIsNotNull() { + addCriterion("oil_no_name is not null"); + return (Criteria) this; + } + + public Criteria andOilNoNameEqualTo(String value) { + addCriterion("oil_no_name =", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotEqualTo(String value) { + addCriterion("oil_no_name <>", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameGreaterThan(String value) { + addCriterion("oil_no_name >", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameGreaterThanOrEqualTo(String value) { + addCriterion("oil_no_name >=", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLessThan(String value) { + addCriterion("oil_no_name <", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLessThanOrEqualTo(String value) { + addCriterion("oil_no_name <=", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameLike(String value) { + addCriterion("oil_no_name like", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotLike(String value) { + addCriterion("oil_no_name not like", value, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameIn(List values) { + addCriterion("oil_no_name in", values, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotIn(List values) { + addCriterion("oil_no_name not in", values, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameBetween(String value1, String value2) { + addCriterion("oil_no_name between", value1, value2, "oilNoName"); + return (Criteria) this; + } + + public Criteria andOilNoNameNotBetween(String value1, String value2) { + addCriterion("oil_no_name not between", value1, value2, "oilNoName"); + return (Criteria) this; + } + + public Criteria andPriceOfficialIsNull() { + addCriterion("price_official is null"); + return (Criteria) this; + } + + public Criteria andPriceOfficialIsNotNull() { + addCriterion("price_official is not null"); + return (Criteria) this; + } + + public Criteria andPriceOfficialEqualTo(BigDecimal value) { + addCriterion("price_official =", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialNotEqualTo(BigDecimal value) { + addCriterion("price_official <>", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialGreaterThan(BigDecimal value) { + addCriterion("price_official >", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price_official >=", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialLessThan(BigDecimal value) { + addCriterion("price_official <", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialLessThanOrEqualTo(BigDecimal value) { + addCriterion("price_official <=", value, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialIn(List values) { + addCriterion("price_official in", values, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialNotIn(List values) { + addCriterion("price_official not in", values, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_official between", value1, value2, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andPriceOfficialNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price_official not between", value1, value2, "priceOfficial"); + return (Criteria) this; + } + + public Criteria andOilTypeIsNull() { + addCriterion("oil_type is null"); + return (Criteria) this; + } + + public Criteria andOilTypeIsNotNull() { + addCriterion("oil_type is not null"); + return (Criteria) this; + } + + public Criteria andOilTypeEqualTo(Integer value) { + addCriterion("oil_type =", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNotEqualTo(Integer value) { + addCriterion("oil_type <>", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeGreaterThan(Integer value) { + addCriterion("oil_type >", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("oil_type >=", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeLessThan(Integer value) { + addCriterion("oil_type <", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeLessThanOrEqualTo(Integer value) { + addCriterion("oil_type <=", value, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeIn(List values) { + addCriterion("oil_type in", values, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNotIn(List values) { + addCriterion("oil_type not in", values, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeBetween(Integer value1, Integer value2) { + addCriterion("oil_type between", value1, value2, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNotBetween(Integer value1, Integer value2) { + addCriterion("oil_type not between", value1, value2, "oilType"); + return (Criteria) this; + } + + public Criteria andOilTypeNameIsNull() { + addCriterion("oil_type_name is null"); + return (Criteria) this; + } + + public Criteria andOilTypeNameIsNotNull() { + addCriterion("oil_type_name is not null"); + return (Criteria) this; + } + + public Criteria andOilTypeNameEqualTo(String value) { + addCriterion("oil_type_name =", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotEqualTo(String value) { + addCriterion("oil_type_name <>", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameGreaterThan(String value) { + addCriterion("oil_type_name >", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameGreaterThanOrEqualTo(String value) { + addCriterion("oil_type_name >=", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameLessThan(String value) { + addCriterion("oil_type_name <", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameLessThanOrEqualTo(String value) { + addCriterion("oil_type_name <=", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameLike(String value) { + addCriterion("oil_type_name like", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotLike(String value) { + addCriterion("oil_type_name not like", value, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameIn(List values) { + addCriterion("oil_type_name in", values, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotIn(List values) { + addCriterion("oil_type_name not in", values, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameBetween(String value1, String value2) { + addCriterion("oil_type_name between", value1, value2, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andOilTypeNameNotBetween(String value1, String value2) { + addCriterion("oil_type_name not between", value1, value2, "oilTypeName"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/service/CommonService.java b/hai-service/src/main/java/com/hai/service/CommonService.java index ce9c6251..0d724440 100644 --- a/hai-service/src/main/java/com/hai/service/CommonService.java +++ b/hai-service/src/main/java/com/hai/service/CommonService.java @@ -147,6 +147,13 @@ public interface CommonService { */ SecRegion getRegionsById(Long regionId); + /** + * 根据地区名称模糊查询 + * @param regionName + * @return + */ + SecRegion getRegionsByName(String regionName); + /** * * @Title: getParentInfoByRegionId diff --git a/hai-service/src/main/java/com/hai/service/HighGasOilPriceOfficialService.java b/hai-service/src/main/java/com/hai/service/HighGasOilPriceOfficialService.java new file mode 100644 index 00000000..1cf9d282 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/HighGasOilPriceOfficialService.java @@ -0,0 +1,32 @@ +package com.hai.service; + +import com.hai.entity.HighGasOilPriceOfficial; + +import java.math.BigDecimal; + +/** + * 油品国标价 + * @author hurui + */ +public interface HighGasOilPriceOfficialService { + + /** + * 编辑价格 + * @param regionId + * @param oilNo + */ + void editPrice(Long regionId, Integer oilNo, BigDecimal price); + + /** + * 查询价格 + * @param regionId + * @param oilNo + * @return + */ + HighGasOilPriceOfficial getPrice(Long regionId, Integer oilNo); + + /** + * 刷新获取最新的国标价 + */ + void refreshPriceOfficial(); +} diff --git a/hai-service/src/main/java/com/hai/service/impl/CommonServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/CommonServiceImpl.java index 2801bdc7..1cf167c0 100644 --- a/hai-service/src/main/java/com/hai/service/impl/CommonServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/CommonServiceImpl.java @@ -397,6 +397,16 @@ public class CommonServiceImpl implements CommonService { return regionMapper.selectByPrimaryKey(regionId); } + @Override + public SecRegion getRegionsByName(String regionName) { + SecRegionExample example = new SecRegionExample(); + example.createCriteria().andRegionNameLike("%" + regionName + "%"); + List list = regionMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } @Override public List findByName(String name) { diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java index 587fc584..09571332 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java @@ -20,12 +20,10 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.HashMap; import java.util.List; import java.util.Map; -@Service("highGasDiscountOilPriceService") +@Service("gasDiscountOilPriceService") public class HighGasDiscountOilPriceServiceImpl implements HighGasDiscountOilPriceService { @Resource diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasOilGunNoServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasOilGunNoServiceImpl.java index 6f5118e7..99156ab7 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighGasOilGunNoServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasOilGunNoServiceImpl.java @@ -10,7 +10,7 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; -@Service("gasOilPriceService") +@Service("gasOilGunNoService") public class HighGasOilGunNoServiceImpl implements HighGasOilGunNoService { @Resource diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceOfficialServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceOfficialServiceImpl.java new file mode 100644 index 00000000..3e19dab1 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasOilPriceOfficialServiceImpl.java @@ -0,0 +1,106 @@ +package com.hai.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hai.common.utils.HttpsUtils; +import com.hai.dao.HighGasOilPriceOfficialMapper; +import com.hai.entity.HighGasOilPriceOfficial; +import com.hai.entity.HighGasOilPriceOfficialExample; +import com.hai.entity.SecDictionary; +import com.hai.entity.SecRegion; +import com.hai.service.CommonService; +import com.hai.service.HighGasOilPriceOfficialService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service("gasOilPriceOfficialService") +public class HighGasOilPriceOfficialServiceImpl implements HighGasOilPriceOfficialService { + + @Resource + private HighGasOilPriceOfficialMapper gasOilPriceOfficialMapper; + + @Resource + private CommonService commonService; + + @Override + public void editPrice(Long regionId, Integer oilNo, BigDecimal price) { + HighGasOilPriceOfficial priceOfficial = getPrice(regionId, oilNo); + if (priceOfficial != null) { + priceOfficial.setPriceOfficial(price); + gasOilPriceOfficialMapper.updateByPrimaryKey(priceOfficial); + } else { + SecDictionary oil = commonService.mappingSysCode("GAS_OIL_TYPE", oilNo.toString()); + SecRegion region = commonService.getRegionsById(regionId); + + priceOfficial = new HighGasOilPriceOfficial(); + priceOfficial.setRegionId(region.getRegionId()); + priceOfficial.setRegionName(region.getRegionName()); + priceOfficial.setOilNo(Integer.valueOf(oil.getCodeValue())); + priceOfficial.setOilNoName(oil.getCodeName()); + priceOfficial.setPriceOfficial(price); + priceOfficial.setOilType(Integer.valueOf(oil.getExt1())); + priceOfficial.setOilTypeName(oil.getExt2()); + priceOfficial.setStatus(1); + gasOilPriceOfficialMapper.insert(priceOfficial); + } + } + + @Override + public HighGasOilPriceOfficial getPrice(Long regionId, Integer oilNo) { + HighGasOilPriceOfficialExample example = new HighGasOilPriceOfficialExample(); + example.createCriteria().andRegionIdEqualTo(regionId).andOilNoEqualTo(oilNo); + List list = gasOilPriceOfficialMapper.selectByExample(example); + if (list.size() > 0) { + return list.get(0); + } + return null; + } + + @Override + public void refreshPriceOfficial() { + Map heardParam = new HashMap<>(); + heardParam.put("Content-Type", "application/json"); + heardParam.put("Authorization", "APPCODE d7fb8449b8424fdbb60f01f53a04ce90"); + JSONObject dataObject = HttpsUtils.doGet("http://ali-todayoil.showapi.com/todayoil", new HashMap<>(), heardParam); + + if (dataObject.getInteger("showapi_res_code").equals(0)) { + JSONObject resBody = dataObject.getJSONObject("showapi_res_body"); + + JSONArray oilArray = resBody.getJSONArray("list"); + for (Object oil : oilArray) { + JSONObject oilObject = (JSONObject) oil; + System.out.println(); + + SecRegion region = commonService.getRegionsByName(oilObject.getString("prov")); + if (region != null) { + BigDecimal oilNo92 = oilObject.getBigDecimal("p92"); + if (oilNo92 != null) { + editPrice(region.getRegionId(), 92, oilNo92); + } + + BigDecimal oilNo95 = oilObject.getBigDecimal("p95"); + if (oilNo95 != null) { + editPrice(region.getRegionId(), 95, oilNo95); + } + + BigDecimal oilNo98 = oilObject.getBigDecimal("p98"); + if (oilNo98 != null) { + editPrice(region.getRegionId(), 98, oilNo98); + } + + BigDecimal oilNo0 = oilObject.getBigDecimal("p0"); + if (oilNo0 != null) { + editPrice(region.getRegionId(), 0, oilNo0); + } + + } + } + } + } + +}