dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

油品类型

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2023-10-12 13:47:06 +08:00
parent b365d25dc0
commit 7906645557
11 changed files with 420 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilPresetPricesController.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.petrolStationManagement.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -10,6 +11,8 @@ import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import com.fuint.business.petrolStationManagement.service.OilNumberService;
import com.fuint.business.petrolStationManagement.service.OilPresetPricesService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@ -24,10 +27,10 @@ import java.util.List;
* @author wangh
* @since 2023-10-11 16:36:02
*/
@Api(tags="油站管理-油号管理")
@Api(tags="油站管理-油价趋势")
@RestController
@RequestMapping("/business/petrolStationManagement/oilPresetPrices")
public class OilPresetPricesController extends ApiController {
public class OilPresetPricesController extends BaseController {
/**
* 服务对象
*/
@ -37,13 +40,16 @@ public class OilPresetPricesController extends ApiController {
/**
* 分页查询所有数据
*
* @param page 分页对象
* @return 所有数据
*/
@ApiOperation("查询所有油号")
@GetMapping("getList")
public R selectAll(Page<OilPresetPrices> page, OilPresetPrices oilPresetPrices) {
return success(this.oilPresetPricesService.page(page, new QueryWrapper<>(oilPresetPrices)));
public ResponseObject selectAll(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
OilPresetPrices oilPresetPrices) {
Page page =new Page(pageNo,pageSize);
IPage<OilPresetPrices> list = oilPresetPricesService.selectOilPresetPricesList(page,oilPresetPrices);
return getSuccessResult(list);
}
/**
@ -53,8 +59,8 @@ public class OilPresetPricesController extends ApiController {
* @return 单条数据
*/
@GetMapping("{id}")
public R selectOne(@PathVariable Serializable id) {
return success(this.oilPresetPricesService.getById(id));
public ResponseObject selectOne(@PathVariable Integer id) {
return getSuccessResult(oilPresetPricesService.selectOilPresetPricesById(id));
}
/**
@ -64,8 +70,8 @@ public class OilPresetPricesController extends ApiController {
* @return 新增结果
*/
@PostMapping
public R insert(@RequestBody OilPresetPrices oilNumber) {
return success(this.oilPresetPricesService.save(oilNumber));
public ResponseObject insert(@RequestBody OilPresetPrices oilNumber) {
return getSuccessResult(oilPresetPricesService.insertOilPresetPrices(oilNumber));
}
/**
@ -75,19 +81,18 @@ public class OilPresetPricesController extends ApiController {
* @return 修改结果
*/
@PutMapping
public R update(@RequestBody OilPresetPrices oilNumber) {
return success(this.oilPresetPricesService.updateById(oilNumber));
public ResponseObject update(@RequestBody OilPresetPrices oilNumber) {
return getSuccessResult(oilPresetPricesService.updateOilPresetPrices(oilNumber));
}
/**
* 删除数据
*
* @param idList 主键结合
* @return 删除结果
*/
@DeleteMapping
public R delete(@RequestParam("idList") List<Long> idList) {
return success(this.oilPresetPricesService.removeByIds(idList));
public ResponseObject delete(@PathVariable Integer id) {
return getSuccessResult(oilPresetPricesService.deleteOilPresetPricesById(id));
}
}

18
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilNumber.java
View File

@ -1,6 +1,8 @@
package com.fuint.business.petrolStationManagement.entity;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -9,7 +11,21 @@ import lombok.Data;
* @author wangh
* @since 2023-10-11 16:36:02
*/
@ApiModel("油品数据")
@Data
public class OilNumber extends Model<OilNumber> {
public Long numberId;
@ApiModelProperty("商户名")
public Long numberId; //id（主键)
private String oilType; // 油品类型
private String oilName; //油品名称
private Double oilPrice; //油品单价
private Double gbPrice; //国标价格
private String receivingUnits; //收款单位
private String createTime; //创建时间
private String updateTime; //更新时间
private String state; // 状态 启用或禁用（0禁用1启用）
private String sort; //排序
private String remark; //
private String ifDelete; //
}

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilPresetPrices.java
View File

@ -15,6 +15,17 @@ import java.util.Date;
@Data
public class OilPresetPrices extends Model<OilPresetPrices> {
private Long presetId; // id（主键)
private Long oilType; // 预设油号 id
private Double currentPetrolPrices; // 当前油站价
private Double presetOilPrices; // 预设油站价
private Double currentGbPrice; // 当前国标价
private Double presetGbPrice; // 预设国标价
private String createTime; // 创建时间
private String updateTime; // 更新时间
private String effectiveTime; // 生效时间（时间戳）
private Integer ifDelete; // 是否删除（0未删除|1删除）
// /**
// * 获取主键值

34
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilNumberMapper.java
View File

@ -1,8 +1,10 @@
package com.fuint.business.petrolStationManagement.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.service.OilNumberService;
import org.apache.ibatis.annotations.Param;
/**
* (ChainStoreInfo)表数据库访问层
@ -11,6 +13,36 @@ import com.fuint.business.petrolStationManagement.service.OilNumberService;
* @since 2023-10-11 13:17:02
*/
public interface OilNumberMapper extends BaseMapper<OilNumber> {
/**
* 根据条件分页查询员工信息
* @param page
* @return
*/
public IPage<OilNumber> selectOilNumberList(Page page, @Param("oilNumber") OilNumber oilNumber);
/**
* 根据id查询员工信息
* @param id
* @return
*/
public OilNumber selectOilNumberById(@Param("id") int id);
/**
* 根据id删除员工信息
* @return
*/
public int deleteOilNumberById(@Param("id") int id);
/**
* 添加员工信息
* @return
*/
public int insertOilNumber(OilNumber oilNumber);
/**
* 修改员工信息
* @return
*/
public int updateOilNumber(OilNumber oilNumber);
}

34
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilPresetPricesMapper.java
View File

@ -1,7 +1,11 @@
package com.fuint.business.petrolStationManagement.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import org.apache.ibatis.annotations.Param;
/**
* (ChainStoreInfo)表数据库访问层
@ -9,5 +13,35 @@ import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
* @since 2023-10-11 13:17:02
*/
public interface OilPresetPricesMapper extends BaseMapper<OilPresetPrices> {
/**
* 根据条件分页查询员工信息
* @param page
* @return
*/
public IPage<OilPresetPrices> selectOilPresetPricesList(Page page, @Param("oilNumber") OilPresetPrices presetPrices);
/**
* 根据id查询员工信息
* @param id
* @return
*/
public OilPresetPrices selectOilPresetPricesById(@Param("id") int id);
/**
* 根据id删除员工信息
* @return
*/
public int deleteOilPresetPricesById(@Param("id") int id);
/**
* 添加员工信息
* @return
*/
public int insertOilPresetPrices(OilPresetPrices presetPrices);
/**
* 修改员工信息
* @return
*/
public int updateOilPresetPrices(OilPresetPrices presetPrices);
}

110
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml
View File

@ -3,4 +3,114 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.petrolStationManagement.mapper.OilNumberMapper">
<resultMap type="com.fuint.business.petrolStationManagement.entity.OilNumber" id="OilNumberResult">
<id property="numberId" column="number_id" />
<result property="oilType" column="oil_type" />
<result property="oilName" column="oil_name" />
<result property="oilPrice" column="oil_price" />
<result property="gbPrice" column="gb_price" />
<result property="receivingUnits" column="receiving_units" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="state" column="state" />
<result property="sort" column="sort" />
<result property="remark" column="remark" />
<result property="ifDelete" column="if_delete" />
</resultMap>
<sql id="selectOilNumber">
select `number_id`,`oil_type`,oil_name,oil_price,gb_price,receiving_units,create_time,update_time,`state`,sort,remark,if_delete
from oil_number
</sql>
<select id="selectOilNumberList" resultMap="OilNumberResult">
<include refid="selectOilNumber"></include>
</select>
<!-- select-->
<!-- number_id numberId,-->
<!-- oil_type oilType,-->
<!-- oil_name oilName,-->
<!-- oil_price oilPrice,-->
<!-- update_time updateTime-->
<!-- from oil_number-->
<select id="selectOilNumberById" resultType="com.fuint.business.petrolStationManagement.entity.OilNumber">
<include refid="selectOilNumber"></include>
where number_id = #{numberId}
</select>
<insert id="insertOilNumber">
insert into oil_number(
<if test="oilType != null">oil_type,</if>
<if test="oilName != null">oil_name,</if>
<if test="oilPrice != null">oil_price,</if>
<if test="gbPrice != null">gb_price,</if>
<if test="receivingUni != null">receiving_units,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="state != null">state,</if>
<if test="sort != null">sort,</if>
<if test="remark != null">remark,</if>
<if test="ifDelete != null">if_delete,</if>
)values (
<if test=" oilType != null">#{oilType },</if>
<if test=" oilName != null">#{oilName },</if>
<if test=" oilPrice != null">#{oilPrice },</if>
<if test=" gbPrice != null">#{gbPrice },</if>
<if test=" receivingUni != null">#{receivingUni },</if>
<if test=" createTime != null">#{createTime },</if>
<if test=" updateTime != null">#{updateTime },</if>
<if test=" state != null">#{state },</if>
<if test=" sort != null">#{sort },</if>
<if test=" remark != null">#{remark },</if>
<if test=" ifDelete != null">#{ifDelete },</if>
)
</insert>
<update id="updateOilNumber">
update oil_number
<set>
<if test=" oilType != null">oil_type= #{oilType},</if>
<if test=" oilName != null">oil_name= #{oilName},</if>
<if test=" oilPrice != null">oil_price= #{oilPrice},</if>
<if test=" gbPrice != null">gb_price= #{gbPrice},</if>
<if test=" receivingUni != null">receiving_units= #{receivingUni},</if>
<if test=" createTime != null">create_time= #{createTime},</if>
<if test=" updateTime != null">update_time= #{updateTime},</if>
<if test=" state != null"> state = #{state},</if>
<if test=" sort != null">sort= #{sort},</if>
<if test=" remark != null">remark= #{remark},</if>
<if test=" ifDelete != null">if_delete= #{ifDelete},</if>
</set>
where number_id = #{numberId}
</update>
<delete id="deleteOilNumberById">
delete from oil_number where number_id = #{numberId}
</delete>
<!-- oilType-->
<!-- oilName-->
<!-- oilPrice-->
<!-- gbPrice-->
<!-- receivingUni-->
<!-- createTime-->
<!-- updateTime-->
<!-- state-->
<!-- sort-->
<!-- remark-->
<!-- ifDelete-->
<!-- oil_type-->
<!-- oil_name-->
<!-- oil_price-->
<!-- gb_price-->
<!-- receiving_units-->
<!-- create_time-->
<!-- update_time-->
<!-- state-->
<!-- sort-->
<!-- remark-->
<!-- if_delete-->
</mapper>

75
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPresetPricesMapper.xml
View File

@ -3,4 +3,79 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.petrolStationManagement.mapper.OilPresetPricesMapper">
<resultMap type="com.fuint.business.petrolStationManagement.entity.OilPresetPrices" id="OilPresetPricesResult">
<id property="presetId" column="preset_id"/>
<result property="oilType" column="oil_type"/>
<result property="currentPetrolPrices" column="current_petrol_prices"/>
<result property="presetOilPrices" column="preset_oil_prices"/>
<result property="currentGbPrice" column="current_gb_price"/>
<result property="presetGbPrice" column="preset_gb_price"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="effectiveTime" column="effective_time"/>
<result property="ifDelete" column="if_delete"/>
</resultMap>
<sql id="selectOilPresetPrices">
select preset_id, oil_type, current_petrol_prices, preset_oil_prices, current_gb_price,
preset_gb_price, create_time, update_time, effective_time, if_delete
from oil_preset_prices
</sql>
<select id="selectOilPresetPricesList"
resultType="com.fuint.business.petrolStationManagement.entity.OilPresetPrices">
<include refid="selectOilPresetPrices"></include>
</select>
<select id="selectOilPresetPricesById"
resultType="com.fuint.business.petrolStationManagement.entity.OilPresetPrices">
<include refid="selectOilPresetPrices"></include>
where presetId = #{preset_id}
</select>
<insert id="insertOilPresetPrices">
insert into oil_preset_prices(
<if test=" != null">preset_id,</if>
<if test=" oilType != null">oil_type,</if>
<if test=" currentPetrolPrices != null">current_petrol_prices,</if>
<if test=" presetOilPrices != null">preset_oil_prices,</if>
<if test=" currentGbPrice != null">current_gb_price,</if>
<if test=" presetGbPrice != null">preset_gb_price,</if>
<if test=" createTime != null">create_time,</if>
<if test=" updateTime != null">update_time,</if>
<if test=" effectiveTime != null">effective_time,</if>
<if test=" ifDelete != null">if_delete,</if>
)values (
<if test=" oilType != null">#{oilType},</if>
<if test=" currentPetrolPrices != null">#{currentPetrolPrices},</if>
<if test=" presetOilPrices != null">#{presetOilPrices},</if>
<if test=" currentGbPrice != null">#{currentGbPrice},</if>
<if test=" presetGbPrice != null">#{presetGbPrice},</if>
<if test=" createTime != null">#{createTime},</if>
<if test=" updateTime != null">#{updateTime},</if>
<if test=" effectiveTime != null">#{effectiveTime},</if>
<if test=" ifDelete != null">#{ifDelete},</if>
)
</insert>
<update id="updateOilPresetPrices">
update oil_preset_prices
<set>
<if test=" oilType != null">= preset_id = #{oilType},</if>
<if test=" currentPetrolPrices != null">= oil_type = #{currentPetrolPrices},</if>
<if test=" presetOilPrices != null">= current_petrol_prices = #{presetOilPrices},</if>
<if test=" currentGbPrice != null">= preset_oil_prices = #{currentGbPrice},</if>
<if test=" presetGbPrice != null">= current_gb_price = #{presetGbPrice},</if>
<if test=" createTime != null">= preset_gb_price = #{createTime},</if>
<if test=" updateTime != null">= create_time = #{updateTime},</if>
<if test=" effectiveTime != null">= update_time = #{effectiveTime},</if>
<if test=" ifDelete != null">= effective_time = #{ifDelete},</if>
</set>
where number_id = #{numberId}
</update>
<delete id="deleteOilPresetPricesById">
delete from oil_preset_prices where number_id = #{id}
</delete>
</mapper>

33
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilNumberService.java
View File

@ -1,8 +1,11 @@
package com.fuint.business.petrolStationManagement.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import org.apache.ibatis.annotations.Param;
/**
*
@ -11,6 +14,36 @@ import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
* @since 2023-10-11 13:17:02
*/
public interface OilNumberService extends IService<OilNumber> {
/**
* 根据条件分页查询员工信息
* @param page
* @return
*/
public IPage<OilNumber> selectOilNumberList(Page page, @Param("oilNumber") OilNumber oilNumber);
/**
* 根据id查询员工信息
* @param id
* @return
*/
public OilNumber selectOilNumberById(@Param("id") int id);
/**
* 根据id删除员工信息
* @return
*/
public int deleteOilNumberById(@Param("id") int id);
/**
* 添加员工信息
* @return
*/
public int insertOilNumber(OilNumber oilNumber);
/**
* 修改员工信息
* @return
*/
public int updateOilNumber(OilNumber oilNumber);
}

33
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilPresetPricesService.java
View File

@ -1,8 +1,11 @@
package com.fuint.business.petrolStationManagement.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import org.apache.ibatis.annotations.Param;
/**
*
@ -11,6 +14,36 @@ import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
* @since 2023-10-11 13:17:02
*/
public interface OilPresetPricesService extends IService<OilPresetPrices> {
/**
* 根据条件分页查询员工信息
* @param page
* @return
*/
public IPage<OilPresetPrices> selectOilPresetPricesList(Page page, @Param("oilNumber") OilPresetPrices presetPrices);
/**
* 根据id查询员工信息
* @param id
* @return
*/
public OilPresetPrices selectOilPresetPricesById(@Param("id") int id);
/**
* 根据id删除员工信息
* @return
*/
public int deleteOilPresetPricesById(@Param("id") int id);
/**
* 添加员工信息
* @return
*/
public int insertOilPresetPrices(OilPresetPrices presetPrices);
/**
* 修改员工信息
* @return
*/
public int updateOilPresetPrices(OilPresetPrices presetPrices);
}

28
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java
View File

@ -2,6 +2,8 @@ package com.fuint.business.petrolStationManagement.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.mapper.OilNumberMapper;
@ -9,7 +11,7 @@ import com.fuint.business.petrolStationManagement.service.OilNumberService;
import org.springframework.stereotype.Service;
/**
* (ChainStoreInfo)表服务实现类
* (OilNumber)表服务实现类
*
* @author
* @since 2023-10-11 13:17:02
@ -17,4 +19,28 @@ import org.springframework.stereotype.Service;
@Service("OilNumberService")
public class OilNumberServiceImpl extends ServiceImpl<OilNumberMapper, OilNumber> implements OilNumberService {
@Override
public IPage<OilNumber> selectOilNumberList(Page page, OilNumber oilNumber) {
return baseMapper.selectOilNumberList(page,oilNumber);
}
@Override
public OilNumber selectOilNumberById(int id) {
return baseMapper.selectOilNumberById(id);
}
@Override
public int deleteOilNumberById(int id) {
return baseMapper.deleteOilNumberById(id);
}
@Override
public int insertOilNumber(OilNumber oilNumber) {
return baseMapper.insertOilNumber(oilNumber);
}
@Override
public int updateOilNumber(OilNumber oilNumber) {
return baseMapper.updateOilNumber(oilNumber);
}
}

28
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilPresetPricesServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.fuint.business.petrolStationManagement.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import com.fuint.business.petrolStationManagement.mapper.OilPresetPricesMapper;
@ -15,4 +17,30 @@ import org.springframework.stereotype.Service;
@Service("OilPresetPricesService")
public class OilPresetPricesServiceImpl extends ServiceImpl<OilPresetPricesMapper, OilPresetPrices> implements OilPresetPricesService {
@Override
public IPage<OilPresetPrices> selectOilPresetPricesList(Page page, OilPresetPrices presetPrices) {
return baseMapper.selectOilPresetPricesList(page, presetPrices);
}
@Override
public OilPresetPrices selectOilPresetPricesById(int id) {
return baseMapper.selectOilPresetPricesById(id);
}
@Override
public int deleteOilPresetPricesById(int id) {
return baseMapper.deleteOilPresetPricesById(id);
}
@Override
public int insertOilPresetPrices(OilPresetPrices presetPrices) {
return baseMapper.insertOilPresetPrices(presetPrices);
}
@Override
public int updateOilPresetPrices(OilPresetPrices presetPrices) {
return baseMapper.insertOilPresetPrices(presetPrices);
}
}