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 18:44:46 +08:00
parent 22a08f5e51
commit f9940568ac
13 changed files with 726 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
fuintAdmin/src/api/oilPrice.js
View File

@ -1,65 +1,47 @@
import request from '@/utils/request'
// 分页查询会员列表
export function getMemberList(query) {
// 查询油类
export function getOilNumberList(query) {
return request({
url: 'backendApi/member/list',
url: 'business/petrolStationManagement/oilNumber/getList',
method: 'get',
params: query
})
}
// 查询会员信息
export function getMemberInfo(memberId) {
// 新增油类
export function insertOilNumber(data) {
console.log("datadatadatadata",data)
return request({
url: 'backendApi/member/info/' + memberId,
method: 'get'
})
}
// 查询会员设置
export function getMemberSetting() {
return request({
url: 'backendApi/member/setting',
method: 'get'
})
}
// 保存会员设置
export function saveSetting(data) {
return request({
url: 'backendApi/member/saveSetting',
url: 'business/petrolStationManagement/oilNumber',
method: 'post',
data: data
})
}
// 更新会员状态
export function updateMemberStatus(userId, status) {
const data = {
userId,
status
}
// 修改油类
export function updateOilNumber(data) {
return request({
url: 'backendApi/member/updateStatus',
method: 'post',
data: data
})
}
// 删除会员信息
export function deleteMember(memberId) {
return request({
url: 'backendApi/member/delete/' + memberId,
method: 'get'
})
}
// 保存数据
export function saveMember(data) {
return request({
url: 'backendApi/member/save',
method: 'post',
url: 'business/petrolStationManagement/oilNumber',
method: 'put',
data: data
})
}
// 字典查询
export function dictSelect(data) {
return request({
url: 'system/dict/data/type/'+data,
method: 'get',
data: data
})
}
// 字典查询
export function getOilPresetList(data) {
return request({
url: 'business/petrolStationManagement/oilPresetPrices/getList',
method: 'get',
data: data
})
}

469
fuintAdmin/src/views/oilPrice/index.vue
View File

@ -4,100 +4,145 @@
<div slot="header" class="clearfix">
<span>油价配置</span>
</div>
<el-button type="primary" @click="dialogFormVisible = true">新增油号</el-button>
<el-button type="primary" @click="dialogFormVisible = true,oilTypeMethods()">新增油号</el-button>
<div class="top-box">
<!-- 循环-->
<div class="oil-box" v-for="(item,index) in 9 " :key="index" >
<div class="oil-box" v-for="(item,index) in oilNumberList " :key="index" >
<div class="top-icon">
<div>启用</div>
</div>
<div class="box-icon"><i class="el-icon-edit" style="color:#409EFF; "></i></div>
<div class="box-title"> 汽油 92# </div>
<div class="box-icon"><i class="el-icon-edit" style="color:#409EFF" @click="dialogFormNumberEdit = true, openOilNumberEdit(item),oilTypeMethods"></i></div>
<div class="box-title"> {{item.oilType}} </div>
<div class="between-box">
<div>油站价:</div>
<div><span class="jiacu">7.28元</span> /L</div>
<div><span class="jiacu">{{ item.oilPrice }}</span> /L</div>
</div>
<div class="between-box">
<div>国标价:</div>
<div> <span class="jiacu">7.28元</span> /L</div>
<div> <span class="jiacu">{{ item.gbPrice }}</span> /L</div>
</div>
<div class="between-box">
<div>最后更新时间:</div>
<div> 2023-07-18 17:55:02 </div>
<div> {{item.updateTime}} </div>
</div>
</div>
</div>
</el-card>
<el-card style="margin-bottom: 20px">
<div slot="header" class="clearfix">
<span>预设油价记录</span>
</div>
<el-button type="success">新增预设油价</el-button>
<el-button type="success" @click = "dialogFormPricesAdd = true, addOilPresePrices()">新增预设油价</el-button>
<div class="table-box">
<el-table
:data="tableData"
:data="oilPresetPricesList"
style="width: auto">
<el-table-column
prop="date"
label="日期"
width="300">
prop="presetId"
label="任务id"
width="100">
</el-table-column>
<el-table-column label="配送信息" style="width: 100%">
<el-table-column
prop="presetGbPrice"
label="预设油号"
>
</el-table-column>
<el-table-column label="当前数据" style="width: 100%">
<el-table-column
prop="name"
label="姓名"
width="300">
prop="currentPetrolPrices"
label="油站价"
>
</el-table-column>
<el-table-column label="地址">
<el-table-column
prop="province"
label="省份"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="市区"
width="300">
</el-table-column>
<el-table-column
prop="address"
label="地址"
width="300">
</el-table-column>
<el-table-column
prop="zip"
label="邮编"
width="300">
</el-table-column>
<el-table-column
prop="presetOilPrices"
label="国标价"
>
</el-table-column>
</el-table-column>
<el-table-column label="预设新数据" style="width: 100%">
<el-table-column
prop="currentPetrolPrices"
label="油站价"
>
</el-table-column>
<el-table-column
prop="presetGbPrice"
label="国标价"
>
</el-table-column>
</el-table-column>
<el-table-column
prop="effectiveTime"
label="预设时间"
>
</el-table-column>
<el-table-column
prop="state"
label="处理状态"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="120">
<template slot-scope="scope">
<el-button
@click.native.prevent="deleteRow(scope.$index, tableData)"
type="text"
size="small">
移除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-card>
<el-dialog title="添加" :visible.sync="dialogFormVisible">
<el-form :model="form">
<el-form :model="oilNumber">
<el-form-item label="油品类型">
<el-radio-group v-model="form.resource">
<el-radio label="汽油"></el-radio>
<el-radio label="柴油"></el-radio>
<el-radio label="天然气"></el-radio>
<el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick()">
<el-radio v-for="option in oilTypeList" :key="option.dictValue" :label="option.dictValue">
{{ option.dictLabel }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="油品名称">
<el-select v-model="form.region" placeholder="请选择活动区域">
<el-option label="名称一" value="shanghai"></el-option>
<el-option label="名称二" value="beijing"></el-option>
<el-select v-model="oilNumber.oilName" placeholder="请选择油品名称">
<!-- <el-option v-for="option in oilNameList" :key="option.dictValue" :label="option.dictValue">-->
<!-- {{ option.dictLabel }}-->
<!-- </el-option>-->
<el-option
v-for="option in oilNameList"
:key="option.dictCode"
:label="option.dictLabel"
:value="option.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计价单位">
<el-select v-model="form.region" placeholder="请选择活动区域">
<el-option label="单位一" value="shanghai"></el-option>
<el-option label="单位二" value="beijing"></el-option>
<el-select v-model="oilNumber.receivingUnits" placeholder="请选择活动区域">
<!-- <el-option label="单位一" value="shanghai"></el-option>-->
<!-- <el-option label="单位二" value="beijing"></el-option>-->
<el-option
v-for="option in receivingUnitList"
:key="option.dictCode"
:label="option.dictLabel"
:value="option.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
@ -106,33 +151,33 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="油品单价">
<el-input v-model="form.name"></el-input>
<el-input v-model="oilNumber.oilPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国际价格">
<el-input v-model="form.name"></el-input>
<el-input v-model="oilNumber.gbPrice"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="收款单位">
<el-radio-group v-model="form.resource">
<el-radio-group v-model="oilNumber.receivingUnits">
<el-radio label="元"></el-radio>
<el-radio label="计价单位"></el-radio>
</el-radio-group>
</el-form-item>
<div class="hui-seiz">点击油品输入的计算单位、可默认元或计价单位(L/m³/kg),页面也可自行切换</div>
<el-form-item label="状态">
<el-radio-group v-model="form.resource">
<el-radio-group v-model="oilNumber.state">
<el-radio label="启用"></el-radio>
<el-radio label="禁用"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="排序">
<el-input-number v-model="num" controls-position="right" @change="handleChange" :min="1" :max="10"></el-input-number>
<el-input-number v-model="oilNumber.num" controls-position="right" @change="handleChange" :min="1" :max="10"></el-input-number>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="form.desc"></el-input>
<el-input type="textarea" v-model="oilNumber.remark"></el-input>
</el-form-item>
@ -140,69 +185,191 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
<el-button type="primary" @click="dialogFormVisible = false,insertOilNumberin()">确 定</el-button>
</div>
</el-dialog>
<el-dialog title="修改" :visible.sync="dialogFormNumberEdit">
<el-form :model="oilNumber">
<el-form-item label="油品类型">
<el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick()">
<el-radio v-for="option in oilTypeList" :key="option.dictValue" :label="option.dictValue">
{{ option.dictLabel }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="油品名称">
<el-select v-model="oilNumber.oilName" placeholder="请选择油品名称">
<!-- <el-option v-for="option in oilNameList" :key="option.dictValue" :label="option.dictValue">-->
<!-- {{ option.dictLabel }}-->
<!-- </el-option>-->
<el-option
v-for="option in oilNameList"
:key="option.dictCode"
:label="option.dictLabel"
:value="option.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计价单位">
<el-select v-model="oilNumber.receivingUnits" placeholder="请选择活动区域">
<!-- <el-option label="单位一" value="shanghai"></el-option>-->
<!-- <el-option label="单位二" value="beijing"></el-option>-->
<el-option
v-for="option in receivingUnitList"
:key="option.dictCode"
:label="option.dictLabel"
:value="option.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- -->
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="油品单价">
<el-input v-model="oilNumber.oilPrice"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国际价格">
<el-input v-model="oilNumber.gbPrice"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="收款单位">
<el-radio-group v-model="oilNumber.receivingUnits">
<el-radio label="元"></el-radio>
<el-radio label="计价单位"></el-radio>
</el-radio-group>
</el-form-item>
<div class="hui-seiz">点击油品输入的计算单位、可默认元或计价单位(L/m³/kg),页面也可自行切换</div>
<el-form-item label="状态">
<el-radio-group v-model="oilNumber.state">
<el-radio label="启用"></el-radio>
<el-radio label="禁用"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="排序">
<el-input-number v-model="oilNumber.num" controls-position="right" @change="handleChange" :min="1" :max="10"></el-input-number>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="oilNumber.remark"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormNumberEdit = false">取 消</el-button>
<el-button type="primary" @click="dialogFormNumberEdit = false,insertOilNumberin()">确 定</el-button>
</div>
</el-dialog>
<el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd">
<el-form :model="oilPresetPrices" label-width="100px">
<el-form-item label="预设油号">
<el-select v-model="oilPresetPrices.oilType" placeholder="请选择油号" @change="oilTypeClickByPrice()">
<el-option
v-for="option in selectOilTypeByPrice"
:key="option.numberId"
:label="option.numberId"
:value="option.oilName"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="当前油站价">
<el-input v-model="oilPresetPrices.currentGbPrice" style="width: 217px" readonly></el-input>
</el-form-item>
<el-form-item label="预设油站价">
<el-input v-model="oilPresetPrices.presetOilPrices" style="width: 217px"></el-input>
</el-form-item>
<el-form-item label="当前国标价">
<el-input v-model="oilPresetPrices.currentPetrolPrices" style="width: 217px"></el-input>
</el-form-item>
<el-form-item label="预设国标价">
<el-input v-model="oilPresetPrices.presetGbPrice" style="width: 217px"></el-input>
</el-form-item>
<el-form-item label="活动时间">
<el-date-picker
v-model="oilNumber.effectiveTime"
type="datetime"
placeholder="选择日期时间"
style="width: 100%;">
</el-date-picker>
</el-form-item>
<div class="hui-seiz">点击油品输入的计算单位、可默认元或计价单位(L/m³/kg),页面也可自行切换</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormPricesAdd = false">取 消</el-button>
<el-button type="primary" @click="dialogFormPricesAdd = false,insertOilNumberin()">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {getOilNumberList, dictSelect, insertOilNumber, updateOilNumber, getOilPresetList} from "@/api/oilPrice";
export default {
name: 'index',
data() {
return {
oilNumberList: [],
num: 1,
dialogFormVisible: false,
tableData: [{
date: '2016-05-03',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-02',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-04',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-01',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-08',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-06',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-07',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}],
dialogFormVisible: false, // 新增油价配置
dialogFormNumberEdit: false, // 修改油价配置
dialogFormPricesAdd: false, // 新增油价趋势
oilTypeList: [], // 油品类型
oilNameList: [], // 油品名称
receivingUnitList: [], // 计价单位
oilNumber:{
oilType: '',
oilName: '',
oilPrice: '',
gbPrice: '',
receivingUnits: '',
createTime: '',
updateTime: '',
state: '',
sort: '',
remark: '',
ifDelete: '',
},
oilPresetPricesList:[],
selectOilTypeByPrice: [],
oilPresetPrices: {
oilType:'',
currentPetrolPrices:'',
presetOilPrices:'',
currentGbPrice:'',
presetGbPrice:'',
createTime:'',
updateTime:',',
effectiveTime:'',
ifDelete:'',
},
form: {
name: '',
region: '',
@ -217,12 +384,102 @@
}
},
created() {
this.getList();
this.getOilPresetListin();
},
mounted() {
},
methods:{
handleChange(value) {
console.log(value);
},
getList() {
var this_ = this
getOilNumberList().then( response => {
this_.oilNumberList = response.data.records
// for (const record of response.data.records) {
// console.log("response", record);
// this_.oilNumberList.push(record);
// }
});
},
oilTypeMethods() {
// 获取油价类型
this.getOilTypeList("oil_type")
// 获取计价的范围
this.getOilTypeList("pricingUnit")
},
oilTypeClick() {
const selectedValue = this.oilNumber.oilType;
this.getOilTypeList(selectedValue)
},
// 打开修改窗口
openOilNumberEdit(item) {
console.log("hellopllolloloo",item)
this.oilNumber = item
},
// 添加
insertOilNumberin(){
insertOilNumber(this.oilNumber).then( response => {
var list = response.data
console.log("updateOilNumber",list)
});
},
// 修改
updateOilNumberin(){
updateOilNumber(data).then( response => {
var list = response.data
console.log("updateOilNumber",list)
});
},
getOilTypeList(data) {
var this_ = this
dictSelect(data).then( response => {
var list = response.data
if (data == "oil_type") {
this_.oilTypeList = list;
}else if (data == "pricingUnit"){ //获取几家单位
this_.receivingUnitList = list;
}else {
this_.oilNameList = list;
}
console.log("this_.oilTypeList",this_.oilTypeList)
});
},
// 油价预设
// 油价预设查询列表
getOilPresetListin() {
var this_=this
getOilPresetList().then( response => {
var list = response.data.records
this_.oilPresetPricesList = list
console.log("this_.listlistlistlistlistlistlist",this_.oilPresetPricesList)
});
},
// 新增油价预设
addOilPresePrices() {
this.selectOilTypeByPrice = this.oilNumberList;
console.log("this.selectOilTypeByPrice",this.selectOilTypeByPrice);
console.log("this.oilNumberList",this.oilNumberList);
},
// 新增油价预设
oilTypeClickByPrice() {
console.log("hello-worldqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq",oilNumberList)
this.selectOilTypeByPrice = this.oilNumberList;
}
}
}

110
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNameController.java Normal file
View File

@ -0,0 +1,110 @@
package com.fuint.business.petrolStationManagement.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilName;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.service.OilNameService;
import com.fuint.business.petrolStationManagement.service.OilNumberService;
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.*;
import javax.annotation.Resource;
/**
* 油号表控制层
*
* @author wangh
* @since 2023-10-11 16:36:02
*/
@Api(tags="油站管理-")
@RestController
@RequestMapping("/business/petrolStationManagement/oilName")
public class OilNameController extends BaseController {
/**
* 服务对象
*/
@Resource
private OilNameService oilNameService;
@GetMapping("getList")
public ResponseObject selectAll (OilName oilName) {
return getSuccessResult(oilNameService.oilNameListByType(oilName));
}
// /**
// * 分页查询所有数据
// */
// @ApiOperation("查询所有油号")
// @GetMapping("getList")
// public ResponseObject selectAll(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
// @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
// OilNumber oilNumber) {
// Page page =new Page(pageNo,pageSize);
// IPage<OilNumber> list = oilPresetPricesService.selectOilNumberList(page,oilNumber);
// return getSuccessResult(list);
// }
//
// /**
// * 通过主键查询单条数据
// *
// * @param id 主键
// * @return 单条数据
// */
// @GetMapping("{id}")
// public ResponseObject selectOne(@PathVariable Integer id) {
// OilNumber oilNumber = oilPresetPricesService.selectOilNumberById(id);
// return getSuccessResult(oilNumber);
// }
//
// /**
// * 新增数据
// *
// * @param oilNumber 实体对象
// * @return 新增结果
// */
// @PostMapping
// public ResponseObject insert(@RequestBody OilNumber oilNumber) {
// return getSuccessResult(oilPresetPricesService.insertOilNumber(oilNumber));
// }
//
// /**
// * 修改数据
// *
// * @param oilNumber 实体对象
// * @return 修改结果
// */
// @PutMapping
// public ResponseObject update(@RequestBody OilNumber oilNumber) {
// return getSuccessResult(oilPresetPricesService.updateOilNumber(oilNumber));
// }
//
// /**
// * 删除数据
// *
// * @return 删除结果
// */
// @DeleteMapping("/{id}")
// public ResponseObject delete(@PathVariable Integer id) {
// return getSuccessResult(this.oilPresetPricesService.deleteOilNumberById(id));
// }
/**
* 关联油的类型
*/
// @GetMapping("")
// public ResponseObject getOilDic(){
//// return getSuccessResult(this.oilPresetPricesService.deleteOilNumberById());
// }
}

50
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java
View File

@ -3,13 +3,17 @@ 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;
import com.fuint.business.member.entity.LJStaff;
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.*;
@ -27,7 +31,7 @@ import java.util.List;
@Api(tags="油站管理-油号管理")
@RestController
@RequestMapping("/business/petrolStationManagement/oilNumber")
public class OilNumberController extends ApiController {
public class OilNumberController extends BaseController {
/**
* 服务对象
*/
@ -36,14 +40,15 @@ public class OilNumberController extends ApiController {
/**
* 分页查询所有数据
*
* @param page 分页对象
* @return 所有数据
*/
@ApiOperation("查询所有油号")
@GetMapping("getList")
public R selectAll(Page<OilNumber> page, OilNumber oilNumber) {
return success(this.oilPresetPricesService.page(page, new QueryWrapper<>(oilNumber)));
public ResponseObject selectAll(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
OilNumber oilNumber) {
Page page =new Page(pageNo,pageSize);
IPage<OilNumber> list = oilPresetPricesService.selectOilNumberList(page,oilNumber);
return getSuccessResult(list);
}
/**
@ -53,8 +58,9 @@ public class OilNumberController extends ApiController {
* @return 单条数据
*/
@GetMapping("{id}")
public R selectOne(@PathVariable Serializable id) {
return success(this.oilPresetPricesService.getById(id));
public ResponseObject selectOne(@PathVariable Integer id) {
OilNumber oilNumber = oilPresetPricesService.selectOilNumberById(id);
return getSuccessResult(oilNumber);
}
/**
@ -64,8 +70,8 @@ public class OilNumberController extends ApiController {
* @return 新增结果
*/
@PostMapping
public R insert(@RequestBody OilNumber oilNumber) {
return success(this.oilPresetPricesService.save(oilNumber));
public ResponseObject insert(@RequestBody OilNumber oilNumber) {
return getSuccessResult(oilPresetPricesService.insertOilNumber(oilNumber));
}
/**
@ -75,19 +81,31 @@ public class OilNumberController extends ApiController {
* @return 修改结果
*/
@PutMapping
public R update(@RequestBody OilNumber oilNumber) {
return success(this.oilPresetPricesService.updateById(oilNumber));
public ResponseObject update(@RequestBody OilNumber oilNumber) {
return getSuccessResult(oilPresetPricesService.updateOilNumber(oilNumber));
}
/**
* 删除数据
*
* @param idList 主键结合
* @return 删除结果
*/
@DeleteMapping
public R delete(@RequestParam("idList") List<Long> idList) {
return success(this.oilPresetPricesService.removeByIds(idList));
@DeleteMapping("/{id}")
public ResponseObject delete(@PathVariable Integer id) {
return getSuccessResult(this.oilPresetPricesService.deleteOilNumberById(id));
}
/**
* 关联油的类型
*/
// @GetMapping("")
// public ResponseObject getOilDic(){
//// return getSuccessResult(this.oilPresetPricesService.deleteOilNumberById());
// }
}

29
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilName.java Normal file
View File

@ -0,0 +1,29 @@
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;
/**
* 油号表控制层
*
* @author wangh
* @since 2023-10-11 16:36:02
*/
@ApiModel("油品数据")
@Data
public class OilName extends Model<OilName> {
@ApiModelProperty("商户名")
public Long numberId; //id（主键)
private String oilType; // 油品类型
private String oilName; //油品名称
private Double oilPrice; //油品单价
private String createTime; //创建时间
private String updateTime; //更新时间
private String state; // 状态 启用或禁用（0禁用1启用）
private String sort; //排序
private String remark; //
private String ifDelete; //
}

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilNameMapper.java Normal file
View File

@ -0,0 +1,13 @@
package com.fuint.business.petrolStationManagement.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.business.petrolStationManagement.entity.OilName;
import java.util.List;
public interface OilNameMapper extends BaseMapper<OilName> {
// 根据字典油的类型查询
List<OilName> oilNameListByType(OilName oilName);
}

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNameMapper.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.petrolStationManagement.mapper.OilNameMapper">
<select id="oilNameListByType" resultType="com.fuint.business.petrolStationManagement.entity.OilName">
select * from oil_name where oil_type = #{oilType}
</select>
</mapper>

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

@ -40,31 +40,35 @@
where number_id = #{numberId}
</select>
<insert id="insertOilNumber">
insert into oil_number(
insert into oil_number
<trim prefix="(" suffix=")" suffixOverrides="," >
<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="receivingUnits != 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 (
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<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=" receivingUnits != null">#{receivingUnits},</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>
)
</trim>
</insert>
<update id="updateOilNumber">
update oil_number
@ -73,7 +77,7 @@
<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=" receivingUnits != 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>

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

@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>

56
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilNameService.java Normal file
View File

@ -0,0 +1,56 @@
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.OilName;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
*
* @since 2023-10-11 13:17:02
*/
public interface OilNameService extends IService<OilName> {
// 根据字典油的类型查询
List<OilName> oilNameListByType(OilName oilName);
// /**
// * 根据条件分页查询员工信息
// * @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);
}

55
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNameServiceImpl.java Normal file
View File

@ -0,0 +1,55 @@
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.OilName;
import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.mapper.OilNameMapper;
import com.fuint.business.petrolStationManagement.mapper.OilNumberMapper;
import com.fuint.business.petrolStationManagement.service.OilNameService;
import com.fuint.business.petrolStationManagement.service.OilNumberService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (OilNumber)表服务实现类
*
* @author
* @since 2023-10-11 13:17:02
*/
@Service
public class OilNameServiceImpl extends ServiceImpl<OilNameMapper, OilName> implements OilNameService {
@Override
public List<OilName> oilNameListByType(OilName oilName) {
return baseMapper.oilNameListByType(oilName);
}
// @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);
// }
}

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

@ -6,8 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import com.fuint.business.petrolStationManagement.mapper.OilPresetPricesMapper;
import com.fuint.business.petrolStationManagement.service.OilPresetPricesService;
import com.fuint.common.util.DateUtil;
import org.springframework.stereotype.Service;
import javax.xml.crypto.Data;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
* (ChainStoreInfo)表服务实现类
*
@ -36,11 +41,19 @@ public class OilPresetPricesServiceImpl extends ServiceImpl<OilPresetPricesMappe
@Override
public int insertOilPresetPrices(OilPresetPrices presetPrices) {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
String format = sdf.format(date);
presetPrices.setCreateTime(format);
presetPrices.setUpdateTime(format);
return baseMapper.insertOilPresetPrices(presetPrices);
}
@Override
public int updateOilPresetPrices(OilPresetPrices presetPrices) {
return baseMapper.insertOilPresetPrices(presetPrices);
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
String format = sdf.format(date);
presetPrices.setUpdateTime(format); return baseMapper.insertOilPresetPrices(presetPrices);
}
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/controller/SysDictDataController.java
View File

@ -60,6 +60,7 @@ public class SysDictDataController extends BaseController
@GetMapping(value = "/type/{dictType}")
public ResponseObject dictType(@PathVariable String dictType)
{
System.out.println("ddddd"+dictType);
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (CollectionUtils.isEmpty(data))
{