From e0be09ffab2d530480e8d1b246821ad84f5fdab1 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 28 Dec 2021 16:30:37 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xhpc-modules/xhpc-log/.gitignore | 35 ++ xhpc-modules/xhpc-log/pom.xml | 132 ++++++ .../java/com/xhpc/log/XhpcLogApplication.java | 22 + .../log/controller/OrderLogController.java | 38 ++ .../log/controller/PileLogController.java | 39 ++ .../log/controller/StationLogController.java | 45 ++ .../log/controller/SystemLogController.java | 30 ++ .../log/domain/XhpcChargeOrderDomain.java | 170 +++++++ .../log/domain/XhpcHistoryOrderDomain.java | 250 +++++++++++ .../xhpc/log/domain/XhpcMessageDomain.java | 54 +++ .../com/xhpc/log/mapper/SysOperLogMapper.java | 18 + .../log/mapper/XhpcChargeOrderMapper.java | 8 + .../log/mapper/XhpcChargingPileMapper.java | 61 +++ .../log/mapper/XhpcChargingStationMapper.java | 33 ++ .../log/mapper/XhpcHistoryOrderMapper.java | 16 + .../xhpc/log/mapper/XhpcMessageMapper.java | 10 + .../com/xhpc/log/service/OrderLogService.java | 14 + .../com/xhpc/log/service/PileLogService.java | 16 + .../xhpc/log/service/StationLogService.java | 16 + .../xhpc/log/service/SystemLogService.java | 11 + .../log/service/impl/OrderLogServiceImpl.java | 31 ++ .../log/service/impl/PileLogServiceImpl.java | 31 ++ .../service/impl/StationLogServiceImpl.java | 34 ++ .../service/impl/SystemLogServiceImpl.java | 22 + .../xhpc-log/src/main/resources/banner.txt | 9 + .../xhpc-log/src/main/resources/bootstrap.yml | 90 ++++ .../xhpc-log/src/main/resources/logback.xml | 75 ++++ .../resources/mapper/SysOperLogMapper.xml | 33 ++ .../mapper/XhpcChargeOrderMapper.xml | 5 + .../mapper/XhpcChargingPileMapper.xml | 423 ++++++++++++++++++ .../mapper/XhpcChargingStationMapper.xml | 50 +++ .../mapper/XhpcHistoryOrderMapper.xml | 41 ++ .../resources/mapper/XhpcMessageMapper.xml | 6 + 33 files changed, 1868 insertions(+) create mode 100644 xhpc-modules/xhpc-log/.gitignore create mode 100644 xhpc-modules/xhpc-log/pom.xml create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/XhpcLogApplication.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcChargeOrderDomain.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcHistoryOrderDomain.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcMessageDomain.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java create mode 100644 xhpc-modules/xhpc-log/src/main/resources/banner.txt create mode 100644 xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml create mode 100644 xhpc-modules/xhpc-log/src/main/resources/logback.xml create mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml create mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml create mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml create mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml create mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml create mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml diff --git a/xhpc-modules/xhpc-log/.gitignore b/xhpc-modules/xhpc-log/.gitignore new file mode 100644 index 00000000..54283dd4 --- /dev/null +++ b/xhpc-modules/xhpc-log/.gitignore @@ -0,0 +1,35 @@ +HELP.md +target/ +.mvn/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea/ +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/xhpc-modules/xhpc-log/pom.xml b/xhpc-modules/xhpc-log/pom.xml new file mode 100644 index 00000000..01edd8a5 --- /dev/null +++ b/xhpc-modules/xhpc-log/pom.xml @@ -0,0 +1,132 @@ + + + + com.ruoyi + xhpc-modules + 3.0.0 + + 4.0.0 + + xhpc-log + + + 日志服务 + + + 8 + 8 + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + org.mybatis + mybatis + 3.5.6 + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-starter-web + + + + + mysql + mysql-connector-java + + + + + com.ruoyi + ruoyi-common-datasource + + + + + com.ruoyi + ruoyi-common-core + + + + com.ruoyi + xhpc-common + 3.0.0 + compile + + + + org.apache.ant + ant + 1.10.12 + + + com.aliyun.oss + aliyun-sdk-oss + 3.10.2 + compile + + + + + + ${project.artifactId} + + + src/main/resources + + + src/main/java + + **/*.xml + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.4.0 + + + + repackage + + + + + + + + diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/XhpcLogApplication.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/XhpcLogApplication.java new file mode 100644 index 00000000..cbb90fdd --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/XhpcLogApplication.java @@ -0,0 +1,22 @@ +package com.xhpc.log; + +import com.xhpc.common.security.annotation.EnableCustomConfig; +import com.xhpc.common.security.annotation.EnableRyFeignClients; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + + +@EnableCustomConfig +@SpringBootApplication +@EnableRyFeignClients +@EnableDiscoveryClient +@MapperScan("com.xhpc.log.mapper") +public class XhpcLogApplication { + + public static void main(String[] args) { + + SpringApplication.run(XhpcLogApplication.class, args); + } +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java new file mode 100644 index 00000000..a4f84ec0 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java @@ -0,0 +1,38 @@ +package com.xhpc.log.controller; + +import com.xhpc.common.core.web.controller.BaseController; +import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.log.service.OrderLogService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +/** + * 订单报文日志 + */ +@RestController +@RequestMapping("/log/order/") +public class OrderLogController extends BaseController { + + @Resource + OrderLogService orderLogService; + + @GetMapping("/getPage") + public TableDataInfo getOrderPage(){ + startPage(); + + return getDataTable(orderLogService.getOrderPage()); + } + + + @GetMapping("/order/{orderId}") + public TableDataInfo getOrderDetailPage(@PathVariable("orderId") String orderId){ + startPage(); + return getDataTable(orderLogService.getOrderDetailPage(orderId)); + } + +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java new file mode 100644 index 00000000..d7a955dc --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java @@ -0,0 +1,39 @@ +package com.xhpc.log.controller; + + +import com.xhpc.common.core.web.controller.BaseController; +import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.log.service.PileLogService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +/** + * 桩运行日志 + */ +@RestController +@RequestMapping("/log/pile") +public class PileLogController extends BaseController { + + @Resource + PileLogService pileLogService; + + + @GetMapping("/getPage") + public TableDataInfo getPilePage() { + startPage(); + return getDataTable(pileLogService.getPilePage()); + } + + + @GetMapping("/pile/{pileId}") + public TableDataInfo getPileDetailPage(@PathVariable("pileId") Long pileId) { + startPage(); + return getDataTable(pileLogService.getPileRunLogPage(pileId)); + } + +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java new file mode 100644 index 00000000..d7df3d68 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java @@ -0,0 +1,45 @@ +package com.xhpc.log.controller; + + +import com.xhpc.common.core.utils.SecurityUtils; +import com.xhpc.common.core.web.controller.BaseController; +import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.log.service.PileLogService; +import com.xhpc.log.service.StationLogService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/log/station") +public class StationLogController extends BaseController { + + + @Resource + StationLogService stationLogService; + + @GetMapping("/getPage") + public TableDataInfo getPilePage() { + startPage(); + Long operatorId = SecurityUtils.getUserId(); + int type = 1; + return getDataTable(stationLogService.getStationPage(operatorId, type)); + } + + + @GetMapping("/pile/{pileId}") + public TableDataInfo getPileDetailPage(@PathVariable("pileId") Long pileId) { + startPage(); + return getDataTable(stationLogService.getStationRatePage(pileId)); + } + + + @GetMapping("/rate/{rateId}") + public AjaxResult getRateInfo(@PathVariable("rateId") Integer rateId) { + return AjaxResult.success(stationLogService.getRateInfo(rateId)); + } +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java new file mode 100644 index 00000000..761a201b --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java @@ -0,0 +1,30 @@ +package com.xhpc.log.controller; + + +import com.xhpc.common.core.web.controller.BaseController; +import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.log.service.SystemLogService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 系统操作日志 + */ +@RestController +@RequestMapping("/log/system") +public class SystemLogController extends BaseController { + + + @Resource + SystemLogService systemLogService; + + + @GetMapping("/getPage") + public TableDataInfo getPage(){ + startPage(); + return getDataTable(systemLogService.getPage(null)); + } +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcChargeOrderDomain.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcChargeOrderDomain.java new file mode 100644 index 00000000..2279e246 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcChargeOrderDomain.java @@ -0,0 +1,170 @@ +package com.xhpc.log.domain; + +import lombok.Data; + +import javax.persistence.Table; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +@Data +@Table(name="xhpc_charge_order") +public class XhpcChargeOrderDomain implements Serializable { + /** + * 充电订单id + */ + private Long chargeOrderId; + + /** + * 电站id + */ + private Long chargingStationId; + + /** + * 用户id + */ + private Long userId; + + /** + * 终端id + */ + private Long terminalId; + + /** + * 互联网流水订单号 + */ + private String internetSerialNumber; + + /** + * 订单编号 + */ + private String serialNumber; + + /** + * 充电启始soc + */ + private String startSoc; + + /** + * 结束soc + */ + private String endSoc; + + /** + * 订单来源（0C端用户 1流量用户） + */ + private Integer source; + + /** + * 状态（-1准备充电 0开始充电 1自动结算，2异常，3平台结算） + */ + private Integer status; + + /** + * 删除标志（0代表存在 1代表删除） + */ + private Integer delFlag; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建者 + */ + private String createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 备注 + */ + private String remark; + + /** + * 费率模型id + */ + private Long rateModelId; + + /** + * 充电方式 + */ + private String chargingMode; + + /** + * 开始充电时间 + */ + private Date startTime; + + /** + * 结束充电时间 + */ + private Date endTime; + + /** + * 充电时长 + */ + private String chargingTime; + + /** + * 充电度数 + */ + private BigDecimal chargingDegree; + + /** + * 协议定,停止方式 + */ + private Integer type; + + /** + * 异常备注 + */ + private String erroRemark; + + /** + * 总金额 + */ + private BigDecimal amountCharged; + + /** + * 功率 + */ + private String power; + + /** + * 充电时长（秒） + */ + private Long chargingTimeNumber; + + /** + * 司机唯一标识（手机号） + */ + private String driverId; + + /** + * 充电金额 + */ + private Integer chargingAmt; + + /** + * 车牌 + */ + private String plateNum; + + /** + * 符合Evcs标准的订单号,并非来自第三方的订单号 + */ + private String evcsOrderNo; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcHistoryOrderDomain.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcHistoryOrderDomain.java new file mode 100644 index 00000000..9840e54d --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcHistoryOrderDomain.java @@ -0,0 +1,250 @@ +package com.xhpc.log.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * xhpc_history_order + * @author + */ +@Data +public class XhpcHistoryOrderDomain implements Serializable { + /** + * 历史订单id + */ + private Long historyOrderId; + + /** + * 电站id + */ + private Long chargingStationId; + + /** + * 场站名称 + */ + private String chargingStationName; + + /** + * 充电订单id + */ + private Long chargeOrderId; + + /** + * 用户id + */ + private Long userId; + + /** + * 终端id + */ + private Long terminalId; + + /** + * 订单编号 + */ + private String serialNumber; + + /** + * 流量方订单号 + */ + private String internetSerialNumber; + + /** + * 总电费 + */ + private BigDecimal powerPriceTotal; + + /** + * 总服务费 + */ + private BigDecimal servicePriceTotal; + + /** + * 订单总价 + */ + private BigDecimal totalPrice; + + /** + * 电站活动抵扣--抵扣的总金额 + */ + private BigDecimal promotionDiscount; + + /** + * 实际价格-用户支付的钱 + */ + private BigDecimal actPrice; + + /** + * 实收电费-运营商电费 + */ + private BigDecimal actPowerPrice; + + /** + * 实收服务费-运营商服务费 + */ + private BigDecimal actServicePrice; + + /** + * 流量方总金额抽成 + */ + private BigDecimal internetCommission; + + /** + * 流量方服务费抽成 + */ + private BigDecimal internetSvcCommission; + + /** + * 平台总金额抽成 + */ + private BigDecimal platformCommission; + + /** + * 平台服务费抽成 + */ + private BigDecimal platformSvcCommisssion; + + /** + * 运维总抽成 + */ + private BigDecimal operationCommission; + + /** + * 运维服务费抽成 + */ + private BigDecimal operationSvcCommission; + + /** + * 开始充电soc + */ + private String startSoc; + + /** + * 结束时soc + */ + private String endSoc; + + /** + * 对账状态（0待确认 1已确认，2待提交，3待审核） + */ + private Integer reconciliationStatus; + + /** + * 清分状态（0待清分 1清分在途，2已提现，3待提交，4待审核） + */ + private Integer sortingStatus; + + /** + * 1 自动结算 2 平台结算 + */ + private Byte type; + + /** + * 状态（0正常 1停用） + */ + private Integer status; + + /** + * 删除标志（0代表存在 2代表删除） + */ + private Integer delFlag; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建者 + */ + private String createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 备注 + */ + private String remark; + + /** + * 0未统计 1小时统计 2 其他统计 + */ + private Integer state; + + /** + * VIN 码 + */ + private String vinNormal; + + private String searchValue; + + /** + * 运营商在EVCS分配的唯一OperatorID + */ + private String operatorIdEvcs; + + private Integer chargeModelEvcs; + + private Double connectorPowerEvcs; + + private Double meterValueEndEvcs; + + private Double meterValueStartEvcs; + + private String operatorId3rdptyEvcs; + + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + + private Integer stopReasonEvcs; + + private Double totalPower; + + private String userNameEvcs; + + private String phone; + + /** + * 互联网订单流水号 + */ + private String evcsOrderNo; + + /** + * -1:未推送/推送失败 0:成功 1:争议交易 2～99:自定义 + */ + private Integer confirmResult; + + private Long rateModelId; + + /** + * 充电方式 + */ + private String chargingMode; + + /** + * 充电度数 + */ + private Double chargingDegree; + + /** + * 充电时长 + */ + private String chargingTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcMessageDomain.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcMessageDomain.java new file mode 100644 index 00000000..1f097d60 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcMessageDomain.java @@ -0,0 +1,54 @@ +package com.xhpc.log.domain; + +import com.xhpc.common.core.web.domain.BaseEntity; + +/** + * program: ruoyi + * User: HongYun + * Date:2021-09-13 15 + */ +public class XhpcMessageDomain extends BaseEntity { + + private Long messageId; + private String chargeOrderNo; + private String content; + private Integer status; + + public Long getMessageId() { + + return messageId; + } + + public void setMessageId(Long messageId) { + + this.messageId = messageId; + } + + public String getChargeOrderNo() { + + return chargeOrderNo; + } + + public void setChargeOrderNo(String chargeOrderNo) { + + this.chargeOrderNo = chargeOrderNo; + } + + public String getContent() { + + return content; + } + + public void setContent(String content) { + + this.content = content; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java new file mode 100644 index 00000000..271095f5 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java @@ -0,0 +1,18 @@ +package com.xhpc.log.mapper; + +import com.xhpc.system.api.domain.SysOperLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 操作日志 数据层 + * + * @author ruoyi + */ +public interface SysOperLogMapper { + + List> selectUserOperLog(@Param("operName") String operName); + +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java new file mode 100644 index 00000000..2d3d33de --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java @@ -0,0 +1,8 @@ +package com.xhpc.log.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface XhpcChargeOrderMapper { + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java new file mode 100644 index 00000000..138406e2 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java @@ -0,0 +1,61 @@ +package com.xhpc.log.mapper; + +import com.xhpc.common.domain.XhpcChargingPile; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @author yuyang + * @date 2021/7/27 14:37 + */ +public interface XhpcChargingPileMapper { + + + /** + * 桩列表 + * + * @param serialNumber 桩编号 + * @param type 桩类型 + * @param name 桩名称 + * @return + */ + List> selectXhpcChargingPileList(@Param("operatorId")Long operatorId, @Param("number")Integer number); + + /** + * 终端 + * + * @param xhpcChargingPile 终端 + * @return 结果 + */ + int addXhpcChargingPile(XhpcChargingPile xhpcChargingPile); + + + /** + * 查询电站 + * + * @param chargingStationId 电站ID + * @return 电站 + */ + Map selectXhpcChargingStationById(Long chargingStationId); + + /** + * 查询桩 + * + * @param chargingPileId 终端ID + * @return 电站 + */ + XhpcChargingPile selectXhpcChargingPileById(Long chargingPileId); + + /** + * 终端列表 + * + * @param chargingPileId 桩id + * @return + */ + List> selectXhpcTerminalList(@Param("chargingPileId") Long chargingPileId); + + + XhpcChargingPile getXhpcChargingPileBySerialNumber(@Param("serialNumber") String serialNumber); +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java new file mode 100644 index 00000000..c524be44 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java @@ -0,0 +1,33 @@ +package com.xhpc.log.mapper; + +import com.xhpc.common.domain.XhpcChargingStation; +import com.xhpc.common.domain.XhpcRate; +import com.xhpc.common.domain.XhpcRateModel; +import com.xhpc.common.domain.XhpcRateTime; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * 电站Mapper接口 + * + * @author yuyang + * @date 2021-07-19 + */ +public interface XhpcChargingStationMapper { + + /** + * 查询电站列表 + * + * @return 电站集合 + */ + List> selectXhpcChargingStationList(@Param("operatorId")Long operatorId,@Param("type")Integer type); + + + List> selectRateListByStationId(@Param("stationId")Long stationId); + + + List> selectRateTimeListByRateId(@Param("rateId")Integer rateId); +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java new file mode 100644 index 00000000..9b682b16 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java @@ -0,0 +1,16 @@ +package com.xhpc.log.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface XhpcHistoryOrderMapper { + + + List> getOrderPage(@Param("operatorId") Long operatorId, @Param("number") Integer number); + + List> getOrderMessagePage(@Param("serialNumber")String serialNumber); +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java new file mode 100644 index 00000000..c44a3106 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java @@ -0,0 +1,10 @@ +package com.xhpc.log.mapper; + + +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface XhpcMessageMapper { + +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java new file mode 100644 index 00000000..f1841056 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java @@ -0,0 +1,14 @@ +package com.xhpc.log.service; + +import java.util.List; +import java.util.Map; + +public interface OrderLogService { + + + List> getOrderPage(); + + + List> getOrderDetailPage(String orderId); + +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java new file mode 100644 index 00000000..adaf23f1 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java @@ -0,0 +1,16 @@ +package com.xhpc.log.service; + +import com.xhpc.common.domain.XhpcChargingPile; + +import java.util.List; +import java.util.Map; + +public interface PileLogService { + + + List> getPilePage(); + + + List> getPileRunLogPage(Long pileId); + +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java new file mode 100644 index 00000000..b21b7b27 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java @@ -0,0 +1,16 @@ +package com.xhpc.log.service; + +import java.util.List; +import java.util.Map; + +public interface StationLogService { + + + List> getStationPage(Long operatorId, int type); + + + List> getStationRatePage(Long stationId); + + + List> getRateInfo(int rateId); +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java new file mode 100644 index 00000000..4008e008 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java @@ -0,0 +1,11 @@ +package com.xhpc.log.service; + + +import java.util.List; +import java.util.Map; + +public interface SystemLogService { + + List> getPage(String userName); + +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java new file mode 100644 index 00000000..424fc235 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java @@ -0,0 +1,31 @@ +package com.xhpc.log.service.impl; + + +import com.xhpc.common.core.utils.SecurityUtils; +import com.xhpc.log.mapper.XhpcHistoryOrderMapper; +import com.xhpc.log.service.OrderLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Service +public class OrderLogServiceImpl implements OrderLogService { + + @Resource + XhpcHistoryOrderMapper historyOrderMapper; + + + @Override + public List> getOrderPage(){ + Long operatorId = SecurityUtils.getUserId(); + return historyOrderMapper.getOrderPage(operatorId, 1); + } + + + @Override + public List> getOrderDetailPage(String orderId){ + return historyOrderMapper.getOrderMessagePage(orderId); + } +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java new file mode 100644 index 00000000..1c1deb63 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java @@ -0,0 +1,31 @@ +package com.xhpc.log.service.impl; + +import com.xhpc.common.core.utils.SecurityUtils; +import com.xhpc.log.mapper.XhpcChargingPileMapper; +import com.xhpc.log.service.PileLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + + +@Service +public class PileLogServiceImpl implements PileLogService { + + @Resource + XhpcChargingPileMapper pileMapper; + + @Override + public List> getPilePage(){ + Long operatorId = SecurityUtils.getUserId(); + return pileMapper.selectXhpcChargingPileList(operatorId , 1); + } + + + @Override + public List> getPileRunLogPage(Long pileId){ + // todo 待完善电桩运行日志 + return null; + } +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java new file mode 100644 index 00000000..eaae787e --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java @@ -0,0 +1,34 @@ +package com.xhpc.log.service.impl; + +import com.xhpc.log.mapper.XhpcChargingStationMapper; +import com.xhpc.log.service.StationLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + + +@Service +public class StationLogServiceImpl implements StationLogService { + + @Resource + XhpcChargingStationMapper stationMapper; + + @Override + public List> getStationPage(Long operatorId, int type){ + return stationMapper.selectXhpcChargingStationList(operatorId, type); + } + + + @Override + public List> getStationRatePage(Long stationId){ + return stationMapper.selectRateListByStationId(stationId); + } + + + @Override + public List> getRateInfo(int rateId){ + return stationMapper.selectRateTimeListByRateId(rateId); + } +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java new file mode 100644 index 00000000..1f780455 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java @@ -0,0 +1,22 @@ +package com.xhpc.log.service.impl; + +import com.xhpc.log.mapper.SysOperLogMapper; +import com.xhpc.log.service.SystemLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + + +@Service +public class SystemLogServiceImpl implements SystemLogService { + + @Resource + SysOperLogMapper operLogMapper; + + @Override + public List> getPage(String userName){ + return operLogMapper.selectUserOperLog(userName); + } +} diff --git a/xhpc-modules/xhpc-log/src/main/resources/banner.txt b/xhpc-modules/xhpc-log/src/main/resources/banner.txt new file mode 100644 index 00000000..be49df70 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/banner.txt @@ -0,0 +1,9 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + + ,--. +,--. ,--. | ,---. ,---. ,---. + \ `' / | .-. | | .-. | | .--' + / /. \ | | | | | '-' ' \ `--. +'--' '--' `--' `--' | |-' `---' + `--' diff --git a/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..ac095b69 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml @@ -0,0 +1,90 @@ + +# Tomcat +server: + port: 8890 + +# Spring +spring: + application: + # 应用名称 + name: xhpc-log + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + root: info + com.xhpc.tradebill.mapper: debug + + file: + path: "d:\\logs" + + pattern: + console: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n' + file: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n' + +wx: + pay: + appId: "wxd0a48e00319ef8a7" + mchId: "1514355771" + mchKey: "sichuanxianghuakejiyouxiangongsi" + keyPath: + + +alibaba: + pay: + gatewayDomain: "https://openapi.alipay.com/gateway.do" + serverDomain: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl" + publicKey: + privateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ" + appId: "2021002156615717" + certPath: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt" + publicCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt" + rootCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt" + +###获取微信openid地址 +#WXGETJSCODE: "https://api.weixin.qq.com/sns/jscode2session?appid=wxb14ef93e9b7901f3&secret=b5c5672141b5930c30a1abee95a2dcbf&js_code=" +###阿里云身份证验证地址 +#VERIFYCARD: "http://idenauthen.market.alicloudapi.com/idenAuthentication" +##阿里云身份证验证地址appcode +#APPCODE: "APPCODE e26d9088b58e24af69411d5933cece47" +##小程序appid +#APPID: "wxd0a48e00319ef8a7" +##小程序绑定商户id +#MCHID: "1514355771" +##商户后台设置的key +#KEY: "sichuanxianghuakejiyouxiangongsi" +##微信小程序支付地址 +#WXPAYUNIFIEDORDER: "https://api.mch.weixin.qq.com/pay/unifiedorder" +##微信支付回调地址 +#SERVERDOMAIN: "http://www.scxhua.cn/prod-api/xhpc-payment/wx/paymentCallback" +##微信小程序支付地址 +#WXTRANSFERS: "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers" + +##支付宝支付回调地址 +#ALIPAYPSERVERDOMAIN: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl" +##支付宝公钥 +#ALIPAYPUBLICKEY: +##应用私钥 +#ALIPAYPRIVATEKEY: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ" +##支付宝appid +#ALIPAYAPPID: "2021002156615717" +##应用公钥证书路径 +#CERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt" +##支付宝公钥证书路径 +#PUBLICCERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt" +##支付宝根证书路径 +#ROOTCRETPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt" \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/resources/logback.xml b/xhpc-modules/xhpc-log/src/main/resources/logback.xml new file mode 100644 index 00000000..05979096 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/logback.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml new file mode 100644 index 00000000..8f5bba05 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml @@ -0,0 +1,33 @@ + + + + + + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml new file mode 100644 index 00000000..5201b5fe --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml new file mode 100644 index 00000000..6d643d30 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -0,0 +1,423 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select charging_pile_id, + charging_station_id, + name, + national_standard, + power, + auxiliary_power_supply, + input_voltage, + max_voltage, + min_voltage, + max_electric_current, + min_electric_current, + serial_number, + type, + program_version, + network_link_type, + gun_number, + communication_protocol_version, + communication_operator, + sim_card, + rate_model_id, + status, + del_flag, + create_time, + create_by, + update_time, + update_by, + remark, + rate_model_id, + brand_model, + production_date productionDate, + manufacture_name manufactureName, + connector_type connectorType, + current, + equipment_type equipmentType + from xhpc_charging_pile + + + + + insert into xhpc_charging_pile + + + charging_station_id, + + + name, + + + national_standard, + + + power, + + + auxiliary_power_supply, + + + input_voltage, + + + max_voltage, + + + min_voltage, + + + max_electric_current, + + + min_electric_current, + + + serial_number, + + + type, + + + program_version, + + + network_link_type, + + + gun_number, + + + communication_protocol_version, + + + communication_operator, + + + sim_card, + + + rate_model_id, + + + status, + + + del_flag, + + + create_time, + + + create_by, + + + update_time, + + + update_by, + + + remark, + + + brand_model, + + + production_date, + + + manufacture_name, + + + connector_type, + + + current, + + + equipment_type + + + + + #{chargingStationId}, + + + #{name}, + + + #{nationalStandard}, + + + #{power}, + + + #{auxiliaryPowerSupply}, + + + #{inputVoltage}, + + + #{maxVoltage}, + + + #{minVoltage}, + + + #{maxElectricCurrent}, + + + #{minElectriCurrent}, + + + #{serialNumber}, + + + #{type}, + + + #{programVersion}, + + + #{networkLinkType}, + + + #{gunNumber}, + + + #{communicationProtocolVersion}, + + + #{communicationOperator}, + + + #{simCard}, + + + #{rateModelId}, + + + #{status}, + + + #{delFlag}, + + + #{createTime}, + + + #{createBy}, + + + #{updateTime}, + + + #{updateBy}, + + + #{remark}, + + + #{brandModel}, + + + #{productionDate}, + + + #{manufactureName}, + + + #{connectorType}, + + + #{current}, + + + #{equipmentType} + + + + + + + + + + + + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml new file mode 100644 index 00000000..de6a7cf7 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml new file mode 100644 index 00000000..14ce1797 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml new file mode 100644 index 00000000..af4c71a1 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml @@ -0,0 +1,6 @@ + + + + + From 9a5d2bce56af2ae03104c0c2b5da5fbccdde86f2 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 28 Dec 2021 17:23:15 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=AF=8F=E5=A4=A9=E5=87=8C=E6=99=A8?= =?UTF-8?q?=E4=BA=94=E7=82=B9=E6=B8=85=E7=90=8690=E5=A4=A9=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/mapper/XhpcMessageMapper.java | 4 +++ .../com/xhpc/pp/server/MessageCLeanTask.java | 29 +++++++++++++++++++ .../resources/mapper/XhpcMessageMapper.xml | 5 ++++ 3 files changed, 38 insertions(+) create mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/MessageCLeanTask.java diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcMessageMapper.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcMessageMapper.java index a19c7938..0537b6c9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcMessageMapper.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcMessageMapper.java @@ -13,4 +13,8 @@ import org.apache.ibatis.annotations.Mapper; public interface XhpcMessageMapper { int insertItemsBy(XhpcMessage xhpcMessage); + +// void deleteByLastThreeMonth(String expireDate); + + void deleteByLastThreeMonth(String expireDate); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/MessageCLeanTask.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/MessageCLeanTask.java new file mode 100644 index 00000000..9110b6ef --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/MessageCLeanTask.java @@ -0,0 +1,29 @@ +package com.xhpc.pp.server; + + +import cn.hutool.core.convert.Convert; +import com.xhpc.common.util.DateUtil; +import com.xhpc.mapper.XhpcMessageMapper; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Date; + +@Component +public class MessageCLeanTask { + + @Resource + XhpcMessageMapper messageMapper; + + /** + * 每天定时清理message表三个月前的数据 + */ + @Scheduled(cron = "0 0 05 1/1 * ?") + private void run(){ + + String expireDate = DateUtil.date2String(DateUtil.addDay(new Date(), -90), DateUtil.DATE_FORMAT_DATE_TIME) ; + messageMapper.deleteByLastThreeMonth(expireDate); + + } +} diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcMessageMapper.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcMessageMapper.xml index 5bb1d30e..10048eb6 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcMessageMapper.xml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcMessageMapper.xml @@ -36,4 +36,9 @@ sysdate() ) + + + delete from xhpc_message + where create_time #{expireDate}; + From f8c4acec57deee957495d90f5243969f9dc2b505 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 30 Dec 2021 11:18:19 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=BA=E7=AB=99?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...peEnum.java => PileEquipmentTypeEnum.java} | 8 +-- .../xhpc/common/enums/StationDeviceEnum.java | 52 +++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) rename xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/{EquipmentTypeEnum.java => PileEquipmentTypeEnum.java} (79%) create mode 100644 xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StationDeviceEnum.java diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/EquipmentTypeEnum.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/PileEquipmentTypeEnum.java similarity index 79% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/EquipmentTypeEnum.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/PileEquipmentTypeEnum.java index 20293364..234f0e51 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/EquipmentTypeEnum.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/PileEquipmentTypeEnum.java @@ -4,7 +4,7 @@ package com.xhpc.common.enums; /** * 设备类型 */ -public enum EquipmentTypeEnum { +public enum PileEquipmentTypeEnum { DC(1, "直流设备"), AC(2, "交流设备"), @@ -16,14 +16,14 @@ public enum EquipmentTypeEnum { private final int code; private final String name; - EquipmentTypeEnum(int code, String name){ + PileEquipmentTypeEnum(int code, String name){ this.code = code; this.name = name; } //根据code获取name public static String getNameByCode(int code) { - for (EquipmentTypeEnum typeEnum : EquipmentTypeEnum.values()) { + for (PileEquipmentTypeEnum typeEnum : PileEquipmentTypeEnum.values()) { //移除交办 if (typeEnum.code == code) { return typeEnum.name; @@ -34,7 +34,7 @@ public enum EquipmentTypeEnum { //根据code获取name public static Integer getCodeByName(String name) { - for (EquipmentTypeEnum typeEnum : EquipmentTypeEnum.values()) { + for (PileEquipmentTypeEnum typeEnum : PileEquipmentTypeEnum.values()) { //移除交办 if (typeEnum.name.equals(name)) { return typeEnum.code; diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StationDeviceEnum.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StationDeviceEnum.java new file mode 100644 index 00000000..e3b22ac4 --- /dev/null +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/enums/StationDeviceEnum.java @@ -0,0 +1,52 @@ +package com.xhpc.common.enums; + +public enum StationDeviceEnum { + + STATION("STATION", "充电站"), + PILE("PILE", "充电桩"), + TERMINAL("TERMINAL", "充电终端"), + BARRIER("BARRIER", "道闸"), + GROUND_LOCK("GROUND_LOCK", "地锁") + ; + + + private final String code; + private final String name; + + StationDeviceEnum(String code, String name){ + this.code = code; + this.name = name; + } + + //根据code获取name + public static String getNameByCode(String code) { + for (StationDeviceEnum typeEnum : StationDeviceEnum.values()) { + //移除交办 + if (typeEnum.code.equals(code)) { + return typeEnum.name; + } + } + return ""; + } + + //根据name获取code + public static String getCodeByName(String name) { + for (StationDeviceEnum typeEnum : StationDeviceEnum.values()) { + //移除交办 + if (typeEnum.name.equals(name)) { + return typeEnum.code; + } + } + return null; + } + + public String getCode() { + + return code; + } + + public String getName() { + + return name; + } +} From a81c641d7b7f061b048e35b506b12148a73c879b Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 30 Dec 2021 11:18:53 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=85=E7=94=B5?= =?UTF-8?q?=E6=A1=A9=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pp/logic/BalanceUpdateReplyDataLogic.java | 17 +++++++++++++ .../logic/BmsChargerInterruptDataLogic.java | 18 ++++++++++++-- .../logic/BmsChargingCompletedDataLogic.java | 21 ++++++++++++++-- .../pp/logic/BmsChargingConfigDataLogic.java | 19 ++++++++++++++- .../logic/BmsChargingHandshakeDataLogic.java | 19 ++++++++++++++- .../com/xhpc/pp/logic/BmsErrorDataLogic.java | 18 ++++++++++++-- .../xhpc/pp/logic/BmsInterruptDataLogic.java | 19 +++++++++++++-- .../logic/OfflineCardEraseReplyDataLogic.java | 17 +++++++++++++ .../OfflineCardInquiryReplyDataLogic.java | 16 +++++++++++++ .../logic/OfflineCardSyncReplyDataLogic.java | 15 ++++++++++++ .../pp/logic/PileConfigReplyDataLogic.java | 15 ++++++++++++ .../pp/logic/PileStartChargingDataLogic.java | 15 ++++++++++++ .../logic/PileTimeConfigReplyDataLogic.java | 16 +++++++++++++ .../logic/RateModelConfigReplyDataLogic.java | 24 +++++++++++++++++-- .../xhpc/pp/logic/RateModelRequestLogic.java | 17 +++++++++++++ .../xhpc/pp/logic/RateModelValidateLogic.java | 17 +++++++++++++ .../java/com/xhpc/pp/logic/RegisterLogic.java | 18 ++++++++++++++ .../pp/logic/RemoteRestartReplyDataLogic.java | 16 +++++++++++++ .../pp/logic/RemoteUpgradeReplyDataLogic.java | 17 +++++++++++++ .../java/com/xhpc/pp/server/HBCheckTask.java | 19 +++++++++++++++ .../src/main/resources/bootstrap.yml | 4 ++-- 21 files changed, 343 insertions(+), 14 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java index bcef848f..f04e2295 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java @@ -2,6 +2,9 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.BalanceUpdateReplyData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -10,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,6 +22,9 @@ public class BalanceUpdateReplyDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BalanceUpdateReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -25,6 +32,16 @@ public class BalanceUpdateReplyDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); BalanceUpdateReplyData balanceUpdateReplyData = objectMapper.convertValue(req, BalanceUpdateReplyData.class); log.debug("balanceUpdateResult({}) [{}]", balanceUpdateReplyData.getPileNo(), balanceUpdateReplyData.getModifyResult()); + + String remark = "充电桩余额更新"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java index 2388ca63..5b10bc89 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java @@ -1,7 +1,10 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.mapper.XhpcMessageMapper; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -20,16 +24,26 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargerInterruptDataLogic.class); @Autowired private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { - + String remark = "充电桩与 BMS 充电阶段充电机中止报文"; Map req = sp.getParameters(); XhpcMessage msg = new XhpcMessage(); msg.setContent((String) req.get("hex")); msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电阶段充电机中止报文"); + msg.setRemark(remark); xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java index 77473385..8920327f 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java @@ -1,7 +1,10 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.mapper.XhpcMessageMapper; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -21,15 +25,28 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic { @Autowired private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { - + String remark = "充电桩与 BMS 充电结束阶段报文"; Map req = sp.getParameters(); XhpcMessage msg = new XhpcMessage(); msg.setContent((String) req.get("hex")); msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电结束阶段报文"); + msg.setRemark(remark); xhpcMessageMapper.insertItemsBy(msg); + + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java index 5ed1d189..a8107214 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java @@ -1,7 +1,10 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.mapper.XhpcMessageMapper; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -21,15 +25,28 @@ public class BmsChargingConfigDataLogic implements ServiceLogic { @Autowired private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { + String remark = "充电桩与 BMS 参数配置阶段报文"; Map req = sp.getParameters(); XhpcMessage msg = new XhpcMessage(); msg.setContent((String) req.get("hex")); msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 参数配置阶段报文"); + msg.setRemark(remark); xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java index de34f523..6b25ec30 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java @@ -1,7 +1,10 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.mapper.XhpcMessageMapper; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -21,15 +25,28 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic { @Autowired private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { + String remark = "充电桩与 BMS 充电握手阶段报文"; Map req = sp.getParameters(); XhpcMessage msg = new XhpcMessage(); msg.setContent((String) req.get("hex")); msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电握手阶段报文"); + msg.setRemark(remark); xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java index 8bf5f3f9..c335450d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java @@ -1,7 +1,10 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.mapper.XhpcMessageMapper; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -20,16 +24,26 @@ public class BmsErrorDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsErrorDataLogic.class); @Autowired private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { - + String remark = "充电桩与 BMS 充电错误报文"; Map req = sp.getParameters(); XhpcMessage msg = new XhpcMessage(); msg.setContent((String) req.get("hex")); msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电错误报文"); + msg.setRemark(remark); xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java index d54a5a4b..568f7af9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java @@ -1,7 +1,10 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.mapper.XhpcMessageMapper; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -20,16 +24,27 @@ public class BmsInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsInterruptDataLogic.class); @Autowired private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { - + String remark = "充电桩与 BMS 充电阶段 BMS 中止报文"; Map req = sp.getParameters(); XhpcMessage msg = new XhpcMessage(); msg.setContent((String) req.get("hex")); msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电阶段 BMS 中止报文"); + msg.setRemark(remark); xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java index 603f0762..bb063596 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java @@ -1,5 +1,8 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -8,16 +11,30 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; + @Lazy @Component("OfflineCardEraseReplyDataLogic") public class OfflineCardEraseReplyDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(OfflineCardEraseReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + + @Override public ServiceResult service(ServiceParameter sp) throws Exception { //todo + String remark = "充电桩下发离线卡数据清除"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) sp.getParameters().get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java index 4aaab37d..35cc7aac 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java @@ -1,5 +1,8 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -8,16 +11,29 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; + @Lazy @Component("OfflineCardInquiryReplyDataLogic") public class OfflineCardInquiryReplyDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(OfflineCardInquiryReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { //todo + String remark = "充电桩下发离线卡数据查询"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) sp.getParameters().get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java index 77509aa9..224402f5 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java @@ -2,6 +2,9 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.OfflineCardSyncReplyData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -10,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,6 +22,9 @@ public class OfflineCardSyncReplyDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(OfflineCardSyncReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -25,6 +32,14 @@ public class OfflineCardSyncReplyDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); OfflineCardSyncReplyData offlineCardSyncReplyData = objectMapper.convertValue(req, OfflineCardSyncReplyData.class); //todo + String remark = "充电桩下发离线卡数据同步"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java index 17b899aa..26ea5a1d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java @@ -2,6 +2,9 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileConfigReplyData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -10,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,6 +22,9 @@ public class PileConfigReplyDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(PileConfigReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -25,6 +32,14 @@ public class PileConfigReplyDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); PileConfigReplyData pileConfigReplyData = objectMapper.convertValue(req, PileConfigReplyData.class); //todo + String remark = "充电桩工作参数设置"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java index 29d54cde..d6b0b655 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java @@ -2,6 +2,9 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileStartChargingData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -10,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,6 +22,9 @@ public class PileStartChargingDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(PileStartChargingDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -25,6 +32,14 @@ public class PileStartChargingDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); PileStartChargingData pileStartChargingData = objectMapper.convertValue(req, PileStartChargingData.class); //todo + String remark = "充电桩主动申请起动充电"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java index f531f84b..8f3c89a0 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java @@ -3,6 +3,9 @@ package com.xhpc.pp.logic; import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileTimeConfigReplyData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMAT; @@ -23,6 +27,9 @@ public class PileTimeConfigReplyDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(PileTimeConfigReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -36,6 +43,15 @@ public class PileTimeConfigReplyDataLogic implements ServiceLogic { cachePile.put("configTime", configTime); REDIS.setCacheMap(pk, cachePile); log.debug("({}) set time success√: [{}]", pileNo, configTime); + + String remark = "充电桩同步时钟"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java index cdceb07a..ba98ca30 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java @@ -3,6 +3,9 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.common.data.up.PileConfigReplyData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; @@ -22,6 +26,9 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(RateModelConfigReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -29,6 +36,8 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); PileConfigReplyData pileRateModelConfigReplyData = objectMapper.convertValue(req, PileConfigReplyData.class); String configResult = pileRateModelConfigReplyData.getConfigResult(); + + String result = FAIL; if (HEX_01.equals(configResult)) { // 确定设置成功的rateModelId 可能涉及协议修改 final String pkey = "pile:".concat(pileRateModelConfigReplyData.getPileNo()); @@ -36,9 +45,20 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic { ChargingStationDto cacheStation = REDIS.getCacheObject("station:".concat(cachePile.get("stationId").toString())); cachePile.put("rateModelId", cacheStation.getRateModelId()); REDIS.setCacheMap(pkey, cachePile); - return new ServiceResult(OK); + result = OK; } - return new ServiceResult(FAIL); + + String remark = "充电桩收到计费模型应答"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setReplyContent(result); + deviceMessageMapper.insertByDomain(deviceMessage); + + return new ServiceResult(result); } } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java index a2deb45c..3a1a6f0d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java @@ -4,6 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.common.data.redis.CacheRateModel; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -14,6 +17,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; @@ -26,6 +30,9 @@ public class RateModelRequestLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(RateModelRequestLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -42,6 +49,16 @@ public class RateModelRequestLogic implements ServiceLogic { return new ServiceResult((byte[]) null, ServiceResult.FAIL, json); } String resultStr = translate(pileNo, stationRateModelId, "000A"); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(pileNo); + deviceMessage.setRemark("充电桩计费模型请求"); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setReplyContent(resultStr); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java index ea88cf00..236272b0 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java @@ -1,6 +1,9 @@ package com.xhpc.pp.logic; import com.xhpc.common.api.dto.ChargingStationDto; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; import static cn.hutool.core.util.NumberUtil.isInteger; @@ -23,6 +27,9 @@ public class RateModelValidateLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(RateModelValidateLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -58,6 +65,16 @@ public class RateModelValidateLogic implements ServiceLogic { String resultStr = "680E".concat(seq).concat("0006").concat(pileNo).concat(String.format("%04X", csRateModelId)).concat(hexCode); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(pileNo); + deviceMessage.setRemark("计费模型验证请求"); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setReplyContent(resultStr); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(HexUtils.toBytes(resultStr), resultCode); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java index 04ba2d57..f9205cb8 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java @@ -1,6 +1,9 @@ package com.xhpc.pp.logic; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.evcs.dto.ConnectorStatusInfo; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -11,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Collection; import java.util.Map; import java.util.Set; @@ -27,6 +31,9 @@ public class RegisterLogic implements ServiceLogic { public static final String REGISTERED = "已注册"; private static final Logger log = LoggerFactory.getLogger(RegisterLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -76,6 +83,17 @@ public class RegisterLogic implements ServiceLogic { String seq = seqHex(skey); String resultStr = "680C".concat(seq).concat("0002").concat(pileNo).concat(hexCode); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); + + // 写入设备日志表数据 + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(pileNo); + deviceMessage.setRemark("充电桩登录认证"); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setReplyContent(resultStr); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(HexUtils.toBytes(resultStr), resultCode); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java index 6bc07564..12137040 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java @@ -2,6 +2,9 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileConfigReplyData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -10,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,6 +22,9 @@ public class RemoteRestartReplyDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(RemoteRestartReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -25,6 +32,15 @@ public class RemoteRestartReplyDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); PileConfigReplyData pileConfigReplyData = objectMapper.convertValue(req, PileConfigReplyData.class); //todo + String remark = "充电桩收到远程重启应答"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java index 92f9844b..e28856fa 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java @@ -2,6 +2,9 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; import com.xhpc.common.data.up.PileConfigReplyData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -10,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,6 +22,9 @@ public class RemoteUpgradeReplyDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(RemoteUpgradeReplyDataLogic.class); + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override public ServiceResult service(ServiceParameter sp) throws Exception { @@ -25,6 +32,16 @@ public class RemoteUpgradeReplyDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); PileConfigReplyData pileRateModelConfigReplyData = objectMapper.convertValue(req, PileConfigReplyData.class); //todo + + String remark = "充电桩收到远程更新应答"; + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark(remark); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java index f3f0ebcf..6fc1d521 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java @@ -1,8 +1,14 @@ package com.xhpc.pp.server; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Calendar; import java.util.Map; import java.util.Set; @@ -15,6 +21,9 @@ import static com.xhpc.pp.logic.RegisterLogic.DISCONNECTED; @Component public class HBCheckTask { + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Scheduled(fixedRate = 10000) protected void run() { @@ -29,6 +38,16 @@ public class HBCheckTask { cacheGun.put("statusInt", OFF_LINE); cacheGun.put("status", DISCONNECTED); REDIS.setCacheMap(gunkey, cacheGun); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + + String pileId= StrUtil.sub(gunkey.substring(gunkey.lastIndexOf(":") + 1), 0, -2); + deviceMessage.setSerialNumber(pileId); + deviceMessage.setContent(JSON.toJSONString(cacheGun)); + deviceMessage.setStatus(0); + deviceMessage.setRemark("充电桩心跳掉线"); + deviceMessageMapper.insertByDomain(deviceMessage); } } } diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml index df3a5bc9..8c12f14b 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml @@ -18,10 +18,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8848 config: # 配置中心地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 From c2fafd2c9d1a40119a432498152bc9f767e12fbc Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 30 Dec 2021 11:20:15 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/XhpcChargingPileServiceImpl.java | 4 ++-- .../xhpc/log/controller/OrderLogController.java | 6 ++++-- .../xhpc/log/controller/PileLogController.java | 8 +++++--- .../log/controller/StationLogController.java | 9 ++++----- .../xhpc/log/controller/SystemLogController.java | 2 +- .../xhpc/log/mapper/XhpcHistoryOrderMapper.java | 1 - .../com/xhpc/log/mapper/XhpcMessageMapper.java | 6 ++++++ .../com/xhpc/log/service/OrderLogService.java | 2 +- .../com/xhpc/log/service/PileLogService.java | 4 ++-- .../com/xhpc/log/service/StationLogService.java | 2 +- .../log/service/impl/OrderLogServiceImpl.java | 11 +++++++---- .../log/service/impl/PileLogServiceImpl.java | 16 ++++++++++------ .../log/service/impl/StationLogServiceImpl.java | 2 +- .../main/resources/mapper/SysOperLogMapper.xml | 2 +- .../resources/mapper/XhpcHistoryOrderMapper.xml | 12 ------------ .../main/resources/mapper/XhpcMessageMapper.xml | 11 +++++++++++ 16 files changed, 56 insertions(+), 42 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 0d10e68f..81feb60a 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -18,7 +18,7 @@ import com.xhpc.common.domain.XhpcChargingPile; import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcTerminal; import com.xhpc.common.enums.ConnectorTypeEnum; -import com.xhpc.common.enums.EquipmentTypeEnum; +import com.xhpc.common.enums.PileEquipmentTypeEnum; import com.xhpc.common.enums.PowerTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -345,7 +345,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { pile.setType(PowerTypeEnum.getCodeByName(pile.getTypeName())); pile.setConnectorType(ConnectorTypeEnum.getCodeByName(pile.getConnectorTypeName())); - pile.setEquipmentType(EquipmentTypeEnum.getCodeByName(pile.getEquipmentTypeName())); + pile.setEquipmentType(PileEquipmentTypeEnum.getCodeByName(pile.getEquipmentTypeName())); XhpcChargingStation station = xhpcChargingStationService.selectXhpcChargingStationByName(pile.getChargingStationName()); if(station == null){ diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java index a4f84ec0..a2a8911d 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java @@ -1,5 +1,6 @@ package com.xhpc.log.controller; +import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.OrderLogService; @@ -24,12 +25,13 @@ public class OrderLogController extends BaseController { @GetMapping("/getPage") public TableDataInfo getOrderPage(){ startPage(); + Long operatorId = SecurityUtils.getUserId(); - return getDataTable(orderLogService.getOrderPage()); + return getDataTable(orderLogService.getOrderPage(operatorId, null)); } - @GetMapping("/order/{orderId}") + @GetMapping("/{orderId}") public TableDataInfo getOrderDetailPage(@PathVariable("orderId") String orderId){ startPage(); return getDataTable(orderLogService.getOrderDetailPage(orderId)); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java index d7a955dc..2807957f 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java @@ -1,6 +1,7 @@ package com.xhpc.log.controller; +import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.PileLogService; @@ -25,13 +26,14 @@ public class PileLogController extends BaseController { @GetMapping("/getPage") public TableDataInfo getPilePage() { + Long operatorId = SecurityUtils.getUserId(); startPage(); - return getDataTable(pileLogService.getPilePage()); + return getDataTable(pileLogService.getPilePage(operatorId, null)); } - @GetMapping("/pile/{pileId}") - public TableDataInfo getPileDetailPage(@PathVariable("pileId") Long pileId) { + @GetMapping("/{pileId}") + public TableDataInfo getPileDetailPage(@PathVariable("pileId") String pileId) { startPage(); return getDataTable(pileLogService.getPileRunLogPage(pileId)); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java index d7df3d68..c52ad733 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java @@ -26,15 +26,14 @@ public class StationLogController extends BaseController { public TableDataInfo getPilePage() { startPage(); Long operatorId = SecurityUtils.getUserId(); - int type = 1; - return getDataTable(stationLogService.getStationPage(operatorId, type)); + return getDataTable(stationLogService.getStationPage(operatorId, null)); } - @GetMapping("/pile/{pileId}") - public TableDataInfo getPileDetailPage(@PathVariable("pileId") Long pileId) { + @GetMapping("/{stationId}") + public TableDataInfo getPileDetailPage(@PathVariable("stationId") Long stationId) { startPage(); - return getDataTable(stationLogService.getStationRatePage(pileId)); + return getDataTable(stationLogService.getStationRatePage(stationId)); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java index 761a201b..f90dce2d 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java @@ -22,7 +22,7 @@ public class SystemLogController extends BaseController { SystemLogService systemLogService; - @GetMapping("/getPage") + @GetMapping("/oper/getPage") public TableDataInfo getPage(){ startPage(); return getDataTable(systemLogService.getPage(null)); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java index 9b682b16..609a1244 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java @@ -12,5 +12,4 @@ public interface XhpcHistoryOrderMapper { List> getOrderPage(@Param("operatorId") Long operatorId, @Param("number") Integer number); - List> getOrderMessagePage(@Param("serialNumber")String serialNumber); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java index c44a3106..d0005ac6 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java @@ -2,9 +2,15 @@ package com.xhpc.log.mapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; @Mapper public interface XhpcMessageMapper { + + List> getOrderMessagePage(@Param("serialNumber")String serialNumber); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java index f1841056..244abd4b 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java @@ -6,7 +6,7 @@ import java.util.Map; public interface OrderLogService { - List> getOrderPage(); + List> getOrderPage(Long operatorId, Integer type); List> getOrderDetailPage(String orderId); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java index adaf23f1..84fbb8b6 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java @@ -8,9 +8,9 @@ import java.util.Map; public interface PileLogService { - List> getPilePage(); + List> getPilePage(Long operatorId, Integer type); - List> getPileRunLogPage(Long pileId); + List> getPileRunLogPage(String pileId); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java index b21b7b27..f019d219 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java @@ -6,7 +6,7 @@ import java.util.Map; public interface StationLogService { - List> getStationPage(Long operatorId, int type); + List> getStationPage(Long operatorId, Integer type); List> getStationRatePage(Long stationId); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java index 424fc235..a3174e14 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java @@ -3,6 +3,7 @@ package com.xhpc.log.service.impl; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.log.mapper.XhpcHistoryOrderMapper; +import com.xhpc.log.mapper.XhpcMessageMapper; import com.xhpc.log.service.OrderLogService; import org.springframework.stereotype.Service; @@ -16,16 +17,18 @@ public class OrderLogServiceImpl implements OrderLogService { @Resource XhpcHistoryOrderMapper historyOrderMapper; + @Resource + XhpcMessageMapper messageMapper; + @Override - public List> getOrderPage(){ - Long operatorId = SecurityUtils.getUserId(); - return historyOrderMapper.getOrderPage(operatorId, 1); + public List> getOrderPage(Long operatorId, Integer type){ + return historyOrderMapper.getOrderPage(operatorId, type); } @Override public List> getOrderDetailPage(String orderId){ - return historyOrderMapper.getOrderMessagePage(orderId); + return messageMapper.getOrderMessagePage(orderId); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java index 1c1deb63..d189a809 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java @@ -1,7 +1,9 @@ package com.xhpc.log.service.impl; import com.xhpc.common.core.utils.SecurityUtils; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.log.mapper.XhpcChargingPileMapper; +import com.xhpc.log.mapper.XhpcDeviceMessageMapper; import com.xhpc.log.service.PileLogService; import org.springframework.stereotype.Service; @@ -16,16 +18,18 @@ public class PileLogServiceImpl implements PileLogService { @Resource XhpcChargingPileMapper pileMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + @Override - public List> getPilePage(){ - Long operatorId = SecurityUtils.getUserId(); - return pileMapper.selectXhpcChargingPileList(operatorId , 1); + public List> getPilePage(Long operatorId, Integer type){ + + return pileMapper.selectXhpcChargingPileList(operatorId , type); } @Override - public List> getPileRunLogPage(Long pileId){ - // todo 待完善电桩运行日志 - return null; + public List> getPileRunLogPage(String pileId){ + return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java index eaae787e..2903ce71 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java @@ -16,7 +16,7 @@ public class StationLogServiceImpl implements StationLogService { XhpcChargingStationMapper stationMapper; @Override - public List> getStationPage(Long operatorId, int type){ + public List> getStationPage(Long operatorId, Integer type){ return stationMapper.selectXhpcChargingStationList(operatorId, type); } diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml index 8f5bba05..fb09f884 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml index af4c71a1..6cee0abd 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml @@ -3,4 +3,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + From 0440cfa4fbc32444c8c4154a5360d1896ac6e7cd Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 30 Dec 2021 11:21:34 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=8E=AF=E5=A2=83=E4=B8=BA=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml index 8c12f14b..df3a5bc9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml @@ -18,10 +18,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.31.183.135:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.31.183.135:8848 # 配置文件格式 file-extension: yml # 共享配置 From 6e4de129fef1c7d8dfe30f03378cca3f8365d222 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 31 Dec 2021 10:37:40 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pp/mapper/XhpcDeviceMessageMapper.java | 14 ++++++ .../mapper/XhpcDeviceMessageMapper.xml | 50 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java create mode 100644 xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java new file mode 100644 index 00000000..a0f2fb54 --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java @@ -0,0 +1,14 @@ +package com.xhpc.pp.mapper; + + +import com.xhpc.pp.domain.XhpcDeviceMessage; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface XhpcDeviceMessageMapper { + + int insertByDomain(XhpcDeviceMessage xhpcDeviceMessage); + + + void deleteByLastThreeMonth(String expireDate); +} diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml new file mode 100644 index 00000000..e454c7c6 --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + insert into xhpc_device_message( + type, + serial_number, + content, + reply_content, + status, + create_by, + remark, + update_by, + create_time, + update_time + )values( + #{type}, + #{serialNumber}, + #{content}, + #{replyContent}, + #{status}, + #{createBy}, + #{remark}, + #{updateBy}, + sysdate(), + sysdate() + ) + + + + delete from xhpc_message + where create_time #{expireDate}; + + From 16d4e9bf7e3a99f6e28f742efacf2a7308e3f365 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 31 Dec 2021 10:38:03 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E5=85=85=E7=94=B5=E8=AE=A2=E5=8D=95mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java | 8 -------- .../src/main/resources/mapper/XhpcChargeOrderMapper.xml | 5 ----- 2 files changed, 13 deletions(-) delete mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java delete mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java deleted file mode 100644 index 2d3d33de..00000000 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargeOrderMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.xhpc.log.mapper; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface XhpcChargeOrderMapper { - -} \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml deleted file mode 100644 index 5201b5fe..00000000 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From cbb55697e534276178ec34201df8700bf531dce4 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 31 Dec 2021 16:31:03 +0800 Subject: [PATCH 09/17] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97=E5=86=99=E5=85=A5?= =?UTF-8?q?DB;=202=E3=80=81=E5=AE=9E=E7=8E=B0=E6=A1=A9=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/controller/OrderLogController.java | 1 + .../log/controller/StationLogController.java | 1 - .../log/domain/XhpcDeviceMessageDomain.java | 32 +++++++++++++++++++ .../com/xhpc/log/mapper/SysOperLogMapper.java | 1 - .../log/mapper/XhpcChargingStationMapper.java | 5 --- .../log/mapper/XhpcDeviceMessageMapper.java | 15 +++++++++ .../com/xhpc/log/service/PileLogService.java | 2 -- .../log/service/impl/OrderLogServiceImpl.java | 1 - .../log/service/impl/PileLogServiceImpl.java | 1 - .../mapper/XhpcChargingStationMapper.xml | 4 +-- .../mapper/XhpcDeviceMessageMapper.xml | 23 +++++++++++++ .../pp/controller/ChargingController.java | 26 +++++++++++++++ .../pp/logic/BalanceUpdateReplyDataLogic.java | 2 +- .../logic/OfflineCardSyncReplyDataLogic.java | 2 +- .../xhpc/tradebill/service/CommonService.java | 1 - 15 files changed, 101 insertions(+), 16 deletions(-) create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java create mode 100644 xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java create mode 100644 xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java index a2a8911d..a10e6a0f 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java @@ -4,6 +4,7 @@ import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.OrderLogService; +import lombok.extern.java.Log; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java index c52ad733..90f69f89 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java @@ -5,7 +5,6 @@ import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; -import com.xhpc.log.service.PileLogService; import com.xhpc.log.service.StationLogService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java new file mode 100644 index 00000000..674a9108 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java @@ -0,0 +1,32 @@ +package com.xhpc.log.domain; + + +import lombok.Data; + +import java.util.Date; + +@Data +public class XhpcDeviceMessageDomain { + + private Long deviceMessageId; + + private String type; + + private String serialNumber; + + private String content; + + private String replyContent; + + private Integer status; + + private Date createTime; + + private String createBy; + + private Date updateTime; + + private String updateBy; + + private String remark; +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java index 271095f5..5035b7cd 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java @@ -1,6 +1,5 @@ package com.xhpc.log.mapper; -import com.xhpc.system.api.domain.SysOperLog; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java index c524be44..2bb533cb 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java @@ -1,14 +1,9 @@ package com.xhpc.log.mapper; -import com.xhpc.common.domain.XhpcChargingStation; -import com.xhpc.common.domain.XhpcRate; -import com.xhpc.common.domain.XhpcRateModel; -import com.xhpc.common.domain.XhpcRateTime; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -import java.util.Set; /** * 电站Mapper接口 diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java new file mode 100644 index 00000000..5f3ff19a --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java @@ -0,0 +1,15 @@ +package com.xhpc.log.mapper; + + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface XhpcDeviceMessageMapper { + + List> selectListByTypeAndSerialNumber(@Param("type") String type, + @Param("serialNumber")String serialNumber); +} diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java index 84fbb8b6..63992ed9 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java @@ -1,7 +1,5 @@ package com.xhpc.log.service; -import com.xhpc.common.domain.XhpcChargingPile; - import java.util.List; import java.util.Map; diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java index a3174e14..8037e014 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java @@ -1,7 +1,6 @@ package com.xhpc.log.service.impl; -import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.log.mapper.XhpcHistoryOrderMapper; import com.xhpc.log.mapper.XhpcMessageMapper; import com.xhpc.log.service.OrderLogService; diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java index d189a809..a926df7c 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java @@ -1,6 +1,5 @@ package com.xhpc.log.service.impl; -import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.log.mapper.XhpcChargingPileMapper; import com.xhpc.log.mapper.XhpcDeviceMessageMapper; diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml index de6a7cf7..a39403b3 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -16,10 +16,10 @@ from xhpc_charging_station as cs left join xhpc_operator as ope on cs.operator_id = ope.operator_id where cs.del_flag =0 - + and cs.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{operatorId}) - + and cs.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId}) diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml new file mode 100644 index 00000000..6aee2818 --- /dev/null +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index 44ca9d91..adf450b4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -1,5 +1,6 @@ package com.xhpc.pp.controller; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.xhpc.common.api.PowerPileService; @@ -7,7 +8,10 @@ import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.HttpUtils; import com.xhpc.common.data.down.StartChargingData; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.logic.RateModelRequestLogic; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.server.ChargingPileServer; import com.xhpc.pp.utils.HexUtils; import com.xhpc.pp.utils.security.CRCCalculator; @@ -20,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.io.IOException; import java.time.Instant; import java.time.ZoneId; @@ -41,6 +46,10 @@ public class ChargingController { @Autowired private PowerPileService powerPileService; + + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + private static final List etable = Arrays.asList((new String[]{"离线", "故障"}).clone()); @PostMapping("test/pile/charging/order") @@ -328,6 +337,15 @@ public class ChargingController { String msg = HexUtils.toHex(data); msg = msg.concat(CRCCalculator.calcCrc(msg)); log.debug("start charging order[{}], send msg >>>> |{}|", startChargingData.getOrderNo(), msg); + + // 写入设备日志表数据 + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(startChargingData.getPileNo()); + deviceMessage.setRemark("平台下发开机指令"); + deviceMessage.setStatus(0); + deviceMessage.setContent(msg); + deviceMessageMapper.insertByDomain(deviceMessage); return HexUtils.toBytes(msg); } @@ -341,6 +359,14 @@ public class ChargingController { String msg = HexUtils.toHex(data); msg = msg.concat(CRCCalculator.calcCrc(msg)); log.debug("stop charging, send msg to terminal ({}) >>>> {}", connectorId, msg); + // 写入设备日志表数据 + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(StrUtil.sub(connectorId, 0, -2)); + deviceMessage.setRemark("平台下发停机指令"); + deviceMessage.setStatus(0); + deviceMessage.setContent(msg.toString()); + deviceMessageMapper.insertByDomain(deviceMessage); return HexUtils.toBytes(msg); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java index f04e2295..ba79e1ae 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java @@ -33,7 +33,7 @@ public class BalanceUpdateReplyDataLogic implements ServiceLogic { BalanceUpdateReplyData balanceUpdateReplyData = objectMapper.convertValue(req, BalanceUpdateReplyData.class); log.debug("balanceUpdateResult({}) [{}]", balanceUpdateReplyData.getPileNo(), balanceUpdateReplyData.getModifyResult()); - String remark = "充电桩余额更新"; + String remark = "充电桩余额更新应答"; XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); deviceMessage.setSerialNumber(sp.getPileNo()); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java index 224402f5..58722743 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java @@ -32,7 +32,7 @@ public class OfflineCardSyncReplyDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); OfflineCardSyncReplyData offlineCardSyncReplyData = objectMapper.convertValue(req, OfflineCardSyncReplyData.class); //todo - String remark = "充电桩下发离线卡数据同步"; + String remark = "充电桩下发离线卡数据同步应答"; XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); deviceMessage.setSerialNumber(sp.getPileNo()); diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/CommonService.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/CommonService.java index a61ad5af..3cd69133 100644 --- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/CommonService.java +++ b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/CommonService.java @@ -1,7 +1,6 @@ package com.xhpc.tradebill.service; -import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain; import com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain; import org.springframework.web.multipart.MultipartFile; From 429898bc6305e5a654a9931b6f405abc79ab4a26 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 4 Jan 2022 11:07:31 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/v2.1.sql | 306 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 228 insertions(+), 78 deletions(-) diff --git a/sql/v2.1.sql b/sql/v2.1.sql index 945fb368..3882f6aa 100644 --- a/sql/v2.1.sql +++ b/sql/v2.1.sql @@ -1,113 +1,263 @@ CREATE TABLE `xhpc_tradebill_internet_check_record` ( - `id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `create_time` DATETIME(6) NOT NULL COMMENT '创建时间', - `create_by` VARCHAR(30) NULL DEFAULT NULL COMMENT '创建人' COLLATE 'utf8mb4_unicode_ci', - `update_time` DATETIME(6) NOT NULL COMMENT '更新时间', - `update_by` VARCHAR(30) NULL DEFAULT NULL COMMENT '更新人' COLLATE 'utf8mb4_unicode_ci', - `upload_id` INT(11) NOT NULL COMMENT '文件上传ID', - `history_order_no` BIGINT(20) NULL DEFAULT NULL COMMENT '历史订单ID', - `user_id` VARCHAR(64) NULL DEFAULT NULL COMMENT '用户ID' COLLATE 'utf8mb4_unicode_ci', - `internet_name` VARCHAR(64) NULL DEFAULT NULL COMMENT '流量方' COLLATE 'utf8mb4_unicode_ci', - `platform_internet_serial_number` VARCHAR(32) NULL DEFAULT NULL COMMENT '平台-第三方订单号' COLLATE 'utf8mb4_unicode_ci', - `platform_serial_number` VARCHAR(32) NULL DEFAULT NULL COMMENT '平台-订单号' COLLATE 'utf8mb4_unicode_ci', - `platform_charge_station` VARCHAR(32) NULL DEFAULT NULL COMMENT '平台-场站名称' COLLATE 'utf8mb4_unicode_ci', - `platform_start_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '平台-开始SOC' COLLATE 'utf8mb4_unicode_ci', - `platform_end_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '平台-结束SOC' COLLATE 'utf8mb4_unicode_ci', + `id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `create_time` DATETIME(6) NOT NULL COMMENT '创建时间', + `create_by` VARCHAR(30) NULL DEFAULT NULL COMMENT '创建人' COLLATE 'utf8mb4_unicode_ci', + `update_time` DATETIME(6) NOT NULL COMMENT '更新时间', + `update_by` VARCHAR(30) NULL DEFAULT NULL COMMENT '更新人' COLLATE 'utf8mb4_unicode_ci', + `upload_id` INT(11) NOT NULL COMMENT '文件上传ID', + `history_order_no` BIGINT(20) NULL DEFAULT NULL COMMENT '历史订单ID', + `user_id` VARCHAR(64) NULL DEFAULT NULL COMMENT '用户ID' COLLATE 'utf8mb4_unicode_ci', + `internet_name` VARCHAR(64) NULL DEFAULT NULL COMMENT '流量方' COLLATE 'utf8mb4_unicode_ci', + `platform_internet_serial_number` VARCHAR(32) NULL DEFAULT NULL COMMENT '平台-第三方订单号' COLLATE 'utf8mb4_unicode_ci', + `platform_serial_number` VARCHAR(32) NULL DEFAULT NULL COMMENT '平台-订单号' COLLATE 'utf8mb4_unicode_ci', + `platform_charge_station` VARCHAR(32) NULL DEFAULT NULL COMMENT '平台-场站名称' COLLATE 'utf8mb4_unicode_ci', + `platform_start_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '平台-开始SOC' COLLATE 'utf8mb4_unicode_ci', + `platform_end_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '平台-结束SOC' COLLATE 'utf8mb4_unicode_ci', `platform_charging_degree` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '平台-充电电量', - `platform_charging_time` VARCHAR(20) NULL DEFAULT NULL COMMENT '平台-充电时长' COLLATE 'utf8mb4_unicode_ci', - `platform_start_time` DATETIME(6) NULL DEFAULT NULL COMMENT '平台-开始充电时间', - `platform_end_time` DATETIME(6) NULL DEFAULT NULL COMMENT '平台-结束充电时间', + `platform_charging_time` VARCHAR(20) NULL DEFAULT NULL COMMENT '平台-充电时长' COLLATE 'utf8mb4_unicode_ci', + `platform_start_time` DATETIME(6) NULL DEFAULT NULL COMMENT '平台-开始充电时间', + `platform_end_time` DATETIME(6) NULL DEFAULT NULL COMMENT '平台-结束充电时间', `platform_order_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '平台-订单总金额', `platform_power_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '平台-电费', `platform_server_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '平台-服务费', `platform_discount_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '平台-折扣金额', `platform_pay_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '平台-支付金额', - `internet_serial_number` VARCHAR(32) NULL DEFAULT NULL COMMENT '流量方-订单号' COLLATE 'utf8mb4_unicode_ci', - `internet_charge_station` VARCHAR(32) NULL DEFAULT NULL COMMENT '流量方-场站名称' COLLATE 'utf8mb4_unicode_ci', - `internet_start_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '流量方-开始SOC' COLLATE 'utf8mb4_unicode_ci', - `internet_end_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '流量方-结束SOC' COLLATE 'utf8mb4_unicode_ci', + `internet_serial_number` VARCHAR(32) NULL DEFAULT NULL COMMENT '流量方-订单号' COLLATE 'utf8mb4_unicode_ci', + `internet_charge_station` VARCHAR(32) NULL DEFAULT NULL COMMENT '流量方-场站名称' COLLATE 'utf8mb4_unicode_ci', + `internet_start_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '流量方-开始SOC' COLLATE 'utf8mb4_unicode_ci', + `internet_end_soc` VARCHAR(10) NULL DEFAULT NULL COMMENT '流量方-结束SOC' COLLATE 'utf8mb4_unicode_ci', `internet_charging_degree` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '流量方-充电电量', - `internet_charging_time` VARCHAR(20) NULL DEFAULT NULL COMMENT '流量方-充电时长（单位：分钟）' COLLATE 'utf8mb4_unicode_ci', - `internet_start_time` DATETIME(6) NULL DEFAULT NULL COMMENT '流量方-开始充电时间', - `internet_end_time` DATETIME(6) NULL DEFAULT NULL COMMENT '流量方-结束充电时间', + `internet_charging_time` VARCHAR(20) NULL DEFAULT NULL COMMENT '流量方-充电时长（单位：分钟）' COLLATE 'utf8mb4_unicode_ci', + `internet_start_time` DATETIME(6) NULL DEFAULT NULL COMMENT '流量方-开始充电时间', + `internet_end_time` DATETIME(6) NULL DEFAULT NULL COMMENT '流量方-结束充电时间', `internet_order_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '流量方-订单总金额', `internet_power_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '流量方-电费', `internet_server_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '流量方-服务费', `internet_discount_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '流量方-折扣费', `internet_pay_amount` DECIMAL(10, 2) NULL DEFAULT NULL COMMENT '流量方-支付金额', - `remark` VARCHAR(200) NULL DEFAULT NULL COMMENT '备注' COLLATE 'utf8mb4_unicode_ci', - `status` SMALLINT(6) NOT NULL COMMENT '状态（0-待对账，1-对账异常，2-对账正常）', + `remark` VARCHAR(200) NULL DEFAULT NULL COMMENT '备注' COLLATE 'utf8mb4_unicode_ci', + `status` SMALLINT(6) NOT NULL COMMENT '状态（0-待对账，1-对账异常，2-对账正常）', PRIMARY KEY (`id`) USING BTREE -) - COLLATE = 'utf8mb4_unicode_ci' +) COLLATE = 'utf8mb4_unicode_ci' ENGINE = InnoDB ROW_FORMAT = DYNAMIC AUTO_INCREMENT = 34670 ; -ALTER TABLE `xhpc_app_user` ADD COLUMN `is_refund` int(4) NULL DEFAULT 0 COMMENT '是否退款 0 不退款 1 退款' AFTER `soc`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `is_refund_application` int(10) NULL DEFAULT 0 COMMENT '是否有退款订单审核（0无 1有）' AFTER `is_refund`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `soc` int(10) NULL DEFAULT NULL COMMENT '用户设置的SOC' AFTER `is_refund_application`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '头像地址' AFTER `soc`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `weixin_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `avatar`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `alipay_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `weixin_open_id`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `weixin_login` int(10) NULL DEFAULT 0 COMMENT '微信是否登录（0未登录 1已登录）' AFTER `alipay_open_id`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `alipay_login` int(10) NULL DEFAULT 0 COMMENT '支付宝是否登录（0未登录 1已登录）' AFTER `weixin_login`; -ALTER TABLE `xhpc_community_personnel` ADD COLUMN `is_refund` int(4) NULL DEFAULT 0 COMMENT '是否退款 0 不退款 1 退款' AFTER `soc`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `is_refund_application` int(10) NULL DEFAULT 0 COMMENT '是否有退款订单审核（0无 1有）' AFTER `remark`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `soc` int(10) NULL DEFAULT NULL COMMENT '用户设置的SOC' AFTER `is_refund_application`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '头像地址' AFTER `soc`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `weixin_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `avatar`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `alipay_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `weixin_open_id`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `weixin_login` int(10) NULL DEFAULT 0 COMMENT '微信是否登录（0未登录 1已登录）' AFTER `alipay_open_id`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `alipay_login` int(10) NULL DEFAULT 0 COMMENT '支付宝是否登录（0未登录 1已登录）' AFTER `weixin_login`; -ALTER TABLE `xhpc_customers_personnel` ADD COLUMN `is_refund` int(4) NULL DEFAULT 0 COMMENT '是否退款 0 不退款 1 退款' AFTER `soc`; +ALTER TABLE `xhpc_app_user` + ADD COLUMN `is_refund` int(4) NULL DEFAULT 0 COMMENT '是否退款 0 不退款 1 退款' AFTER `soc`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `is_refund_application` int(10) NULL DEFAULT 0 COMMENT '是否有退款订单审核（0无 1有）' AFTER `is_refund`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `soc` int(10) NULL DEFAULT NULL COMMENT '用户设置的SOC' AFTER `is_refund_application`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '头像地址' AFTER `soc`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `weixin_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `avatar`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `alipay_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `weixin_open_id`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `weixin_login` int(10) NULL DEFAULT 0 COMMENT '微信是否登录（0未登录 1已登录）' AFTER `alipay_open_id`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `alipay_login` int(10) NULL DEFAULT 0 COMMENT '支付宝是否登录（0未登录 1已登录）' AFTER `weixin_login`; +ALTER TABLE `xhpc_community_personnel` + ADD COLUMN `is_refund` int(4) NULL DEFAULT 0 COMMENT '是否退款 0 不退款 1 退款' AFTER `soc`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `is_refund_application` int(10) NULL DEFAULT 0 COMMENT '是否有退款订单审核（0无 1有）' AFTER `remark`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `soc` int(10) NULL DEFAULT NULL COMMENT '用户设置的SOC' AFTER `is_refund_application`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '头像地址' AFTER `soc`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `weixin_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `avatar`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `alipay_open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `weixin_open_id`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `weixin_login` int(10) NULL DEFAULT 0 COMMENT '微信是否登录（0未登录 1已登录）' AFTER `alipay_open_id`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `alipay_login` int(10) NULL DEFAULT 0 COMMENT '支付宝是否登录（0未登录 1已登录）' AFTER `weixin_login`; +ALTER TABLE `xhpc_customers_personnel` + ADD COLUMN `is_refund` int(4) NULL DEFAULT 0 COMMENT '是否退款 0 不退款 1 退款' AFTER `soc`; -CREATE TABLE `xhpc_user_login` ( - `user_login_id` bigint(20) NOT NULL AUTO_INCREMENT, - `app_user_id` bigint(20) DEFAULT NULL COMMENT '用户id', - `account` varchar(50) DEFAULT NULL COMMENT '账号', - `user_type` int(4) NOT NULL COMMENT '用户类型 0 C端用户 1 流量方用户 2社区用户 3B端用户）', - `open_id` varchar(50) DEFAULT NULL COMMENT 'openid', - `type` int(4) DEFAULT '0' COMMENT '1 微信 2支付宝', - `status` int(4) DEFAULT '1' COMMENT '0退出 1登录', - `del_flag` int(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', - `create_by` varchar(64) DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `remark` varchar(500) DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`user_login_id`) +CREATE TABLE `xhpc_user_login` +( + `user_login_id` bigint(20) NOT NULL AUTO_INCREMENT, + `app_user_id` bigint(20) DEFAULT NULL COMMENT '用户id', + `account` varchar(50) DEFAULT NULL COMMENT '账号', + `user_type` int(4) NOT NULL COMMENT '用户类型 0 C端用户 1 流量方用户 2社区用户 3B端用户）', + `open_id` varchar(50) DEFAULT NULL COMMENT 'openid', + `type` int(4) DEFAULT '0' COMMENT '1 微信 2支付宝', + `status` int(4) DEFAULT '1' COMMENT '0退出 1登录', + `del_flag` int(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', + `create_by` varchar(64) DEFAULT '' COMMENT '创建者', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) DEFAULT '' COMMENT '更新者', + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `remark` varchar(500) DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`user_login_id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='小程序用户最后一次登录记录'; CREATE TABLE `xhpc_tenant` ( - `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户ID', - `tenant_name` VARCHAR(50) NOT NULL COMMENT '租户名称', - `domain` VARCHAR(255) NULL DEFAULT NULL COMMENT '域名地址', + `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户ID', + `tenant_name` VARCHAR(50) NOT NULL COMMENT '租户名称', + `domain` VARCHAR(255) NULL DEFAULT NULL COMMENT '域名地址', `background_url` VARCHAR(1000) NULL DEFAULT NULL COMMENT '系统背景', - `linkman` VARCHAR(20) NULL DEFAULT NULL COMMENT '联系人', - `contact_number` VARCHAR(20) NULL DEFAULT NULL COMMENT '联系电话', - `address` VARCHAR(255) NULL DEFAULT NULL COMMENT '联系地址', - `station_quote` INT(11) NULL DEFAULT '-1' COMMENT '场站限额', - `station_pile_quote` INT(11) NULL DEFAULT '-1' COMMENT '每站桩限额', - `expire_time` DATETIME NULL DEFAULT NULL COMMENT '过期时间', - `create_user` BIGINT(64) NULL DEFAULT NULL COMMENT '创建人', - `create_dept` BIGINT(64) NULL DEFAULT NULL COMMENT '创建部门', - `create_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间', - `update_user` BIGINT(64) NULL DEFAULT NULL COMMENT '修改人', - `update_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间', - `status` INT(2) NULL DEFAULT NULL COMMENT '状态', - `is_deleted` INT(2) NULL DEFAULT '0' COMMENT '是否已删除', + `linkman` VARCHAR(20) NULL DEFAULT NULL COMMENT '联系人', + `contact_number` VARCHAR(20) NULL DEFAULT NULL COMMENT '联系电话', + `address` VARCHAR(255) NULL DEFAULT NULL COMMENT '联系地址', + `station_quote` INT(11) NULL DEFAULT '-1' COMMENT '场站限额', + `station_pile_quote` INT(11) NULL DEFAULT '-1' COMMENT '每站桩限额', + `expire_time` DATETIME NULL DEFAULT NULL COMMENT '过期时间', + `create_user` BIGINT(64) NULL DEFAULT NULL COMMENT '创建人', + `create_dept` BIGINT(64) NULL DEFAULT NULL COMMENT '创建部门', + `create_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间', + `update_user` BIGINT(64) NULL DEFAULT NULL COMMENT '修改人', + `update_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间', + `status` INT(2) NULL DEFAULT NULL COMMENT '状态', + `is_deleted` INT(2) NULL DEFAULT '0' COMMENT '是否已删除', PRIMARY KEY (`tenant_id`) USING BTREE -) - COMMENT ='租户表' +) COMMENT ='租户表' COLLATE = 'utf8mb4_general_ci' ENGINE = InnoDB ; + +CREATE TABLE `xhpc_tradebill_upload_record` +( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `create_time` datetime(6) NOT NULL COMMENT '创建时间', + `create_by` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人', + `update_time` datetime(6) NOT NULL COMMENT '更新时间', + `update_by` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人', + `source` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '来源', + `file_name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '文件名称', + `url` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '文件地址', + `type` smallint(6) NOT NULL COMMENT '文件类型（1-微信充值，2-微信退款，3-支付宝充值，4-支付宝退款，5-恒大，6-小桔，7-新电途，8-特来电）', + `status` smallint(6) NOT NULL COMMENT '状态（0-未对账，1-已对账）', + `del_flag` smallint(6) NOT NULL COMMENT '删除标识（0-正常，2-已删除）', + `success_count` int(11) NOT NULL COMMENT '对账成功记录数量', + `fail_count` int(11) NOT NULL COMMENT '对账失败记录数量', + `uncheck_count` int(11) NOT NULL COMMENT '未对账记录数量', + `checked_count` int(11) NOT NULL COMMENT '已对账记录数量', + `tenant_id` varchar(12) COLLATE utf8mb4_unicode_ci DEFAULT '000000' COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB + COMMENT = '对账单上传记录表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + + +CREATE TABLE `xhpc_tradebill_payment_check_record` +( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `create_time` datetime(6) NOT NULL COMMENT '创建时间', + `create_by` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人', + `update_time` datetime(6) NOT NULL COMMENT '更新时间', + `update_by` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人', + `upload_id` int(11) NOT NULL COMMENT '文件上传ID', + `order_type` smallint(6) DEFAULT NULL COMMENT '订单类型（1-充值，2-退款）', + `payment_channel` smallint(6) DEFAULT NULL COMMENT '充值渠道（1微信 2支付宝）', + `platform_order_number` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-订单ID', + `platform_pay_number` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-支付订单号', + `platform_user_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-用户ID', + `platform_amount` decimal(10, 2) DEFAULT NULL COMMENT '平台-金额', + `platform_pay_time` datetime(6) DEFAULT NULL COMMENT '平台-支付时间', + `payment_pay_number` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付方-订单号', + `payment_user_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付方-用户ID', + `payment_amount` decimal(10, 2) DEFAULT NULL COMMENT '支付方-支付金额', + `payment_pay_time` datetime(6) DEFAULT NULL COMMENT '支付方-支付时间', + `status` smallint(6) NOT NULL COMMENT '状态（0-待对账，1-对账异常，2-对账正常）', + `remark` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注', + `tenant_id` varchar(12) COLLATE utf8mb4_unicode_ci DEFAULT '000000' COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB + COMMENT = '支付平台对账明细表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + + +CREATE TABLE `xhpc_tradebill_internet_check_record` +( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `create_time` datetime(6) NOT NULL COMMENT '创建时间', + `create_by` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人', + `update_time` datetime(6) NOT NULL COMMENT '更新时间', + `update_by` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人', + `upload_id` int(11) NOT NULL COMMENT '文件上传ID', + `history_order_no` bigint(20) DEFAULT NULL COMMENT '历史订单ID', + `user_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户ID', + `internet_name` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流量方', + `platform_internet_serial_number` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-第三方订单号', + `platform_serial_number` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-订单号', + `platform_charge_station` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-场站名称', + `platform_start_soc` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-开始SOC', + `platform_end_soc` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-结束SOC', + `platform_charging_degree` decimal(10, 2) DEFAULT NULL COMMENT '平台-充电电量', + `platform_charging_time` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '平台-充电时长', + `platform_start_time` datetime(6) DEFAULT NULL COMMENT '平台-开始充电时间', + `platform_end_time` datetime(6) DEFAULT NULL COMMENT '平台-结束充电时间', + `platform_order_amount` decimal(10, 2) DEFAULT NULL COMMENT '平台-订单总金额', + `platform_power_amount` decimal(10, 2) DEFAULT NULL COMMENT '平台-电费', + `platform_server_amount` decimal(10, 2) DEFAULT NULL COMMENT '平台-服务费', + `platform_discount_amount` decimal(10, 2) DEFAULT NULL COMMENT '平台-折扣金额', + `platform_pay_amount` decimal(10, 2) DEFAULT NULL COMMENT '平台-支付金额', + `internet_serial_number` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流量方-订单号', + `internet_charge_station` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流量方-场站名称', + `internet_start_soc` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流量方-开始SOC', + `internet_end_soc` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流量方-结束SOC', + `internet_charging_degree` decimal(10, 2) DEFAULT NULL COMMENT '流量方-充电电量', + `internet_charging_time` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流量方-充电时长（单位：分钟）', + `internet_start_time` datetime(6) DEFAULT NULL COMMENT '流量方-开始充电时间', + `internet_end_time` datetime(6) DEFAULT NULL COMMENT '流量方-结束充电时间', + `internet_order_amount` decimal(10, 2) DEFAULT NULL COMMENT '流量方-订单总金额', + `internet_power_amount` decimal(10, 2) DEFAULT NULL COMMENT '流量方-电费', + `internet_server_amount` decimal(10, 2) DEFAULT NULL COMMENT '流量方-服务费', + `internet_discount_amount` decimal(10, 2) DEFAULT NULL COMMENT '流量方-折扣费', + `internet_pay_amount` decimal(10, 2) DEFAULT NULL COMMENT '流量方-支付金额', + `remark` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注', + `status` smallint(6) NOT NULL COMMENT '状态（0-待对账，1-对账异常，2-对账正常）', + `tenant_id` varchar(12) COLLATE utf8mb4_unicode_ci DEFAULT '000000' COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB + COMMENT = '流量方对账明细表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + +CREATE TABLE `xhpc_device_message` +( + `device_message_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '消息id', + `type` varchar(50) DEFAULT NULL COMMENT '设备类型（PILE-充电桩，TERMINAL-终端）', + `serial_number` varchar(32) DEFAULT NULL COMMENT '设备流水号', + `content` text CHARACTER SET utf8 COMMENT '报文16进制原文', + `reply_content` text COMMENT '回复的报文', + `status` int(10) DEFAULT '0' COMMENT '状态（0正常 1停用）', + `create_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `create_by` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '创建者', + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `update_by` varchar(30) CHARACTER SET utf8 DEFAULT NULL COMMENT '更新者', + `remark` text CHARACTER SET utf8 COMMENT '备注', + `tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户id', + PRIMARY KEY (`device_message_id`) USING BTREE +) ENGINE=InnoDB + COMMENT = '设备运行信息表' + AUTO_INCREMENT=1 + DEFAULT CHARSET=utf8mb4 + COLLATE='utf8mb4_general_ci' + ROW_FORMAT=DYNAMIC; + + ALTER TABLE `et_auth_sec_token` ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id'; ALTER TABLE `et_charge_order_info` From d4e8fef039001cbf85996f51ad3b361698bdb50f Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 4 Jan 2022 15:36:00 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/controller/OrderLogController.java | 36 ++++++++++--- .../log/controller/PileLogController.java | 35 ++++++++++--- .../log/controller/StationLogController.java | 17 ++++--- .../log/controller/SystemLogController.java | 12 ++++- .../com/xhpc/log/mapper/SysOperLogMapper.java | 2 +- .../log/mapper/XhpcChargingPileMapper.java | 6 +-- .../log/mapper/XhpcChargingStationMapper.java | 2 +- .../log/mapper/XhpcDeviceMessageMapper.java | 3 ++ .../log/mapper/XhpcHistoryOrderMapper.java | 2 +- .../xhpc/log/mapper/XhpcMessageMapper.java | 3 ++ .../com/xhpc/log/service/OrderLogService.java | 5 +- .../com/xhpc/log/service/PileLogService.java | 4 +- .../xhpc/log/service/StationLogService.java | 2 +- .../xhpc/log/service/SystemLogService.java | 2 +- .../log/service/impl/OrderLogServiceImpl.java | 40 ++++++++++++++- .../log/service/impl/PileLogServiceImpl.java | 36 ++++++++++++- .../service/impl/StationLogServiceImpl.java | 4 +- .../service/impl/SystemLogServiceImpl.java | 4 +- .../resources/mapper/SysOperLogMapper.xml | 4 +- .../mapper/XhpcChargingPileMapper.xml | 11 ++-- .../mapper/XhpcChargingStationMapper.xml | 11 ++-- .../mapper/XhpcDeviceMessageMapper.xml | 40 +++++++++++++++ .../mapper/XhpcHistoryOrderMapper.xml | 11 ++-- .../resources/mapper/XhpcMessageMapper.xml | 51 ++++++++++++++++--- 24 files changed, 277 insertions(+), 66 deletions(-) diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java index a10e6a0f..d36403e1 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java @@ -3,14 +3,15 @@ package com.xhpc.log.controller; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.log.service.OrderLogService; import lombok.extern.java.Log; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; /** @@ -24,11 +25,15 @@ public class OrderLogController extends BaseController { OrderLogService orderLogService; @GetMapping("/getPage") - public TableDataInfo getOrderPage(){ - startPage(); - Long operatorId = SecurityUtils.getUserId(); + public TableDataInfo getOrderPage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number){ - return getDataTable(orderLogService.getOrderPage(operatorId, null)); + startPage(); + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("tenantId", tenantId); + return getDataTable(orderLogService.getOrderPage(params)); } @@ -38,4 +43,19 @@ public class OrderLogController extends BaseController { return getDataTable(orderLogService.getOrderDetailPage(orderId)); } + + @GetMapping("/export") + public void export(HttpServletResponse response, + @RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number, + @RequestParam(required = false) String serialNumber) throws Exception { + + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("serialNumber", serialNumber); + params.put("tenantId", tenantId); + orderLogService.export(response, params); + } + } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java index 2807957f..9d50a7f8 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java @@ -4,13 +4,14 @@ package com.xhpc.log.controller; import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.log.service.PileLogService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; /** @@ -25,10 +26,15 @@ public class PileLogController extends BaseController { @GetMapping("/getPage") - public TableDataInfo getPilePage() { - Long operatorId = SecurityUtils.getUserId(); + public TableDataInfo getPilePage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number) { startPage(); - return getDataTable(pileLogService.getPilePage(operatorId, null)); + + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("tenantId", tenantId); + return getDataTable(pileLogService.getPilePage(params)); } @@ -38,4 +44,19 @@ public class PileLogController extends BaseController { return getDataTable(pileLogService.getPileRunLogPage(pileId)); } + @GetMapping("/export") + public void export(HttpServletResponse response, + @RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number, + @RequestParam(required = false) String serialNumber) throws Exception { + + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("type", StationDeviceEnum.PILE.getCode()); + params.put("serialNumber", serialNumber); + params.put("tenantId", tenantId); + pileLogService.export(response, params); + } + } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java index 90f69f89..52f3afdf 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java @@ -6,12 +6,11 @@ import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.StationLogService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; @RestController @RequestMapping("/log/station") @@ -22,10 +21,14 @@ public class StationLogController extends BaseController { StationLogService stationLogService; @GetMapping("/getPage") - public TableDataInfo getPilePage() { + public TableDataInfo getPilePage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number) { startPage(); - Long operatorId = SecurityUtils.getUserId(); - return getDataTable(stationLogService.getStationPage(operatorId, null)); + Map params = new HashMap<>(); + params.put("operatorId", SecurityUtils.getUserId()); + params.put("number", number); + params.put("tenantId", tenantId); + return getDataTable(stationLogService.getStationPage(params)); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java index f90dce2d..3ec85d2a 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java @@ -1,14 +1,18 @@ package com.xhpc.log.controller; +import com.xhpc.common.core.utils.SecurityUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.log.service.SystemLogService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; /** * 系统操作日志 @@ -23,8 +27,12 @@ public class SystemLogController extends BaseController { @GetMapping("/oper/getPage") - public TableDataInfo getPage(){ + public TableDataInfo getPage(@RequestParam(required = false) String tenantId, + @RequestParam(required = false) Integer number){ startPage(); - return getDataTable(systemLogService.getPage(null)); + Map params = new HashMap<>(); + params.put("operName", SecurityUtils.getUsername()); + params.put("tenantId", tenantId); + return getDataTable(systemLogService.getPage(params)); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java index 5035b7cd..84571810 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java @@ -12,6 +12,6 @@ import java.util.Map; */ public interface SysOperLogMapper { - List> selectUserOperLog(@Param("operName") String operName); + List> selectUserOperLog(@Param("params") Map params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java index 138406e2..3712feba 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java @@ -16,12 +16,8 @@ public interface XhpcChargingPileMapper { /** * 桩列表 * - * @param serialNumber 桩编号 - * @param type 桩类型 - * @param name 桩名称 - * @return */ - List> selectXhpcChargingPileList(@Param("operatorId")Long operatorId, @Param("number")Integer number); + List> selectXhpcChargingPileList(@Param("params")Map params); /** * 终端 diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java index 2bb533cb..119f695f 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java @@ -18,7 +18,7 @@ public interface XhpcChargingStationMapper { * * @return 电站集合 */ - List> selectXhpcChargingStationList(@Param("operatorId")Long operatorId,@Param("type")Integer type); + List> selectXhpcChargingStationList(@Param("params")Map params); List> selectRateListByStationId(@Param("stationId")Long stationId); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java index 5f3ff19a..7f6dda18 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java @@ -12,4 +12,7 @@ public interface XhpcDeviceMessageMapper { List> selectListByTypeAndSerialNumber(@Param("type") String type, @Param("serialNumber")String serialNumber); + + + List> selectListByParams(@Param("params")Map params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java index 609a1244..fbe1baa4 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java @@ -10,6 +10,6 @@ import java.util.Map; public interface XhpcHistoryOrderMapper { - List> getOrderPage(@Param("operatorId") Long operatorId, @Param("number") Integer number); + List> getOrderPage(@Param("params")Map params); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java index d0005ac6..420215ad 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java @@ -13,4 +13,7 @@ public interface XhpcMessageMapper { List> getOrderMessagePage(@Param("serialNumber")String serialNumber); + + + List> getOrderMessageByParams(@Param("params")Map params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java index 244abd4b..604b7475 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java @@ -1,14 +1,17 @@ package com.xhpc.log.service; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; public interface OrderLogService { - List> getOrderPage(Long operatorId, Integer type); + List> getOrderPage(Map params); List> getOrderDetailPage(String orderId); + + void export(HttpServletResponse response, Map params) throws Exception; } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java index 63992ed9..b57710b9 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java @@ -1,14 +1,16 @@ package com.xhpc.log.service; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; public interface PileLogService { - List> getPilePage(Long operatorId, Integer type); + List> getPilePage(Map params); List> getPileRunLogPage(String pileId); + void export(HttpServletResponse response, Map params) throws Exception; } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java index f019d219..955ee274 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java @@ -6,7 +6,7 @@ import java.util.Map; public interface StationLogService { - List> getStationPage(Long operatorId, Integer type); + List> getStationPage(Map params); List> getStationRatePage(Long stationId); diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java index 4008e008..4ae604db 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java @@ -6,6 +6,6 @@ import java.util.Map; public interface SystemLogService { - List> getPage(String userName); + List> getPage(Map params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java index 8037e014..015256f4 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java @@ -1,12 +1,17 @@ package com.xhpc.log.service.impl; +import cn.hutool.core.io.IoUtil; +import cn.hutool.poi.excel.ExcelUtil; +import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.log.mapper.XhpcHistoryOrderMapper; import com.xhpc.log.mapper.XhpcMessageMapper; import com.xhpc.log.service.OrderLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -21,8 +26,8 @@ public class OrderLogServiceImpl implements OrderLogService { @Override - public List> getOrderPage(Long operatorId, Integer type){ - return historyOrderMapper.getOrderPage(operatorId, type); + public List> getOrderPage(Map params){ + return historyOrderMapper.getOrderPage(params); } @@ -30,4 +35,35 @@ public class OrderLogServiceImpl implements OrderLogService { public List> getOrderDetailPage(String orderId){ return messageMapper.getOrderMessagePage(orderId); } + + + @Override + public void export(HttpServletResponse response, Map params) throws Exception{ + List> list = messageMapper.getOrderMessageByParams(params); + + ExcelWriter writer = ExcelUtil.getWriter(true); + writer.addHeaderAlias("serialNumber", "订单号"); + writer.addHeaderAlias("sourceName", "订单来源"); + writer.addHeaderAlias("chargingDegree", "充电电量"); + writer.addHeaderAlias("amountCharged", "总金额"); + writer.addHeaderAlias("chargingTime", "充电时长"); + writer.addHeaderAlias("startSOc", "充电启始soc"); + writer.addHeaderAlias("endSoc", "结束soc"); + writer.addHeaderAlias("startTime", "充电开始时间"); + writer.addHeaderAlias("endTime", "充电结束时间"); + writer.addHeaderAlias("power", "电桩功率(KW)"); + writer.addHeaderAlias("content", "充电报文"); + writer.addHeaderAlias("remark", "备注描述"); + writer.addHeaderAlias("createTime", "发送时间"); + + writer.setOnlyAlias(true); + writer.write(list, true); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + ServletOutputStream out = response.getOutputStream(); + + writer.flush(out, true); + writer.close(); + IoUtil.close(out); + } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java index a926df7c..0b817f6f 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java @@ -1,5 +1,8 @@ package com.xhpc.log.service.impl; +import cn.hutool.core.io.IoUtil; +import cn.hutool.poi.excel.ExcelUtil; +import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.log.mapper.XhpcChargingPileMapper; import com.xhpc.log.mapper.XhpcDeviceMessageMapper; @@ -7,6 +10,8 @@ import com.xhpc.log.service.PileLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -21,9 +26,9 @@ public class PileLogServiceImpl implements PileLogService { XhpcDeviceMessageMapper deviceMessageMapper; @Override - public List> getPilePage(Long operatorId, Integer type){ + public List> getPilePage(Map params){ - return pileMapper.selectXhpcChargingPileList(operatorId , type); + return pileMapper.selectXhpcChargingPileList(params); } @@ -31,4 +36,31 @@ public class PileLogServiceImpl implements PileLogService { public List> getPileRunLogPage(String pileId){ return deviceMessageMapper.selectListByTypeAndSerialNumber(StationDeviceEnum.PILE.getCode(), pileId); } + + @Override + public void export(HttpServletResponse response, Map params) throws Exception{ + List> list = deviceMessageMapper.selectListByParams(params); + + ExcelWriter writer = ExcelUtil.getWriter(true); + writer.addHeaderAlias("chargingStationName", "场站名称"); + writer.addHeaderAlias("chargingPileName", "充电桩名称"); + writer.addHeaderAlias("serialNumber", "桩编码"); + writer.addHeaderAlias("brandModel", "费率"); + writer.addHeaderAlias("pileType", "电桩类型"); + writer.addHeaderAlias("power", "电桩功率(KW)"); + writer.addHeaderAlias("content", "充电桩上传平台报文"); + writer.addHeaderAlias("replyContent", "平台回复报文"); + writer.addHeaderAlias("remark", "备注描述"); + writer.addHeaderAlias("createTime", "发送时间"); + + writer.setOnlyAlias(true); + writer.write(list, true); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + ServletOutputStream out = response.getOutputStream(); + + writer.flush(out, true); + writer.close(); + IoUtil.close(out); + } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java index 2903ce71..c7f1f066 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java @@ -16,8 +16,8 @@ public class StationLogServiceImpl implements StationLogService { XhpcChargingStationMapper stationMapper; @Override - public List> getStationPage(Long operatorId, Integer type){ - return stationMapper.selectXhpcChargingStationList(operatorId, type); + public List> getStationPage(Map params){ + return stationMapper.selectXhpcChargingStationList(params); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java index 1f780455..67dfb434 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java @@ -16,7 +16,7 @@ public class SystemLogServiceImpl implements SystemLogService { SysOperLogMapper operLogMapper; @Override - public List> getPage(String userName){ - return operLogMapper.selectUserOperLog(userName); + public List> getPage(Map params){ + return operLogMapper.selectUserOperLog(params); } } diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml index fb09f884..72b22665 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml @@ -24,8 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oper_time as 'operTime' from sys_oper_log - - oper_name = #{operName} + + oper_name = #{params.operName} diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml index 6d643d30..ae681be0 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -98,11 +98,14 @@ - - and cp.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{operatorId}) + + and cp.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) - - and cp.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId}) + + and cp.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId}) + + + and cp.tenant_id = #{params.tenantId} order by cp.create_time desc diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml index a39403b3..5a0e6bc0 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -16,11 +16,14 @@ from xhpc_charging_station as cs left join xhpc_operator as ope on cs.operator_id = ope.operator_id where cs.del_flag =0 - - and cs.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{operatorId}) + + and cs.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) - - and cs.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId}) + + and cs.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId}) + + + and cs.tenant_id=#{params.tenantId} diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index 6aee2818..599fca67 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -20,4 +20,44 @@ where type=#{type} and serial_number=#{serialNumber} + + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 3154c4a2..13134066 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -15,11 +15,14 @@ from xhpc_charge_order as co left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id where co.del_flag =0 - - and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{operatorId}) + + and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId}) - - and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{operatorId}) + + and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId}) + + + and co.tenant_id = #{params.tenantId} order by co.create_time desc diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml index 6cee0abd..a5c6585e 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml @@ -4,14 +4,49 @@ + + + From e85ff50716d83efe3bff39b5154480ecf8d7d8d4 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 4 Jan 2022 15:51:58 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/tradebill/controller/CommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java index 1ccf7dc0..8eb09059 100644 --- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java +++ b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java @@ -29,7 +29,7 @@ public class CommonController extends BaseController { return AjaxResult.success(commonService.ossUpload(domain)); } - @Log(title = "上传对账单(OSS方式)", businessType = BusinessType.INSERT) + @Log(title = "上传对账单(文件方式)", businessType = BusinessType.INSERT) @PostMapping("/file/upload") public AjaxResult fileUpload(MultipartFile file, int type) throws Exception { if (file ==null || type < 1){ From 45a8620fdd323f16abb08b4d397df91e9fcc8e95 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 7 Jan 2022 15:32:05 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/XhpcTradebillUploadRecordDomain.java | 2 ++ .../mapper/XhpcTradebillUploadRecordMapper.xml | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillUploadRecordDomain.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillUploadRecordDomain.java index 96e6f219..47219b5f 100644 --- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillUploadRecordDomain.java +++ b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillUploadRecordDomain.java @@ -41,6 +41,8 @@ public class XhpcTradebillUploadRecordDomain implements Serializable { private Integer checkedCount; + private String tenantId; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml b/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml index 922f5f99..75cfec26 100644 --- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml +++ b/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml @@ -17,10 +17,11 @@ + id, create_time, create_by, update_time, update_by, `source`, file_name, url, `type`, - `status`, del_flag, success_count, fail_count, uncheck_count, checked_count + `status`, del_flag, success_count, fail_count, uncheck_count, checked_count, tenant_id @@ -62,12 +63,12 @@ update_by, `source`, file_name, url, `type`, `status`, del_flag, success_count, fail_count, - uncheck_count, checked_count) + uncheck_count, checked_count, tenant_id) values (now(), #{createBy,jdbcType=VARCHAR}, now(), #{updateBy,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{type,jdbcType=SMALLINT}, #{status,jdbcType=SMALLINT}, #{delFlag,jdbcType=SMALLINT}, #{successCount,jdbcType=INTEGER}, #{failCount,jdbcType=INTEGER}, - #{uncheckCount,jdbcType=INTEGER}, #{checkedCount,jdbcType=INTEGER}) + #{uncheckCount,jdbcType=INTEGER}, #{checkedCount,jdbcType=INTEGER}, #{tenantId, jdbcType=VARCHAR}) insert into xhpc_tradebill_upload_record @@ -110,6 +111,9 @@ checked_count, + + tenant_id, + now(), @@ -150,6 +154,9 @@ #{checkedCount,jdbcType=INTEGER}, + + #{tenantId, jdbcType=VARCHAR}, + From 81f58eb0f4d926af972eac693cedf38f3dad99ad Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Mon, 10 Jan 2022 15:23:27 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/pp/domain/XhpcDeviceMessage.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java new file mode 100644 index 00000000..7f35d596 --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java @@ -0,0 +1,32 @@ +package com.xhpc.pp.domain; + + +import lombok.Data; + +import java.util.Date; + +@Data +public class XhpcDeviceMessage { + + private Long deviceMessageId; + + private String type; + + private String serialNumber; + + private String content; + + private String replyContent; + + private Integer status; + + private Date createTime; + + private String createBy; + + private Date updateTime; + + private String updateBy; + + private String remark; +} From 6e1fcddc6f910ea0324cf89fc0277e0dc45db074 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 12 Jan 2022 16:07:43 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9deviceMessage=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E6=9B=BF=E6=8D=A2XhpcMessa?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/pp/domain/XhpcDeviceMessage.java | 28 +++++++++++++++++-- .../logic/BmsChargerInterruptDataLogic.java | 12 ++------ .../logic/BmsChargingCompletedDataLogic.java | 12 +------- .../pp/logic/BmsChargingConfigDataLogic.java | 11 +------- .../xhpc/pp/logic/BmsChargingDataLogic.java | 26 ++++++++++------- .../logic/BmsChargingHandshakeDataLogic.java | 11 +------- .../com/xhpc/pp/logic/BmsErrorDataLogic.java | 12 ++------ .../xhpc/pp/logic/BmsInterruptDataLogic.java | 12 ++------ .../logic/BmsReqChargerOutputDataLogic.java | 26 ++++++++++------- .../logic/RateModelConfigReplyDataLogic.java | 1 - .../xhpc/pp/logic/RateModelRequestLogic.java | 1 - .../xhpc/pp/logic/RateModelValidateLogic.java | 1 - .../java/com/xhpc/pp/logic/RegisterLogic.java | 1 - .../pp/server/ChargingPileBinaryHandler.java | 16 +++++++++++ .../mapper/XhpcDeviceMessageMapper.xml | 8 +++--- 15 files changed, 86 insertions(+), 92 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java index 7f35d596..b3881863 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java @@ -8,18 +8,41 @@ import java.util.Date; @Data public class XhpcDeviceMessage { + /** + * 消息ID + */ private Long deviceMessageId; + /** + * 设备类型 + */ private String type; + /** + * 设备编码 + */ private String serialNumber; + /** + * 充电订单号 + */ + private String chargeOrderNo; + + /** + * 报文内容 + */ private String content; - private String replyContent; - + /** + * 状态 + */ private Integer status; + /** + * 备注描述 + */ + private String remark; + private Date createTime; private String createBy; @@ -28,5 +51,4 @@ public class XhpcDeviceMessage { private String updateBy; - private String remark; } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java index 5b10bc89..a56ba96a 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,7 @@ import java.util.Map; public class BmsChargerInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargerInterruptDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -31,11 +27,6 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电阶段充电机中止报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -43,6 +34,7 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java index 8920327f..215beb0c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,6 @@ import java.util.Map; public class BmsChargingCompletedDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingCompletedDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -32,12 +27,6 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电结束阶段报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); - XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -45,6 +34,7 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java index a8107214..612cd9f8 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,6 @@ import java.util.Map; public class BmsChargingConfigDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingConfigDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -33,11 +28,6 @@ public class BmsChargingConfigDataLogic implements ServiceLogic { String remark = "充电桩与 BMS 参数配置阶段报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -45,6 +35,7 @@ public class BmsChargingConfigDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java index 2760eab0..85a72517 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java @@ -1,16 +1,17 @@ package com.xhpc.pp.logic; -import com.xhpc.mapper.XhpcMessageMapper; -import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,18 +19,23 @@ import java.util.Map; public class BmsChargingDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电过程 BMS 信息"); - xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark("充电桩与 BMS 充电过程 BMS 信息"); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java index 6b25ec30..17f00ea6 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,6 @@ import java.util.Map; public class BmsChargingHandshakeDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsChargingHandshakeDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -33,11 +28,6 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic { String remark = "充电桩与 BMS 充电握手阶段报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -45,6 +35,7 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java index c335450d..aaa4bd90 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,7 @@ import java.util.Map; public class BmsErrorDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsErrorDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -31,11 +27,6 @@ public class BmsErrorDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电错误报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -43,6 +34,7 @@ public class BmsErrorDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java index 568f7af9..a5eaa41f 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java @@ -1,16 +1,13 @@ package com.xhpc.pp.logic; import com.xhpc.common.enums.StationDeviceEnum; -import com.xhpc.mapper.XhpcMessageMapper; import com.xhpc.pp.domain.XhpcDeviceMessage; -import com.xhpc.pp.domain.XhpcMessage; import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -22,8 +19,7 @@ import java.util.Map; public class BmsInterruptDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsInterruptDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource XhpcDeviceMessageMapper deviceMessageMapper; @@ -31,11 +27,6 @@ public class BmsInterruptDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { String remark = "充电桩与 BMS 充电阶段 BMS 中止报文"; Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark(remark); - xhpcMessageMapper.insertItemsBy(msg); XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); deviceMessage.setType(StationDeviceEnum.PILE.getCode()); @@ -43,6 +34,7 @@ public class BmsInterruptDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(false); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java index dafb9b36..7e1fcbc0 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java @@ -1,16 +1,17 @@ package com.xhpc.pp.logic; -import com.xhpc.mapper.XhpcMessageMapper; -import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.common.enums.StationDeviceEnum; +import com.xhpc.pp.domain.XhpcDeviceMessage; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Map; @Lazy @@ -18,18 +19,23 @@ import java.util.Map; public class BmsReqChargerOutputDataLogic implements ServiceLogic { private static final Logger log = LoggerFactory.getLogger(BmsReqChargerOutputDataLogic.class); - @Autowired - private XhpcMessageMapper xhpcMessageMapper; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - XhpcMessage msg = new XhpcMessage(); - msg.setContent((String) req.get("hex")); - msg.setChargeOrderNo((String) req.get("orderNo")); - msg.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出"); - xhpcMessageMapper.insertItemsBy(msg); + + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出"); + deviceMessage.setStatus(0); + deviceMessage.setContent((String) req.get("hex")); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + deviceMessageMapper.insertByDomain(deviceMessage); + return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java index ba98ca30..19c0feca 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java @@ -55,7 +55,6 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic { deviceMessage.setRemark(remark); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(result); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(result); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java index 3a1a6f0d..9502f806 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java @@ -56,7 +56,6 @@ public class RateModelRequestLogic implements ServiceLogic { deviceMessage.setRemark("充电桩计费模型请求"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(resultStr); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java index 236272b0..b2ad2891 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java @@ -72,7 +72,6 @@ public class RateModelValidateLogic implements ServiceLogic { deviceMessage.setRemark("计费模型验证请求"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(resultStr); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(HexUtils.toBytes(resultStr), resultCode); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java index f9205cb8..417859f2 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java @@ -91,7 +91,6 @@ public class RegisterLogic implements ServiceLogic { deviceMessage.setRemark("充电桩登录认证"); deviceMessage.setStatus(0); deviceMessage.setContent((String) req.get("hex")); - deviceMessage.setReplyContent(resultStr); deviceMessageMapper.insertByDomain(deviceMessage); return new ServiceResult(HexUtils.toBytes(resultStr), resultCode); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java index 0546455d..145efa30 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java @@ -3,9 +3,12 @@ package com.xhpc.pp.server; import cn.hutool.core.date.DateUtil; import com.alibaba.nacos.api.exception.NacosException; import com.xhpc.common.api.dto.ChargingStationDto; +import com.xhpc.common.enums.StationDeviceEnum; import com.xhpc.pp.domain.ServiceField; +import com.xhpc.pp.domain.XhpcDeviceMessage; import com.xhpc.pp.logic.FieldLogic; import com.xhpc.pp.logic.ServiceMainLogic; +import com.xhpc.pp.mapper.XhpcDeviceMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.TxException; @@ -18,6 +21,7 @@ import org.quickserver.net.server.ClientHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Resource; import java.io.IOException; import java.util.*; @@ -49,6 +53,10 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { private final ServiceMainLogic servicemainLogic; + @Resource + XhpcDeviceMessageMapper deviceMessageMapper; + + public ChargingPileBinaryHandler() { servicemainLogic = SpringContextHolder.getBean("ServiceMainLogic"); @@ -115,6 +123,14 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { } else { log.debug("server send msg >>>> ({}) |{}|", pileNo, toHex(result.getBinary())); handler.sendClientBinary(result.getBinary()); + XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage(); + deviceMessage.setType(StationDeviceEnum.PILE.getCode()); + deviceMessage.setSerialNumber(sp.getPileNo()); + deviceMessage.setRemark("平台下发/回复充电桩"); + deviceMessage.setStatus(0); + deviceMessage.setContent(HexUtils.toString(result.getBinary())); + deviceMessage.setChargeOrderNo((String) req.get("orderNo")); + deviceMessageMapper.insertByDomain(deviceMessage); } if (SERVICE_HB.equals(serviceName) && OK.equals(resultCode)) { Boolean tcfg = (Boolean) cachePile.get("tcfg"); diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index e454c7c6..3bcaebbe 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -8,7 +8,7 @@ - + @@ -19,10 +19,10 @@ insert into xhpc_device_message( - type, + type, serial_number, content, - reply_content, + charge_order_no, status, create_by, remark, @@ -33,7 +33,7 @@ #{type}, #{serialNumber}, #{content}, - #{replyContent}, + #{chargeOrderNo}, #{status}, #{createBy}, #{remark}, From 1b3bd6da3c7d8816d393217405441ce9b4117864 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 12 Jan 2022 18:19:25 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/controller/PileLogController.java | 4 +-- .../log/controller/StationLogController.java | 8 ++--- .../log/domain/XhpcDeviceMessageDomain.java | 29 ++++++++++++++++--- .../log/mapper/XhpcChargingStationMapper.java | 3 ++ .../xhpc/log/service/StationLogService.java | 2 +- .../service/impl/StationLogServiceImpl.java | 9 ++++-- .../mapper/XhpcChargingStationMapper.xml | 12 +++++++- .../mapper/XhpcDeviceMessageMapper.xml | 7 +++-- 8 files changed, 58 insertions(+), 16 deletions(-) diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java index 9d50a7f8..edcb082e 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java @@ -38,8 +38,8 @@ public class PileLogController extends BaseController { } - @GetMapping("/{pileId}") - public TableDataInfo getPileDetailPage(@PathVariable("pileId") String pileId) { + @GetMapping("/detail") + public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId) { startPage(); return getDataTable(pileLogService.getPileRunLogPage(pileId)); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java index 52f3afdf..fb6f4bb9 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java @@ -32,15 +32,15 @@ public class StationLogController extends BaseController { } - @GetMapping("/{stationId}") - public TableDataInfo getPileDetailPage(@PathVariable("stationId") Long stationId) { + @GetMapping("/detail") + public TableDataInfo getPileDetailPage(@RequestParam("stationId") Long stationId) { startPage(); return getDataTable(stationLogService.getStationRatePage(stationId)); } - @GetMapping("/rate/{rateId}") - public AjaxResult getRateInfo(@PathVariable("rateId") Integer rateId) { + @GetMapping("/rate/detail") + public AjaxResult getRateInfo(@RequestParam("rateId") Integer rateId) { return AjaxResult.success(stationLogService.getRateInfo(rateId)); } } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java index 674a9108..a8cb01dc 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java @@ -8,18 +8,41 @@ import java.util.Date; @Data public class XhpcDeviceMessageDomain { + /** + * 消息ID + */ private Long deviceMessageId; + /** + * 设备类型 + */ private String type; + /** + * 设备编码 + */ private String serialNumber; + /** + * 充电订单号 + */ + private String chargeOrderNo; + + /** + * 报文内容 + */ private String content; - private String replyContent; - + /** + * 状态 + */ private Integer status; + /** + * 备注描述 + */ + private String remark; + private Date createTime; private String createBy; @@ -27,6 +50,4 @@ public class XhpcDeviceMessageDomain { private Date updateTime; private String updateBy; - - private String remark; } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java index 119f695f..83ec4f8e 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java @@ -25,4 +25,7 @@ public interface XhpcChargingStationMapper { List> selectRateTimeListByRateId(@Param("rateId")Integer rateId); + + + List> selectBaseRateTimeListByRateId(@Param("rateId")Integer rateId); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java index 955ee274..51c2ec66 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java @@ -12,5 +12,5 @@ public interface StationLogService { List> getStationRatePage(Long stationId); - List> getRateInfo(int rateId); + Map getRateInfo(int rateId); } diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java index c7f1f066..70dd33e3 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java @@ -5,6 +5,7 @@ import com.xhpc.log.service.StationLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,7 +29,11 @@ public class StationLogServiceImpl implements StationLogService { @Override - public List> getRateInfo(int rateId){ - return stationMapper.selectRateTimeListByRateId(rateId); + public Map getRateInfo(int rateId){ + Map resData = new HashMap<>(); + resData.put("base", stationMapper.selectBaseRateTimeListByRateId(rateId)); + resData.put("current", stationMapper.selectRateTimeListByRateId(rateId)); + + return resData; } } diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml index 5a0e6bc0..d0619cde 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -31,7 +31,8 @@ + + diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index 599fca67..ca2cdbeb 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -9,7 +9,7 @@ type as 'type', serial_number as 'serialNumber', content as 'content', - reply_content as 'replyContent', + charge_order_no as 'chargeOrderNo', status as 'status', remark as 'remark', create_time as 'createTime', @@ -33,7 +33,7 @@ m.type as 'type', m.serial_number as 'serialNumber', m.content as 'content', - m.reply_content as 'replyContent', + m.charge_order_no as 'chargeOrderNo', m.status as 'status', m.remark as 'remark', m.create_time as 'createTime', @@ -58,6 +58,9 @@ and cp.serial_number=#{params.serialNumber} + + and m.charge_order_no=#{params.chargeOrderNo} + From 98b297c12e5e97c0b850ff3f01f39745081869bd Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 12 Jan 2022 18:21:02 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc-log/src/main/resources/bootstrap.yml | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml index ac095b69..e44d9466 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml @@ -27,7 +27,7 @@ spring: logging: level: root: info - com.xhpc.tradebill.mapper: debug + com.xhpc.log.mapper: debug file: path: "d:\\logs" @@ -55,36 +55,3 @@ alibaba: publicCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt" rootCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt" -###获取微信openid地址 -#WXGETJSCODE: "https://api.weixin.qq.com/sns/jscode2session?appid=wxb14ef93e9b7901f3&secret=b5c5672141b5930c30a1abee95a2dcbf&js_code=" -###阿里云身份证验证地址 -#VERIFYCARD: "http://idenauthen.market.alicloudapi.com/idenAuthentication" -##阿里云身份证验证地址appcode -#APPCODE: "APPCODE e26d9088b58e24af69411d5933cece47" -##小程序appid -#APPID: "wxd0a48e00319ef8a7" -##小程序绑定商户id -#MCHID: "1514355771" -##商户后台设置的key -#KEY: "sichuanxianghuakejiyouxiangongsi" -##微信小程序支付地址 -#WXPAYUNIFIEDORDER: "https://api.mch.weixin.qq.com/pay/unifiedorder" -##微信支付回调地址 -#SERVERDOMAIN: "http://www.scxhua.cn/prod-api/xhpc-payment/wx/paymentCallback" -##微信小程序支付地址 -#WXTRANSFERS: "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers" - -##支付宝支付回调地址 -#ALIPAYPSERVERDOMAIN: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl" -##支付宝公钥 -#ALIPAYPUBLICKEY: -##应用私钥 -#ALIPAYPRIVATEKEY: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ" -##支付宝appid -#ALIPAYAPPID: "2021002156615717" -##应用公钥证书路径 -#CERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt" -##支付宝公钥证书路径 -#PUBLICCERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt" -##支付宝根证书路径 -#ROOTCRETPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt" \ No newline at end of file