diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java index 991c473a0..bcf8106ff 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java @@ -164,4 +164,15 @@ public class PileBillingTemplateController extends BaseController { public AjaxResult publishBillingTemplate(@RequestBody PublishBillingTemplateDTO dto) { return toAjax(pileRemoteService.publishBillingTemplate(dto)); } + + + /** + * 修改站点计费模板状态并下发 + * @param pileBillingTemplate + * @return + */ + @PostMapping("/changeStationTemplate") + public AjaxResult changeStationTemplate(@RequestBody PileBillingTemplate pileBillingTemplate) { + return toAjax(pileBillingTemplateService.updatePileBillingTemplate(pileBillingTemplate)); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java index 1b071db0b..3df6cc7a6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java @@ -160,4 +160,11 @@ public interface IPileBillingTemplateService { CurrentTimePriceDetails getCurrentTimePriceDetails(String stationId); List queryBillingDetailById(Long id); + + /** + * 修改站点计费模板状态并下发最新模板 + * @param pileBillingTemplate + * @return + */ + int changeStationTemplate(PileBillingTemplate pileBillingTemplate); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 96d7188bc..b668e6758 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -379,6 +379,22 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi return pileBillingDetails; } + /** + * 修改站点计费模板状态并下发最新模板 + * @param pileBillingTemplate + * @return + */ + @Override + public int changeStationTemplate(PileBillingTemplate pileBillingTemplate) { + // 先将以前正在使用的模板查出来，状态改为0 + + // 将当前这条模板状态改为1 + + // 下发站点下所有桩 + + return 0; + } + @Override public List queryPublicBillingTemplateList() { return pileBillingTemplateMapper.queryPublicBillingTemplateList(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java index d7237d561..e41f5b286 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java @@ -28,6 +28,9 @@ public class BillingTemplateVO { // 计费模板名称 private String templateName; + // 计费模板状态 + private String status; + // 计费模板备注 private String remark; diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index cf8a43ac3..638eff9da 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -291,6 +291,7 @@ t2.id as templateId, t2.template_code as templateCode, t2.name as templateName, + t2.status, t2.remark as remark, t2.type as deviceType, t2.publish_time as publishTime, diff --git a/jsowell-ui/src/api/billing/template.js b/jsowell-ui/src/api/billing/template.js index b6620c847..5cf6fc158 100644 --- a/jsowell-ui/src/api/billing/template.js +++ b/jsowell-ui/src/api/billing/template.js @@ -97,4 +97,12 @@ export function publishBillingTemplate(data) { }); } +export function changeStationTemplate(data) { + return request({ + url: "/billing/template/changeStationTemplate", + method: "post", + data: data, + }) +} + // 查询全部计费模板 diff --git a/jsowell-ui/src/views/pile/station/components/billing.vue b/jsowell-ui/src/views/pile/station/components/billing.vue index e0ffee51e..4ef86fcd4 100644 --- a/jsowell-ui/src/views/pile/station/components/billing.vue +++ b/jsowell-ui/src/views/pile/station/components/billing.vue @@ -88,6 +88,17 @@ > + + + @@ -190,14 +201,15 @@ import BondedDevice from "./bondedDevice.vue"; import Expenses from "./expenses.vue"; import { - listTemplate, - delTemplate, - queryStationBillingTemplateList, - queryPublicBillingTemplateList, - stationImportBillingTemplate, - publishBillingTemplate, getTemplate, + listTemplate, + delTemplate, + queryStationBillingTemplateList, + queryPublicBillingTemplateList, + stationImportBillingTemplate, + publishBillingTemplate, getTemplate, updateBillingTemplate, changeStationTemplate, } from "@/api/billing/template.js"; import AddBilling from "../../../billing/template/components/addBilling.vue"; +import {updateStation} from "@/api/pile/station"; export default { components: { BondedDevice, Expenses, AddBilling }, @@ -283,6 +295,17 @@ export default { this.publishTemplateId = ""; }); }, + changeStatus(info) { + const param = { + id: info.templateId, + status: info.status, + } + console.log("param", param); + changeStationTemplate(param).then((response) => { + this.$modal.msgSuccess("修改成功"); + this.getStationBillingTemplateList(); + }); + }, /** 打开导入表弹窗 */ openImportTable() { console.log("111"); @@ -333,7 +356,7 @@ export default { getStationBillingTemplateList() { // console.log("通过站点id查询计费模板", this.stationId) queryStationBillingTemplateList(this.stationId).then((response) => { - // console.log("通过站点id查询计费模板 result: ", response.rows); + console.log("通过站点id查询计费模板 result: ", response.rows); this.stationBillingTemplate = response.rows; }); },