autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 01:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增占桩订单后管页面

Browse Source
This commit is contained in:
Lemon
2023-09-08 09:30:43 +08:00
parent 72699df4dc
commit 557fa69811
10 changed files with 612 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java Normal file
View File

@@ -0,0 +1,99 @@
package com.jsowell.web.controller.pile;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.jsowell.pile.service.OrderPileOccupyService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.pile.domain.OrderPileOccupy;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.common.core.page.TableDataInfo;
/**
* 占桩订单Controller
*
* @author jsowell
* @date 2023-09-08
*/
@RestController
@RequestMapping("/pile/occupy")
public class OrderPileOccupyController extends BaseController {
@Autowired
private OrderPileOccupyService orderPileOccupyService;
/**
* 查询占桩订单列表
*/
@PreAuthorize("@ss.hasPermi('pile:occupy:list')")
@GetMapping("/list")
public TableDataInfo list(OrderPileOccupy orderPileOccupy) {
startPage();
List<OrderPileOccupy> list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy);
return getDataTable(list);
}
/**
* 导出占桩订单列表
*/
@PreAuthorize("@ss.hasPermi('pile:occupy:export')")
@Log(title = "占桩订单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OrderPileOccupy orderPileOccupy) {
List<OrderPileOccupy> list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy);
ExcelUtil<OrderPileOccupy> util = new ExcelUtil<OrderPileOccupy>(OrderPileOccupy.class);
util.exportExcel(response, list, "占桩订单数据");
}
/**
* 获取占桩订单详细信息
*/
@PreAuthorize("@ss.hasPermi('pile:occupy:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(orderPileOccupyService.selectByPrimaryKey(id.intValue()));
}
/**
* 新增占桩订单
*/
@PreAuthorize("@ss.hasPermi('pile:occupy:add')")
@Log(title = "占桩订单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OrderPileOccupy orderPileOccupy) {
return toAjax(orderPileOccupyService.insert(orderPileOccupy));
}
/**
* 修改占桩订单
*/
@PreAuthorize("@ss.hasPermi('pile:occupy:edit')")
@Log(title = "占桩订单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OrderPileOccupy orderPileOccupy) {
return toAjax(orderPileOccupyService.updateByPrimaryKey(orderPileOccupy));
}
/**
* 删除占桩订单
*/
// @PreAuthorize("@ss.hasPermi('pile:occupy:remove')")
// @Log(title = "占桩订单", businessType = BusinessType.DELETE)
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable Long[] ids)
// {
// return toAjax(orderPileOccupyService.deleteByPrimaryKey(ids));
// }
}

4
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -38,8 +38,8 @@ spring:
master:
url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
#url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: jsowell_prd_copy
# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_prd_copy
password: 123456
# 从库数据源
slave:

9
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java
View File

@@ -113,4 +113,13 @@ public interface OrderPileOccupyMapper {
* @return
*/
OrderPileOccupy queryUnPayOrderByMemberId(String memberId);
/**
* 查询占桩订单列表
*
* @param orderPileOccupy 占桩订单
* @return 占桩订单集合
*/
public List<OrderPileOccupy> selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
}

8
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
View File

@@ -37,6 +37,14 @@ public interface OrderPileOccupyService{
OrderPileOccupy queryByOccupyCode(String occupyCode);
/**
* 查询占桩订单列表
*
* @param orderPileOccupy 占桩订单
* @return 占桩订单集合
*/
public List<OrderPileOccupy> selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
List<OrderPileOccupy> queryOccupyOrderList(QueryOccupyOrderDTO dto);
/**

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
View File

@@ -139,6 +139,11 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
return orderPileOccupyMapper.queryByOccupyCode(occupyCode);
}
@Override
public List<OrderPileOccupy> selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy) {
return orderPileOccupyMapper.selectOrderPileOccupyList(orderPileOccupy);
}
/**
* 查询占桩订单列表
*

21
jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
View File

@@ -905,4 +905,25 @@
order by create_time desc
limit 1
</select>
<select id="selectOrderPileOccupyList" parameterType="com.jsowell.pile.domain.OrderPileOccupy" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from order_pile_occupy
<where>
<if test="occupyCode != null and occupyCode != ''"> and occupy_code = #{occupyCode}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="memberId != null and memberId != ''"> and member_id = #{memberId}</if>
<if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
<if test="orderCode != null and orderCode != ''"> and order_code = #{orderCode}</if>
<if test="transactionCode != null and transactionCode != ''"> and transaction_code = #{transactionCode}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="payStatus != null and payStatus != ''"> and pay_status = #{payStatus}</if>
<if test="orderAmount != null "> and order_amount = #{orderAmount}</if>
<if test="pileSn != null and pileSn != ''"> and pile_sn = #{pileSn}</if>
<if test="connectorCode != null and connectorCode != ''"> and connector_code = #{connectorCode}</if>
<if test="pileConnectorCode != null and pileConnectorCode != ''"> and pile_connector_code = #{pileConnectorCode}</if>
</where>
</select>
</mapper>

44
jsowell-ui/src/api/pile/occupy.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询占桩订单列表
export function listOccupy(query) {
return request({
url: '/pile/occupy/list',
method: 'get',
params: query
})
}
// 查询占桩订单详细
export function getOccupy(id) {
return request({
url: '/pile/occupy/' + id,
method: 'get'
})
}
// 新增占桩订单
export function addOccupy(data) {
return request({
url: '/pile/occupy',
method: 'post',
data: data
})
}
// 修改占桩订单
export function updateOccupy(data) {
return request({
url: '/pile/occupy',
method: 'put',
data: data
})
}
// 删除占桩订单
export function delOccupy(id) {
return request({
url: '/pile/occupy/' + id,
method: 'delete'
})
}

2
jsowell-ui/src/router/index.js
View File

@@ -68,7 +68,7 @@ export const constantRoutes = [
children: [
{
path: "index",
component: () => import("@/views/index"),
component: () => import("@/views/pile/occupy"),
name: "Index",
meta: { title: "首页", icon: "dashboard", affix: true },
},

97
jsowell-ui/src/views/index.vue
View File

@@ -1,97 +0,0 @@
<template>
<div class="app-container home">
<el-tabs type="border-card">
<el-tab-pane label="全部">
<home-index></home-index>
</el-tab-pane>
<!-- <el-tab-pane label="今日">今日</el-tab-pane>-->
<!-- <el-tab-pane label="运营数据大屏">运营数据大屏</el-tab-pane>-->
</el-tabs>
</div>
</template>
<script>
import HomeIndex from "@/views/homeIndex/homeIndex";
export default {
name: "Index",
components: {HomeIndex},
data() {
return {
// 版本号
version: "1.0.0",
};
},
methods: {
goTarget(href) {
window.open(href, "_blank");
},
},
};
</script>
<style scoped lang="scss">
.home {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
font-size: 17.5px;
border-left: 5px solid #eee;
}
hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eee;
}
.col-item {
margin-bottom: 20px;
}
ul {
padding: 0;
margin: 0;
}
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
color: #676a6c;
overflow-x: hidden;
ul {
list-style-type: none;
}
h4 {
margin-top: 0px;
}
h2 {
margin-top: 10px;
font-size: 26px;
font-weight: 100;
}
p {
margin-top: 10px;
b {
font-weight: 700;
}
}
.update-log {
ol {
display: block;
list-style-type: decimal;
margin-block-start: 1em;
margin-block-end: 1em;
margin-inline-start: 0;
margin-inline-end: 0;
padding-inline-start: 40px;
}
}
}
</style>

423
jsowell-ui/src/views/pile/occupy/index.vue Normal file
View File

@@ -0,0 +1,423 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="占桩订单编号" prop="occupyCode">
<el-input
v-model="queryParams.occupyCode"
placeholder="请输入占桩订单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员id" prop="memberId">
<el-input
v-model="queryParams.memberId"
placeholder="请输入会员id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充电站id" prop="stationId">
<el-input
v-model="queryParams.stationId"
placeholder="请输入充电站id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单号" prop="orderCode">
<el-input
v-model="queryParams.orderCode"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="交易流水号" prop="transactionCode">
<el-input
v-model="queryParams.transactionCode"
placeholder="请输入交易流水号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="占桩开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择占桩开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="占桩结束时间" prop="endTime">
<el-date-picker clearable
v-model="queryParams.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择占桩结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="占桩订单金额" prop="orderAmount">
<el-input
v-model="queryParams.orderAmount"
placeholder="请输入占桩订单金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充电桩编号" prop="pileSn">
<el-input
v-model="queryParams.pileSn"
placeholder="请输入充电桩编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充电桩枪口号" prop="connectorCode">
<el-input
v-model="queryParams.connectorCode"
placeholder="请输入充电桩枪口号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="充电桩枪口编号" prop="pileConnectorCode">
<el-input
v-model="queryParams.pileConnectorCode"
placeholder="请输入充电桩枪口编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['pile:occupy:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['pile:occupy:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['pile:occupy:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['pile:occupy:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="occupyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键" align="center" prop="id"/>
<el-table-column label="占桩订单编号" align="center" prop="occupyCode"/>
<el-table-column label="状态" align="center" prop="status"/>
<el-table-column label="会员id" align="center" prop="memberId"/>
<el-table-column label="充电站id" align="center" prop="stationId"/>
<el-table-column label="订单号" align="center" prop="orderCode"/>
<el-table-column label="交易流水号" align="center" prop="transactionCode"/>
<el-table-column label="占桩开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="占桩结束时间" align="center" prop="endTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="支付状态" align="center" prop="payStatus"/>
<el-table-column label="占桩订单金额" align="center" prop="orderAmount"/>
<el-table-column label="充电桩编号" align="center" prop="pileSn"/>
<el-table-column label="充电桩枪口号" align="center" prop="connectorCode"/>
<el-table-column label="充电桩枪口编号" align="center" prop="pileConnectorCode"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pile:occupy:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pile:occupy:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改占桩订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="占桩订单编号" prop="occupyCode">
<el-input v-model="form.occupyCode" placeholder="请输入占桩订单编号"/>
</el-form-item>
<el-form-item label="会员id" prop="memberId">
<el-input v-model="form.memberId" placeholder="请输入会员id"/>
</el-form-item>
<el-form-item label="充电站id" prop="stationId">
<el-input v-model="form.stationId" placeholder="请输入充电站id"/>
</el-form-item>
<el-form-item label="订单号" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入订单号"/>
</el-form-item>
<el-form-item label="交易流水号" prop="transactionCode">
<el-input v-model="form.transactionCode" placeholder="请输入交易流水号"/>
</el-form-item>
<el-form-item label="占桩开始时间" prop="startTime">
<el-date-picker clearable
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择占桩开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="占桩结束时间" prop="endTime">
<el-date-picker clearable
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择占桩结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="占桩订单金额" prop="orderAmount">
<el-input v-model="form.orderAmount" placeholder="请输入占桩订单金额"/>
</el-form-item>
<el-form-item label="充电桩编号" prop="pileSn">
<el-input v-model="form.pileSn" placeholder="请输入充电桩编号"/>
</el-form-item>
<el-form-item label="充电桩枪口号" prop="connectorCode">
<el-input v-model="form.connectorCode" placeholder="请输入充电桩枪口号"/>
</el-form-item>
<el-form-item label="充电桩枪口编号" prop="pileConnectorCode">
<el-input v-model="form.pileConnectorCode" placeholder="请输入充电桩枪口编号"/>
</el-form-item>
<el-form-item label="删除标识" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标识"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {listOccupy, getOccupy, delOccupy, addOccupy, updateOccupy} from "@/api/pile/occupy";
export default {
name: "Occupy",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 占桩订单表格数据
occupyList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
occupyCode: null,
status: null,
memberId: null,
stationId: null,
orderCode: null,
transactionCode: null,
startTime: null,
endTime: null,
payStatus: null,
orderAmount: null,
pileSn: null,
connectorCode: null,
pileConnectorCode: null,
},
// 表单参数
form: {},
// 表单校验
rules: {}
};
},
created() {
this.getList();
},
methods: {
/** 查询占桩订单列表 */
getList() {
this.loading = true;
listOccupy(this.queryParams).then(response => {
this.occupyList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
occupyCode: null,
status: "0",
memberId: null,
stationId: null,
orderCode: null,
transactionCode: null,
startTime: null,
endTime: null,
payStatus: "0",
orderAmount: null,
pileSn: null,
connectorCode: null,
pileConnectorCode: null,
createTime: null,
createBy: null,
updateTime: null,
updateBy: null,
delFlag: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加占桩订单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getOccupy(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改占桩订单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOccupy(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOccupy(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除占桩订单编号为"' + ids + '"的数据项？').then(function () {
return delOccupy(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('pile/occupy/export', {
...this.queryParams
}, `occupy_${new Date().getTime()}.xlsx`)
}
}
};
</script>